diff --git a/graphics/pokemon/abra/anim_front.png b/graphics/pokemon/gen_1/abra/anim_front.png
similarity index 100%
rename from graphics/pokemon/abra/anim_front.png
rename to graphics/pokemon/gen_1/abra/anim_front.png
diff --git a/graphics/pokemon/abra/back.png b/graphics/pokemon/gen_1/abra/back.png
similarity index 100%
rename from graphics/pokemon/abra/back.png
rename to graphics/pokemon/gen_1/abra/back.png
diff --git a/graphics/pokemon/abra/footprint.png b/graphics/pokemon/gen_1/abra/footprint.png
similarity index 100%
rename from graphics/pokemon/abra/footprint.png
rename to graphics/pokemon/gen_1/abra/footprint.png
diff --git a/graphics/pokemon/abra/icon.png b/graphics/pokemon/gen_1/abra/icon.png
similarity index 100%
rename from graphics/pokemon/abra/icon.png
rename to graphics/pokemon/gen_1/abra/icon.png
diff --git a/graphics/pokemon/abra/normal.pal b/graphics/pokemon/gen_1/abra/normal.pal
similarity index 100%
rename from graphics/pokemon/abra/normal.pal
rename to graphics/pokemon/gen_1/abra/normal.pal
diff --git a/graphics/pokemon/abra/shiny.pal b/graphics/pokemon/gen_1/abra/shiny.pal
similarity index 100%
rename from graphics/pokemon/abra/shiny.pal
rename to graphics/pokemon/gen_1/abra/shiny.pal
diff --git a/graphics/pokemon/aerodactyl/anim_front.png b/graphics/pokemon/gen_1/aerodactyl/anim_front.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/anim_front.png
rename to graphics/pokemon/gen_1/aerodactyl/anim_front.png
diff --git a/graphics/pokemon/aerodactyl/back.png b/graphics/pokemon/gen_1/aerodactyl/back.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/back.png
rename to graphics/pokemon/gen_1/aerodactyl/back.png
diff --git a/graphics/pokemon/aerodactyl/footprint.png b/graphics/pokemon/gen_1/aerodactyl/footprint.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/footprint.png
rename to graphics/pokemon/gen_1/aerodactyl/footprint.png
diff --git a/graphics/pokemon/aerodactyl/icon.png b/graphics/pokemon/gen_1/aerodactyl/icon.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/icon.png
rename to graphics/pokemon/gen_1/aerodactyl/icon.png
diff --git a/graphics/pokemon/aerodactyl/mega/back.png b/graphics/pokemon/gen_1/aerodactyl/mega/back.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/mega/back.png
rename to graphics/pokemon/gen_1/aerodactyl/mega/back.png
diff --git a/graphics/pokemon/aerodactyl/mega/front.png b/graphics/pokemon/gen_1/aerodactyl/mega/front.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/mega/front.png
rename to graphics/pokemon/gen_1/aerodactyl/mega/front.png
diff --git a/graphics/pokemon/aerodactyl/mega/icon.png b/graphics/pokemon/gen_1/aerodactyl/mega/icon.png
similarity index 100%
rename from graphics/pokemon/aerodactyl/mega/icon.png
rename to graphics/pokemon/gen_1/aerodactyl/mega/icon.png
diff --git a/graphics/pokemon/aerodactyl/mega/normal.pal b/graphics/pokemon/gen_1/aerodactyl/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/aerodactyl/mega/normal.pal
rename to graphics/pokemon/gen_1/aerodactyl/mega/normal.pal
diff --git a/graphics/pokemon/aerodactyl/mega/shiny.pal b/graphics/pokemon/gen_1/aerodactyl/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/aerodactyl/mega/shiny.pal
rename to graphics/pokemon/gen_1/aerodactyl/mega/shiny.pal
diff --git a/graphics/pokemon/aerodactyl/normal.pal b/graphics/pokemon/gen_1/aerodactyl/normal.pal
similarity index 100%
rename from graphics/pokemon/aerodactyl/normal.pal
rename to graphics/pokemon/gen_1/aerodactyl/normal.pal
diff --git a/graphics/pokemon/aerodactyl/shiny.pal b/graphics/pokemon/gen_1/aerodactyl/shiny.pal
similarity index 100%
rename from graphics/pokemon/aerodactyl/shiny.pal
rename to graphics/pokemon/gen_1/aerodactyl/shiny.pal
diff --git a/graphics/pokemon/alakazam/anim_front.png b/graphics/pokemon/gen_1/alakazam/anim_front.png
similarity index 100%
rename from graphics/pokemon/alakazam/anim_front.png
rename to graphics/pokemon/gen_1/alakazam/anim_front.png
diff --git a/graphics/pokemon/alakazam/anim_frontf.png b/graphics/pokemon/gen_1/alakazam/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/alakazam/anim_frontf.png
rename to graphics/pokemon/gen_1/alakazam/anim_frontf.png
diff --git a/graphics/pokemon/alakazam/back.png b/graphics/pokemon/gen_1/alakazam/back.png
similarity index 100%
rename from graphics/pokemon/alakazam/back.png
rename to graphics/pokemon/gen_1/alakazam/back.png
diff --git a/graphics/pokemon/alakazam/backf.png b/graphics/pokemon/gen_1/alakazam/backf.png
similarity index 100%
rename from graphics/pokemon/alakazam/backf.png
rename to graphics/pokemon/gen_1/alakazam/backf.png
diff --git a/graphics/pokemon/alakazam/footprint.png b/graphics/pokemon/gen_1/alakazam/footprint.png
similarity index 100%
rename from graphics/pokemon/alakazam/footprint.png
rename to graphics/pokemon/gen_1/alakazam/footprint.png
diff --git a/graphics/pokemon/alakazam/icon.png b/graphics/pokemon/gen_1/alakazam/icon.png
similarity index 100%
rename from graphics/pokemon/alakazam/icon.png
rename to graphics/pokemon/gen_1/alakazam/icon.png
diff --git a/graphics/pokemon/alakazam/mega/back.png b/graphics/pokemon/gen_1/alakazam/mega/back.png
similarity index 100%
rename from graphics/pokemon/alakazam/mega/back.png
rename to graphics/pokemon/gen_1/alakazam/mega/back.png
diff --git a/graphics/pokemon/alakazam/mega/front.png b/graphics/pokemon/gen_1/alakazam/mega/front.png
similarity index 100%
rename from graphics/pokemon/alakazam/mega/front.png
rename to graphics/pokemon/gen_1/alakazam/mega/front.png
diff --git a/graphics/pokemon/alakazam/mega/icon.png b/graphics/pokemon/gen_1/alakazam/mega/icon.png
similarity index 100%
rename from graphics/pokemon/alakazam/mega/icon.png
rename to graphics/pokemon/gen_1/alakazam/mega/icon.png
diff --git a/graphics/pokemon/alakazam/mega/normal.pal b/graphics/pokemon/gen_1/alakazam/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/alakazam/mega/normal.pal
rename to graphics/pokemon/gen_1/alakazam/mega/normal.pal
diff --git a/graphics/pokemon/alakazam/mega/shiny.pal b/graphics/pokemon/gen_1/alakazam/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/alakazam/mega/shiny.pal
rename to graphics/pokemon/gen_1/alakazam/mega/shiny.pal
diff --git a/graphics/pokemon/alakazam/normal.pal b/graphics/pokemon/gen_1/alakazam/normal.pal
similarity index 100%
rename from graphics/pokemon/alakazam/normal.pal
rename to graphics/pokemon/gen_1/alakazam/normal.pal
diff --git a/graphics/pokemon/alakazam/shiny.pal b/graphics/pokemon/gen_1/alakazam/shiny.pal
similarity index 100%
rename from graphics/pokemon/alakazam/shiny.pal
rename to graphics/pokemon/gen_1/alakazam/shiny.pal
diff --git a/graphics/pokemon/arbok/anim_front.png b/graphics/pokemon/gen_1/arbok/anim_front.png
similarity index 100%
rename from graphics/pokemon/arbok/anim_front.png
rename to graphics/pokemon/gen_1/arbok/anim_front.png
diff --git a/graphics/pokemon/arbok/back.png b/graphics/pokemon/gen_1/arbok/back.png
similarity index 100%
rename from graphics/pokemon/arbok/back.png
rename to graphics/pokemon/gen_1/arbok/back.png
diff --git a/graphics/pokemon/accelgor/footprint.png b/graphics/pokemon/gen_1/arbok/footprint.png
similarity index 100%
rename from graphics/pokemon/accelgor/footprint.png
rename to graphics/pokemon/gen_1/arbok/footprint.png
diff --git a/graphics/pokemon/arbok/icon.png b/graphics/pokemon/gen_1/arbok/icon.png
similarity index 100%
rename from graphics/pokemon/arbok/icon.png
rename to graphics/pokemon/gen_1/arbok/icon.png
diff --git a/graphics/pokemon/arbok/normal.pal b/graphics/pokemon/gen_1/arbok/normal.pal
similarity index 100%
rename from graphics/pokemon/arbok/normal.pal
rename to graphics/pokemon/gen_1/arbok/normal.pal
diff --git a/graphics/pokemon/arbok/shiny.pal b/graphics/pokemon/gen_1/arbok/shiny.pal
similarity index 100%
rename from graphics/pokemon/arbok/shiny.pal
rename to graphics/pokemon/gen_1/arbok/shiny.pal
diff --git a/graphics/pokemon/arcanine/anim_front.png b/graphics/pokemon/gen_1/arcanine/anim_front.png
similarity index 100%
rename from graphics/pokemon/arcanine/anim_front.png
rename to graphics/pokemon/gen_1/arcanine/anim_front.png
diff --git a/graphics/pokemon/arcanine/back.png b/graphics/pokemon/gen_1/arcanine/back.png
similarity index 100%
rename from graphics/pokemon/arcanine/back.png
rename to graphics/pokemon/gen_1/arcanine/back.png
diff --git a/graphics/pokemon/arcanine/footprint.png b/graphics/pokemon/gen_1/arcanine/footprint.png
similarity index 100%
rename from graphics/pokemon/arcanine/footprint.png
rename to graphics/pokemon/gen_1/arcanine/footprint.png
diff --git a/graphics/pokemon/arcanine/hisuian/back.png b/graphics/pokemon/gen_1/arcanine/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arcanine/hisuian/back.png
rename to graphics/pokemon/gen_1/arcanine/hisuian/back.png
diff --git a/graphics/pokemon/arcanine/hisuian/front.png b/graphics/pokemon/gen_1/arcanine/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arcanine/hisuian/front.png
rename to graphics/pokemon/gen_1/arcanine/hisuian/front.png
diff --git a/graphics/pokemon/arcanine/hisuian/icon.png b/graphics/pokemon/gen_1/arcanine/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/arcanine/hisuian/icon.png
rename to graphics/pokemon/gen_1/arcanine/hisuian/icon.png
diff --git a/graphics/pokemon/arcanine/hisuian/normal.pal b/graphics/pokemon/gen_1/arcanine/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arcanine/hisuian/normal.pal
rename to graphics/pokemon/gen_1/arcanine/hisuian/normal.pal
diff --git a/graphics/pokemon/arcanine/hisuian/shiny.pal b/graphics/pokemon/gen_1/arcanine/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arcanine/hisuian/shiny.pal
rename to graphics/pokemon/gen_1/arcanine/hisuian/shiny.pal
diff --git a/graphics/pokemon/arcanine/icon.png b/graphics/pokemon/gen_1/arcanine/icon.png
similarity index 100%
rename from graphics/pokemon/arcanine/icon.png
rename to graphics/pokemon/gen_1/arcanine/icon.png
diff --git a/graphics/pokemon/arcanine/normal.pal b/graphics/pokemon/gen_1/arcanine/normal.pal
similarity index 100%
rename from graphics/pokemon/arcanine/normal.pal
rename to graphics/pokemon/gen_1/arcanine/normal.pal
diff --git a/graphics/pokemon/arcanine/shiny.pal b/graphics/pokemon/gen_1/arcanine/shiny.pal
similarity index 100%
rename from graphics/pokemon/arcanine/shiny.pal
rename to graphics/pokemon/gen_1/arcanine/shiny.pal
diff --git a/graphics/pokemon/articuno/anim_front.png b/graphics/pokemon/gen_1/articuno/anim_front.png
similarity index 100%
rename from graphics/pokemon/articuno/anim_front.png
rename to graphics/pokemon/gen_1/articuno/anim_front.png
diff --git a/graphics/pokemon/articuno/back.png b/graphics/pokemon/gen_1/articuno/back.png
similarity index 100%
rename from graphics/pokemon/articuno/back.png
rename to graphics/pokemon/gen_1/articuno/back.png
diff --git a/graphics/pokemon/articuno/footprint.png b/graphics/pokemon/gen_1/articuno/footprint.png
similarity index 100%
rename from graphics/pokemon/articuno/footprint.png
rename to graphics/pokemon/gen_1/articuno/footprint.png
diff --git a/graphics/pokemon/articuno/galarian/back.png b/graphics/pokemon/gen_1/articuno/galarian/back.png
similarity index 100%
rename from graphics/pokemon/articuno/galarian/back.png
rename to graphics/pokemon/gen_1/articuno/galarian/back.png
diff --git a/graphics/pokemon/articuno/galarian/front.png b/graphics/pokemon/gen_1/articuno/galarian/front.png
similarity index 100%
rename from graphics/pokemon/articuno/galarian/front.png
rename to graphics/pokemon/gen_1/articuno/galarian/front.png
diff --git a/graphics/pokemon/articuno/galarian/icon.png b/graphics/pokemon/gen_1/articuno/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/articuno/galarian/icon.png
rename to graphics/pokemon/gen_1/articuno/galarian/icon.png
diff --git a/graphics/pokemon/articuno/galarian/normal.pal b/graphics/pokemon/gen_1/articuno/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/articuno/galarian/normal.pal
rename to graphics/pokemon/gen_1/articuno/galarian/normal.pal
diff --git a/graphics/pokemon/articuno/galarian/shiny.pal b/graphics/pokemon/gen_1/articuno/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/articuno/galarian/shiny.pal
rename to graphics/pokemon/gen_1/articuno/galarian/shiny.pal
diff --git a/graphics/pokemon/articuno/icon.png b/graphics/pokemon/gen_1/articuno/icon.png
similarity index 100%
rename from graphics/pokemon/articuno/icon.png
rename to graphics/pokemon/gen_1/articuno/icon.png
diff --git a/graphics/pokemon/articuno/normal.pal b/graphics/pokemon/gen_1/articuno/normal.pal
similarity index 100%
rename from graphics/pokemon/articuno/normal.pal
rename to graphics/pokemon/gen_1/articuno/normal.pal
diff --git a/graphics/pokemon/articuno/shiny.pal b/graphics/pokemon/gen_1/articuno/shiny.pal
similarity index 100%
rename from graphics/pokemon/articuno/shiny.pal
rename to graphics/pokemon/gen_1/articuno/shiny.pal
diff --git a/graphics/pokemon/beedrill/anim_front.png b/graphics/pokemon/gen_1/beedrill/anim_front.png
similarity index 100%
rename from graphics/pokemon/beedrill/anim_front.png
rename to graphics/pokemon/gen_1/beedrill/anim_front.png
diff --git a/graphics/pokemon/beedrill/back.png b/graphics/pokemon/gen_1/beedrill/back.png
similarity index 100%
rename from graphics/pokemon/beedrill/back.png
rename to graphics/pokemon/gen_1/beedrill/back.png
diff --git a/graphics/pokemon/beedrill/footprint.png b/graphics/pokemon/gen_1/beedrill/footprint.png
similarity index 100%
rename from graphics/pokemon/beedrill/footprint.png
rename to graphics/pokemon/gen_1/beedrill/footprint.png
diff --git a/graphics/pokemon/beedrill/icon.png b/graphics/pokemon/gen_1/beedrill/icon.png
similarity index 100%
rename from graphics/pokemon/beedrill/icon.png
rename to graphics/pokemon/gen_1/beedrill/icon.png
diff --git a/graphics/pokemon/beedrill/mega/back.png b/graphics/pokemon/gen_1/beedrill/mega/back.png
similarity index 100%
rename from graphics/pokemon/beedrill/mega/back.png
rename to graphics/pokemon/gen_1/beedrill/mega/back.png
diff --git a/graphics/pokemon/beedrill/mega/front.png b/graphics/pokemon/gen_1/beedrill/mega/front.png
similarity index 100%
rename from graphics/pokemon/beedrill/mega/front.png
rename to graphics/pokemon/gen_1/beedrill/mega/front.png
diff --git a/graphics/pokemon/beedrill/mega/icon.png b/graphics/pokemon/gen_1/beedrill/mega/icon.png
similarity index 100%
rename from graphics/pokemon/beedrill/mega/icon.png
rename to graphics/pokemon/gen_1/beedrill/mega/icon.png
diff --git a/graphics/pokemon/beedrill/mega/normal.pal b/graphics/pokemon/gen_1/beedrill/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/beedrill/mega/normal.pal
rename to graphics/pokemon/gen_1/beedrill/mega/normal.pal
diff --git a/graphics/pokemon/beedrill/mega/shiny.pal b/graphics/pokemon/gen_1/beedrill/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/beedrill/mega/shiny.pal
rename to graphics/pokemon/gen_1/beedrill/mega/shiny.pal
diff --git a/graphics/pokemon/beedrill/normal.pal b/graphics/pokemon/gen_1/beedrill/normal.pal
similarity index 100%
rename from graphics/pokemon/beedrill/normal.pal
rename to graphics/pokemon/gen_1/beedrill/normal.pal
diff --git a/graphics/pokemon/beedrill/shiny.pal b/graphics/pokemon/gen_1/beedrill/shiny.pal
similarity index 100%
rename from graphics/pokemon/beedrill/shiny.pal
rename to graphics/pokemon/gen_1/beedrill/shiny.pal
diff --git a/graphics/pokemon/bellsprout/anim_front.png b/graphics/pokemon/gen_1/bellsprout/anim_front.png
similarity index 100%
rename from graphics/pokemon/bellsprout/anim_front.png
rename to graphics/pokemon/gen_1/bellsprout/anim_front.png
diff --git a/graphics/pokemon/bellsprout/back.png b/graphics/pokemon/gen_1/bellsprout/back.png
similarity index 100%
rename from graphics/pokemon/bellsprout/back.png
rename to graphics/pokemon/gen_1/bellsprout/back.png
diff --git a/graphics/pokemon/bellsprout/footprint.png b/graphics/pokemon/gen_1/bellsprout/footprint.png
similarity index 100%
rename from graphics/pokemon/bellsprout/footprint.png
rename to graphics/pokemon/gen_1/bellsprout/footprint.png
diff --git a/graphics/pokemon/bellsprout/icon.png b/graphics/pokemon/gen_1/bellsprout/icon.png
similarity index 100%
rename from graphics/pokemon/bellsprout/icon.png
rename to graphics/pokemon/gen_1/bellsprout/icon.png
diff --git a/graphics/pokemon/bellsprout/normal.pal b/graphics/pokemon/gen_1/bellsprout/normal.pal
similarity index 100%
rename from graphics/pokemon/bellsprout/normal.pal
rename to graphics/pokemon/gen_1/bellsprout/normal.pal
diff --git a/graphics/pokemon/bellsprout/shiny.pal b/graphics/pokemon/gen_1/bellsprout/shiny.pal
similarity index 100%
rename from graphics/pokemon/bellsprout/shiny.pal
rename to graphics/pokemon/gen_1/bellsprout/shiny.pal
diff --git a/graphics/pokemon/blastoise/anim_front.png b/graphics/pokemon/gen_1/blastoise/anim_front.png
similarity index 100%
rename from graphics/pokemon/blastoise/anim_front.png
rename to graphics/pokemon/gen_1/blastoise/anim_front.png
diff --git a/graphics/pokemon/blastoise/back.png b/graphics/pokemon/gen_1/blastoise/back.png
similarity index 100%
rename from graphics/pokemon/blastoise/back.png
rename to graphics/pokemon/gen_1/blastoise/back.png
diff --git a/graphics/pokemon/blastoise/footprint.png b/graphics/pokemon/gen_1/blastoise/footprint.png
similarity index 100%
rename from graphics/pokemon/blastoise/footprint.png
rename to graphics/pokemon/gen_1/blastoise/footprint.png
diff --git a/graphics/pokemon/blastoise/gigantamax/back.png b/graphics/pokemon/gen_1/blastoise/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/blastoise/gigantamax/back.png
rename to graphics/pokemon/gen_1/blastoise/gigantamax/back.png
diff --git a/graphics/pokemon/blastoise/gigantamax/front.png b/graphics/pokemon/gen_1/blastoise/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/blastoise/gigantamax/front.png
rename to graphics/pokemon/gen_1/blastoise/gigantamax/front.png
diff --git a/graphics/pokemon/blastoise/gigantamax/icon.png b/graphics/pokemon/gen_1/blastoise/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/blastoise/gigantamax/icon.png
rename to graphics/pokemon/gen_1/blastoise/gigantamax/icon.png
diff --git a/graphics/pokemon/blastoise/gigantamax/normal.pal b/graphics/pokemon/gen_1/blastoise/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/blastoise/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/blastoise/gigantamax/normal.pal
diff --git a/graphics/pokemon/blastoise/gigantamax/shiny.pal b/graphics/pokemon/gen_1/blastoise/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/blastoise/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/blastoise/gigantamax/shiny.pal
diff --git a/graphics/pokemon/blastoise/icon.png b/graphics/pokemon/gen_1/blastoise/icon.png
similarity index 100%
rename from graphics/pokemon/blastoise/icon.png
rename to graphics/pokemon/gen_1/blastoise/icon.png
diff --git a/graphics/pokemon/blastoise/mega/back.png b/graphics/pokemon/gen_1/blastoise/mega/back.png
similarity index 100%
rename from graphics/pokemon/blastoise/mega/back.png
rename to graphics/pokemon/gen_1/blastoise/mega/back.png
diff --git a/graphics/pokemon/blastoise/mega/front.png b/graphics/pokemon/gen_1/blastoise/mega/front.png
similarity index 100%
rename from graphics/pokemon/blastoise/mega/front.png
rename to graphics/pokemon/gen_1/blastoise/mega/front.png
diff --git a/graphics/pokemon/blastoise/mega/icon.png b/graphics/pokemon/gen_1/blastoise/mega/icon.png
similarity index 100%
rename from graphics/pokemon/blastoise/mega/icon.png
rename to graphics/pokemon/gen_1/blastoise/mega/icon.png
diff --git a/graphics/pokemon/blastoise/mega/normal.pal b/graphics/pokemon/gen_1/blastoise/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/blastoise/mega/normal.pal
rename to graphics/pokemon/gen_1/blastoise/mega/normal.pal
diff --git a/graphics/pokemon/blastoise/mega/shiny.pal b/graphics/pokemon/gen_1/blastoise/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/blastoise/mega/shiny.pal
rename to graphics/pokemon/gen_1/blastoise/mega/shiny.pal
diff --git a/graphics/pokemon/blastoise/normal.pal b/graphics/pokemon/gen_1/blastoise/normal.pal
similarity index 100%
rename from graphics/pokemon/blastoise/normal.pal
rename to graphics/pokemon/gen_1/blastoise/normal.pal
diff --git a/graphics/pokemon/blastoise/shiny.pal b/graphics/pokemon/gen_1/blastoise/shiny.pal
similarity index 100%
rename from graphics/pokemon/blastoise/shiny.pal
rename to graphics/pokemon/gen_1/blastoise/shiny.pal
diff --git a/graphics/pokemon/bulbasaur/anim_front.png b/graphics/pokemon/gen_1/bulbasaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/bulbasaur/anim_front.png
rename to graphics/pokemon/gen_1/bulbasaur/anim_front.png
diff --git a/graphics/pokemon/bulbasaur/back.png b/graphics/pokemon/gen_1/bulbasaur/back.png
similarity index 100%
rename from graphics/pokemon/bulbasaur/back.png
rename to graphics/pokemon/gen_1/bulbasaur/back.png
diff --git a/graphics/pokemon/bulbasaur/footprint.png b/graphics/pokemon/gen_1/bulbasaur/footprint.png
similarity index 100%
rename from graphics/pokemon/bulbasaur/footprint.png
rename to graphics/pokemon/gen_1/bulbasaur/footprint.png
diff --git a/graphics/pokemon/bulbasaur/icon.png b/graphics/pokemon/gen_1/bulbasaur/icon.png
similarity index 100%
rename from graphics/pokemon/bulbasaur/icon.png
rename to graphics/pokemon/gen_1/bulbasaur/icon.png
diff --git a/graphics/pokemon/bulbasaur/normal.pal b/graphics/pokemon/gen_1/bulbasaur/normal.pal
similarity index 100%
rename from graphics/pokemon/bulbasaur/normal.pal
rename to graphics/pokemon/gen_1/bulbasaur/normal.pal
diff --git a/graphics/pokemon/bulbasaur/shiny.pal b/graphics/pokemon/gen_1/bulbasaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/bulbasaur/shiny.pal
rename to graphics/pokemon/gen_1/bulbasaur/shiny.pal
diff --git a/graphics/pokemon/butterfree/anim_front.png b/graphics/pokemon/gen_1/butterfree/anim_front.png
similarity index 100%
rename from graphics/pokemon/butterfree/anim_front.png
rename to graphics/pokemon/gen_1/butterfree/anim_front.png
diff --git a/graphics/pokemon/butterfree/anim_frontf.png b/graphics/pokemon/gen_1/butterfree/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/butterfree/anim_frontf.png
rename to graphics/pokemon/gen_1/butterfree/anim_frontf.png
diff --git a/graphics/pokemon/butterfree/back.png b/graphics/pokemon/gen_1/butterfree/back.png
similarity index 100%
rename from graphics/pokemon/butterfree/back.png
rename to graphics/pokemon/gen_1/butterfree/back.png
diff --git a/graphics/pokemon/butterfree/backf.png b/graphics/pokemon/gen_1/butterfree/backf.png
similarity index 100%
rename from graphics/pokemon/butterfree/backf.png
rename to graphics/pokemon/gen_1/butterfree/backf.png
diff --git a/graphics/pokemon/butterfree/footprint.png b/graphics/pokemon/gen_1/butterfree/footprint.png
similarity index 100%
rename from graphics/pokemon/butterfree/footprint.png
rename to graphics/pokemon/gen_1/butterfree/footprint.png
diff --git a/graphics/pokemon/butterfree/gigantamax/back.png b/graphics/pokemon/gen_1/butterfree/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/butterfree/gigantamax/back.png
rename to graphics/pokemon/gen_1/butterfree/gigantamax/back.png
diff --git a/graphics/pokemon/butterfree/gigantamax/front.png b/graphics/pokemon/gen_1/butterfree/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/butterfree/gigantamax/front.png
rename to graphics/pokemon/gen_1/butterfree/gigantamax/front.png
diff --git a/graphics/pokemon/butterfree/gigantamax/icon.png b/graphics/pokemon/gen_1/butterfree/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/butterfree/gigantamax/icon.png
rename to graphics/pokemon/gen_1/butterfree/gigantamax/icon.png
diff --git a/graphics/pokemon/butterfree/gigantamax/normal.pal b/graphics/pokemon/gen_1/butterfree/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/butterfree/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/butterfree/gigantamax/normal.pal
diff --git a/graphics/pokemon/butterfree/gigantamax/shiny.pal b/graphics/pokemon/gen_1/butterfree/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/butterfree/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/butterfree/gigantamax/shiny.pal
diff --git a/graphics/pokemon/butterfree/icon.png b/graphics/pokemon/gen_1/butterfree/icon.png
similarity index 100%
rename from graphics/pokemon/butterfree/icon.png
rename to graphics/pokemon/gen_1/butterfree/icon.png
diff --git a/graphics/pokemon/butterfree/normal.pal b/graphics/pokemon/gen_1/butterfree/normal.pal
similarity index 100%
rename from graphics/pokemon/butterfree/normal.pal
rename to graphics/pokemon/gen_1/butterfree/normal.pal
diff --git a/graphics/pokemon/butterfree/shiny.pal b/graphics/pokemon/gen_1/butterfree/shiny.pal
similarity index 100%
rename from graphics/pokemon/butterfree/shiny.pal
rename to graphics/pokemon/gen_1/butterfree/shiny.pal
diff --git a/graphics/pokemon/caterpie/anim_front.png b/graphics/pokemon/gen_1/caterpie/anim_front.png
similarity index 100%
rename from graphics/pokemon/caterpie/anim_front.png
rename to graphics/pokemon/gen_1/caterpie/anim_front.png
diff --git a/graphics/pokemon/caterpie/back.png b/graphics/pokemon/gen_1/caterpie/back.png
similarity index 100%
rename from graphics/pokemon/caterpie/back.png
rename to graphics/pokemon/gen_1/caterpie/back.png
diff --git a/graphics/pokemon/araquanid/footprint.png b/graphics/pokemon/gen_1/caterpie/footprint.png
similarity index 100%
rename from graphics/pokemon/araquanid/footprint.png
rename to graphics/pokemon/gen_1/caterpie/footprint.png
diff --git a/graphics/pokemon/caterpie/icon.png b/graphics/pokemon/gen_1/caterpie/icon.png
similarity index 100%
rename from graphics/pokemon/caterpie/icon.png
rename to graphics/pokemon/gen_1/caterpie/icon.png
diff --git a/graphics/pokemon/caterpie/normal.pal b/graphics/pokemon/gen_1/caterpie/normal.pal
similarity index 100%
rename from graphics/pokemon/caterpie/normal.pal
rename to graphics/pokemon/gen_1/caterpie/normal.pal
diff --git a/graphics/pokemon/caterpie/shiny.pal b/graphics/pokemon/gen_1/caterpie/shiny.pal
similarity index 100%
rename from graphics/pokemon/caterpie/shiny.pal
rename to graphics/pokemon/gen_1/caterpie/shiny.pal
diff --git a/graphics/pokemon/chansey/anim_front.png b/graphics/pokemon/gen_1/chansey/anim_front.png
similarity index 100%
rename from graphics/pokemon/chansey/anim_front.png
rename to graphics/pokemon/gen_1/chansey/anim_front.png
diff --git a/graphics/pokemon/chansey/back.png b/graphics/pokemon/gen_1/chansey/back.png
similarity index 100%
rename from graphics/pokemon/chansey/back.png
rename to graphics/pokemon/gen_1/chansey/back.png
diff --git a/graphics/pokemon/chansey/footprint.png b/graphics/pokemon/gen_1/chansey/footprint.png
similarity index 100%
rename from graphics/pokemon/chansey/footprint.png
rename to graphics/pokemon/gen_1/chansey/footprint.png
diff --git a/graphics/pokemon/chansey/icon.png b/graphics/pokemon/gen_1/chansey/icon.png
similarity index 100%
rename from graphics/pokemon/chansey/icon.png
rename to graphics/pokemon/gen_1/chansey/icon.png
diff --git a/graphics/pokemon/chansey/normal.pal b/graphics/pokemon/gen_1/chansey/normal.pal
similarity index 100%
rename from graphics/pokemon/chansey/normal.pal
rename to graphics/pokemon/gen_1/chansey/normal.pal
diff --git a/graphics/pokemon/chansey/shiny.pal b/graphics/pokemon/gen_1/chansey/shiny.pal
similarity index 100%
rename from graphics/pokemon/chansey/shiny.pal
rename to graphics/pokemon/gen_1/chansey/shiny.pal
diff --git a/graphics/pokemon/charizard/anim_front.png b/graphics/pokemon/gen_1/charizard/anim_front.png
similarity index 100%
rename from graphics/pokemon/charizard/anim_front.png
rename to graphics/pokemon/gen_1/charizard/anim_front.png
diff --git a/graphics/pokemon/charizard/back.png b/graphics/pokemon/gen_1/charizard/back.png
similarity index 100%
rename from graphics/pokemon/charizard/back.png
rename to graphics/pokemon/gen_1/charizard/back.png
diff --git a/graphics/pokemon/charizard/footprint.png b/graphics/pokemon/gen_1/charizard/footprint.png
similarity index 100%
rename from graphics/pokemon/charizard/footprint.png
rename to graphics/pokemon/gen_1/charizard/footprint.png
diff --git a/graphics/pokemon/charizard/gigantamax/back.png b/graphics/pokemon/gen_1/charizard/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/charizard/gigantamax/back.png
rename to graphics/pokemon/gen_1/charizard/gigantamax/back.png
diff --git a/graphics/pokemon/charizard/gigantamax/front.png b/graphics/pokemon/gen_1/charizard/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/charizard/gigantamax/front.png
rename to graphics/pokemon/gen_1/charizard/gigantamax/front.png
diff --git a/graphics/pokemon/charizard/gigantamax/icon.png b/graphics/pokemon/gen_1/charizard/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/charizard/gigantamax/icon.png
rename to graphics/pokemon/gen_1/charizard/gigantamax/icon.png
diff --git a/graphics/pokemon/charizard/gigantamax/normal.pal b/graphics/pokemon/gen_1/charizard/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/charizard/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/charizard/gigantamax/normal.pal
diff --git a/graphics/pokemon/charizard/gigantamax/shiny.pal b/graphics/pokemon/gen_1/charizard/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/charizard/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/charizard/gigantamax/shiny.pal
diff --git a/graphics/pokemon/charizard/icon.png b/graphics/pokemon/gen_1/charizard/icon.png
similarity index 100%
rename from graphics/pokemon/charizard/icon.png
rename to graphics/pokemon/gen_1/charizard/icon.png
diff --git a/graphics/pokemon/charizard/mega_x/back.png b/graphics/pokemon/gen_1/charizard/mega_x/back.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_x/back.png
rename to graphics/pokemon/gen_1/charizard/mega_x/back.png
diff --git a/graphics/pokemon/charizard/mega_x/front.png b/graphics/pokemon/gen_1/charizard/mega_x/front.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_x/front.png
rename to graphics/pokemon/gen_1/charizard/mega_x/front.png
diff --git a/graphics/pokemon/charizard/mega_x/icon.png b/graphics/pokemon/gen_1/charizard/mega_x/icon.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_x/icon.png
rename to graphics/pokemon/gen_1/charizard/mega_x/icon.png
diff --git a/graphics/pokemon/charizard/mega_x/normal.pal b/graphics/pokemon/gen_1/charizard/mega_x/normal.pal
similarity index 100%
rename from graphics/pokemon/charizard/mega_x/normal.pal
rename to graphics/pokemon/gen_1/charizard/mega_x/normal.pal
diff --git a/graphics/pokemon/charizard/mega_x/shiny.pal b/graphics/pokemon/gen_1/charizard/mega_x/shiny.pal
similarity index 100%
rename from graphics/pokemon/charizard/mega_x/shiny.pal
rename to graphics/pokemon/gen_1/charizard/mega_x/shiny.pal
diff --git a/graphics/pokemon/charizard/mega_y/back.png b/graphics/pokemon/gen_1/charizard/mega_y/back.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_y/back.png
rename to graphics/pokemon/gen_1/charizard/mega_y/back.png
diff --git a/graphics/pokemon/charizard/mega_y/front.png b/graphics/pokemon/gen_1/charizard/mega_y/front.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_y/front.png
rename to graphics/pokemon/gen_1/charizard/mega_y/front.png
diff --git a/graphics/pokemon/charizard/mega_y/icon.png b/graphics/pokemon/gen_1/charizard/mega_y/icon.png
similarity index 100%
rename from graphics/pokemon/charizard/mega_y/icon.png
rename to graphics/pokemon/gen_1/charizard/mega_y/icon.png
diff --git a/graphics/pokemon/charizard/mega_y/normal.pal b/graphics/pokemon/gen_1/charizard/mega_y/normal.pal
similarity index 100%
rename from graphics/pokemon/charizard/mega_y/normal.pal
rename to graphics/pokemon/gen_1/charizard/mega_y/normal.pal
diff --git a/graphics/pokemon/charizard/mega_y/shiny.pal b/graphics/pokemon/gen_1/charizard/mega_y/shiny.pal
similarity index 100%
rename from graphics/pokemon/charizard/mega_y/shiny.pal
rename to graphics/pokemon/gen_1/charizard/mega_y/shiny.pal
diff --git a/graphics/pokemon/charizard/normal.pal b/graphics/pokemon/gen_1/charizard/normal.pal
similarity index 100%
rename from graphics/pokemon/charizard/normal.pal
rename to graphics/pokemon/gen_1/charizard/normal.pal
diff --git a/graphics/pokemon/charizard/shiny.pal b/graphics/pokemon/gen_1/charizard/shiny.pal
similarity index 100%
rename from graphics/pokemon/charizard/shiny.pal
rename to graphics/pokemon/gen_1/charizard/shiny.pal
diff --git a/graphics/pokemon/charmander/anim_front.png b/graphics/pokemon/gen_1/charmander/anim_front.png
similarity index 100%
rename from graphics/pokemon/charmander/anim_front.png
rename to graphics/pokemon/gen_1/charmander/anim_front.png
diff --git a/graphics/pokemon/charmander/back.png b/graphics/pokemon/gen_1/charmander/back.png
similarity index 100%
rename from graphics/pokemon/charmander/back.png
rename to graphics/pokemon/gen_1/charmander/back.png
diff --git a/graphics/pokemon/charmander/footprint.png b/graphics/pokemon/gen_1/charmander/footprint.png
similarity index 100%
rename from graphics/pokemon/charmander/footprint.png
rename to graphics/pokemon/gen_1/charmander/footprint.png
diff --git a/graphics/pokemon/charmander/icon.png b/graphics/pokemon/gen_1/charmander/icon.png
similarity index 100%
rename from graphics/pokemon/charmander/icon.png
rename to graphics/pokemon/gen_1/charmander/icon.png
diff --git a/graphics/pokemon/charmander/normal.pal b/graphics/pokemon/gen_1/charmander/normal.pal
similarity index 100%
rename from graphics/pokemon/charmander/normal.pal
rename to graphics/pokemon/gen_1/charmander/normal.pal
diff --git a/graphics/pokemon/charmander/shiny.pal b/graphics/pokemon/gen_1/charmander/shiny.pal
similarity index 100%
rename from graphics/pokemon/charmander/shiny.pal
rename to graphics/pokemon/gen_1/charmander/shiny.pal
diff --git a/graphics/pokemon/charmeleon/anim_front.png b/graphics/pokemon/gen_1/charmeleon/anim_front.png
similarity index 100%
rename from graphics/pokemon/charmeleon/anim_front.png
rename to graphics/pokemon/gen_1/charmeleon/anim_front.png
diff --git a/graphics/pokemon/charmeleon/back.png b/graphics/pokemon/gen_1/charmeleon/back.png
similarity index 100%
rename from graphics/pokemon/charmeleon/back.png
rename to graphics/pokemon/gen_1/charmeleon/back.png
diff --git a/graphics/pokemon/charmeleon/footprint.png b/graphics/pokemon/gen_1/charmeleon/footprint.png
similarity index 100%
rename from graphics/pokemon/charmeleon/footprint.png
rename to graphics/pokemon/gen_1/charmeleon/footprint.png
diff --git a/graphics/pokemon/charmeleon/icon.png b/graphics/pokemon/gen_1/charmeleon/icon.png
similarity index 100%
rename from graphics/pokemon/charmeleon/icon.png
rename to graphics/pokemon/gen_1/charmeleon/icon.png
diff --git a/graphics/pokemon/charmeleon/normal.pal b/graphics/pokemon/gen_1/charmeleon/normal.pal
similarity index 100%
rename from graphics/pokemon/charmeleon/normal.pal
rename to graphics/pokemon/gen_1/charmeleon/normal.pal
diff --git a/graphics/pokemon/charmeleon/shiny.pal b/graphics/pokemon/gen_1/charmeleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/charmeleon/shiny.pal
rename to graphics/pokemon/gen_1/charmeleon/shiny.pal
diff --git a/graphics/pokemon/clefable/anim_front.png b/graphics/pokemon/gen_1/clefable/anim_front.png
similarity index 100%
rename from graphics/pokemon/clefable/anim_front.png
rename to graphics/pokemon/gen_1/clefable/anim_front.png
diff --git a/graphics/pokemon/clefable/back.png b/graphics/pokemon/gen_1/clefable/back.png
similarity index 100%
rename from graphics/pokemon/clefable/back.png
rename to graphics/pokemon/gen_1/clefable/back.png
diff --git a/graphics/pokemon/clefable/footprint.png b/graphics/pokemon/gen_1/clefable/footprint.png
similarity index 100%
rename from graphics/pokemon/clefable/footprint.png
rename to graphics/pokemon/gen_1/clefable/footprint.png
diff --git a/graphics/pokemon/clefable/icon.png b/graphics/pokemon/gen_1/clefable/icon.png
similarity index 100%
rename from graphics/pokemon/clefable/icon.png
rename to graphics/pokemon/gen_1/clefable/icon.png
diff --git a/graphics/pokemon/clefable/normal.pal b/graphics/pokemon/gen_1/clefable/normal.pal
similarity index 100%
rename from graphics/pokemon/clefable/normal.pal
rename to graphics/pokemon/gen_1/clefable/normal.pal
diff --git a/graphics/pokemon/clefable/shiny.pal b/graphics/pokemon/gen_1/clefable/shiny.pal
similarity index 100%
rename from graphics/pokemon/clefable/shiny.pal
rename to graphics/pokemon/gen_1/clefable/shiny.pal
diff --git a/graphics/pokemon/clefairy/anim_front.png b/graphics/pokemon/gen_1/clefairy/anim_front.png
similarity index 100%
rename from graphics/pokemon/clefairy/anim_front.png
rename to graphics/pokemon/gen_1/clefairy/anim_front.png
diff --git a/graphics/pokemon/clefairy/back.png b/graphics/pokemon/gen_1/clefairy/back.png
similarity index 100%
rename from graphics/pokemon/clefairy/back.png
rename to graphics/pokemon/gen_1/clefairy/back.png
diff --git a/graphics/pokemon/chewtle/footprint.png b/graphics/pokemon/gen_1/clefairy/footprint.png
similarity index 100%
rename from graphics/pokemon/chewtle/footprint.png
rename to graphics/pokemon/gen_1/clefairy/footprint.png
diff --git a/graphics/pokemon/clefairy/icon.png b/graphics/pokemon/gen_1/clefairy/icon.png
similarity index 100%
rename from graphics/pokemon/clefairy/icon.png
rename to graphics/pokemon/gen_1/clefairy/icon.png
diff --git a/graphics/pokemon/clefairy/normal.pal b/graphics/pokemon/gen_1/clefairy/normal.pal
similarity index 100%
rename from graphics/pokemon/clefairy/normal.pal
rename to graphics/pokemon/gen_1/clefairy/normal.pal
diff --git a/graphics/pokemon/clefairy/shiny.pal b/graphics/pokemon/gen_1/clefairy/shiny.pal
similarity index 100%
rename from graphics/pokemon/clefairy/shiny.pal
rename to graphics/pokemon/gen_1/clefairy/shiny.pal
diff --git a/graphics/pokemon/cloyster/anim_front.png b/graphics/pokemon/gen_1/cloyster/anim_front.png
similarity index 100%
rename from graphics/pokemon/cloyster/anim_front.png
rename to graphics/pokemon/gen_1/cloyster/anim_front.png
diff --git a/graphics/pokemon/cloyster/back.png b/graphics/pokemon/gen_1/cloyster/back.png
similarity index 100%
rename from graphics/pokemon/cloyster/back.png
rename to graphics/pokemon/gen_1/cloyster/back.png
diff --git a/graphics/pokemon/aegislash/footprint.png b/graphics/pokemon/gen_1/cloyster/footprint.png
similarity index 100%
rename from graphics/pokemon/aegislash/footprint.png
rename to graphics/pokemon/gen_1/cloyster/footprint.png
diff --git a/graphics/pokemon/cloyster/icon.png b/graphics/pokemon/gen_1/cloyster/icon.png
similarity index 100%
rename from graphics/pokemon/cloyster/icon.png
rename to graphics/pokemon/gen_1/cloyster/icon.png
diff --git a/graphics/pokemon/cloyster/normal.pal b/graphics/pokemon/gen_1/cloyster/normal.pal
similarity index 100%
rename from graphics/pokemon/cloyster/normal.pal
rename to graphics/pokemon/gen_1/cloyster/normal.pal
diff --git a/graphics/pokemon/cloyster/shiny.pal b/graphics/pokemon/gen_1/cloyster/shiny.pal
similarity index 100%
rename from graphics/pokemon/cloyster/shiny.pal
rename to graphics/pokemon/gen_1/cloyster/shiny.pal
diff --git a/graphics/pokemon/cubone/anim_front.png b/graphics/pokemon/gen_1/cubone/anim_front.png
similarity index 100%
rename from graphics/pokemon/cubone/anim_front.png
rename to graphics/pokemon/gen_1/cubone/anim_front.png
diff --git a/graphics/pokemon/cubone/back.png b/graphics/pokemon/gen_1/cubone/back.png
similarity index 100%
rename from graphics/pokemon/cubone/back.png
rename to graphics/pokemon/gen_1/cubone/back.png
diff --git a/graphics/pokemon/cubone/footprint.png b/graphics/pokemon/gen_1/cubone/footprint.png
similarity index 100%
rename from graphics/pokemon/cubone/footprint.png
rename to graphics/pokemon/gen_1/cubone/footprint.png
diff --git a/graphics/pokemon/cubone/icon.png b/graphics/pokemon/gen_1/cubone/icon.png
similarity index 100%
rename from graphics/pokemon/cubone/icon.png
rename to graphics/pokemon/gen_1/cubone/icon.png
diff --git a/graphics/pokemon/cubone/normal.pal b/graphics/pokemon/gen_1/cubone/normal.pal
similarity index 100%
rename from graphics/pokemon/cubone/normal.pal
rename to graphics/pokemon/gen_1/cubone/normal.pal
diff --git a/graphics/pokemon/cubone/shiny.pal b/graphics/pokemon/gen_1/cubone/shiny.pal
similarity index 100%
rename from graphics/pokemon/cubone/shiny.pal
rename to graphics/pokemon/gen_1/cubone/shiny.pal
diff --git a/graphics/pokemon/dewgong/anim_front.png b/graphics/pokemon/gen_1/dewgong/anim_front.png
similarity index 100%
rename from graphics/pokemon/dewgong/anim_front.png
rename to graphics/pokemon/gen_1/dewgong/anim_front.png
diff --git a/graphics/pokemon/dewgong/back.png b/graphics/pokemon/gen_1/dewgong/back.png
similarity index 100%
rename from graphics/pokemon/dewgong/back.png
rename to graphics/pokemon/gen_1/dewgong/back.png
diff --git a/graphics/pokemon/alcremie/footprint.png b/graphics/pokemon/gen_1/dewgong/footprint.png
similarity index 100%
rename from graphics/pokemon/alcremie/footprint.png
rename to graphics/pokemon/gen_1/dewgong/footprint.png
diff --git a/graphics/pokemon/dewgong/icon.png b/graphics/pokemon/gen_1/dewgong/icon.png
similarity index 100%
rename from graphics/pokemon/dewgong/icon.png
rename to graphics/pokemon/gen_1/dewgong/icon.png
diff --git a/graphics/pokemon/dewgong/normal.pal b/graphics/pokemon/gen_1/dewgong/normal.pal
similarity index 100%
rename from graphics/pokemon/dewgong/normal.pal
rename to graphics/pokemon/gen_1/dewgong/normal.pal
diff --git a/graphics/pokemon/dewgong/shiny.pal b/graphics/pokemon/gen_1/dewgong/shiny.pal
similarity index 100%
rename from graphics/pokemon/dewgong/shiny.pal
rename to graphics/pokemon/gen_1/dewgong/shiny.pal
diff --git a/graphics/pokemon/diglett/alolan/back.png b/graphics/pokemon/gen_1/diglett/alolan/back.png
similarity index 100%
rename from graphics/pokemon/diglett/alolan/back.png
rename to graphics/pokemon/gen_1/diglett/alolan/back.png
diff --git a/graphics/pokemon/diglett/alolan/front.png b/graphics/pokemon/gen_1/diglett/alolan/front.png
similarity index 100%
rename from graphics/pokemon/diglett/alolan/front.png
rename to graphics/pokemon/gen_1/diglett/alolan/front.png
diff --git a/graphics/pokemon/diglett/alolan/icon.png b/graphics/pokemon/gen_1/diglett/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/diglett/alolan/icon.png
rename to graphics/pokemon/gen_1/diglett/alolan/icon.png
diff --git a/graphics/pokemon/diglett/alolan/normal.pal b/graphics/pokemon/gen_1/diglett/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/diglett/alolan/normal.pal
rename to graphics/pokemon/gen_1/diglett/alolan/normal.pal
diff --git a/graphics/pokemon/diglett/alolan/shiny.pal b/graphics/pokemon/gen_1/diglett/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/diglett/alolan/shiny.pal
rename to graphics/pokemon/gen_1/diglett/alolan/shiny.pal
diff --git a/graphics/pokemon/diglett/anim_front.png b/graphics/pokemon/gen_1/diglett/anim_front.png
similarity index 100%
rename from graphics/pokemon/diglett/anim_front.png
rename to graphics/pokemon/gen_1/diglett/anim_front.png
diff --git a/graphics/pokemon/diglett/back.png b/graphics/pokemon/gen_1/diglett/back.png
similarity index 100%
rename from graphics/pokemon/diglett/back.png
rename to graphics/pokemon/gen_1/diglett/back.png
diff --git a/graphics/pokemon/alomomola/footprint.png b/graphics/pokemon/gen_1/diglett/footprint.png
similarity index 100%
rename from graphics/pokemon/alomomola/footprint.png
rename to graphics/pokemon/gen_1/diglett/footprint.png
diff --git a/graphics/pokemon/diglett/icon.png b/graphics/pokemon/gen_1/diglett/icon.png
similarity index 100%
rename from graphics/pokemon/diglett/icon.png
rename to graphics/pokemon/gen_1/diglett/icon.png
diff --git a/graphics/pokemon/diglett/normal.pal b/graphics/pokemon/gen_1/diglett/normal.pal
similarity index 100%
rename from graphics/pokemon/diglett/normal.pal
rename to graphics/pokemon/gen_1/diglett/normal.pal
diff --git a/graphics/pokemon/diglett/shiny.pal b/graphics/pokemon/gen_1/diglett/shiny.pal
similarity index 100%
rename from graphics/pokemon/diglett/shiny.pal
rename to graphics/pokemon/gen_1/diglett/shiny.pal
diff --git a/graphics/pokemon/ditto/anim_front.png b/graphics/pokemon/gen_1/ditto/anim_front.png
similarity index 100%
rename from graphics/pokemon/ditto/anim_front.png
rename to graphics/pokemon/gen_1/ditto/anim_front.png
diff --git a/graphics/pokemon/ditto/back.png b/graphics/pokemon/gen_1/ditto/back.png
similarity index 100%
rename from graphics/pokemon/ditto/back.png
rename to graphics/pokemon/gen_1/ditto/back.png
diff --git a/graphics/pokemon/amoonguss/footprint.png b/graphics/pokemon/gen_1/ditto/footprint.png
similarity index 100%
rename from graphics/pokemon/amoonguss/footprint.png
rename to graphics/pokemon/gen_1/ditto/footprint.png
diff --git a/graphics/pokemon/ditto/icon.png b/graphics/pokemon/gen_1/ditto/icon.png
similarity index 100%
rename from graphics/pokemon/ditto/icon.png
rename to graphics/pokemon/gen_1/ditto/icon.png
diff --git a/graphics/pokemon/ditto/normal.pal b/graphics/pokemon/gen_1/ditto/normal.pal
similarity index 100%
rename from graphics/pokemon/ditto/normal.pal
rename to graphics/pokemon/gen_1/ditto/normal.pal
diff --git a/graphics/pokemon/ditto/shiny.pal b/graphics/pokemon/gen_1/ditto/shiny.pal
similarity index 100%
rename from graphics/pokemon/ditto/shiny.pal
rename to graphics/pokemon/gen_1/ditto/shiny.pal
diff --git a/graphics/pokemon/dodrio/anim_front.png b/graphics/pokemon/gen_1/dodrio/anim_front.png
similarity index 100%
rename from graphics/pokemon/dodrio/anim_front.png
rename to graphics/pokemon/gen_1/dodrio/anim_front.png
diff --git a/graphics/pokemon/dodrio/anim_frontf.png b/graphics/pokemon/gen_1/dodrio/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/dodrio/anim_frontf.png
rename to graphics/pokemon/gen_1/dodrio/anim_frontf.png
diff --git a/graphics/pokemon/dodrio/back.png b/graphics/pokemon/gen_1/dodrio/back.png
similarity index 100%
rename from graphics/pokemon/dodrio/back.png
rename to graphics/pokemon/gen_1/dodrio/back.png
diff --git a/graphics/pokemon/dodrio/backf.png b/graphics/pokemon/gen_1/dodrio/backf.png
similarity index 100%
rename from graphics/pokemon/dodrio/backf.png
rename to graphics/pokemon/gen_1/dodrio/backf.png
diff --git a/graphics/pokemon/dodrio/footprint.png b/graphics/pokemon/gen_1/dodrio/footprint.png
similarity index 100%
rename from graphics/pokemon/dodrio/footprint.png
rename to graphics/pokemon/gen_1/dodrio/footprint.png
diff --git a/graphics/pokemon/dodrio/icon.png b/graphics/pokemon/gen_1/dodrio/icon.png
similarity index 100%
rename from graphics/pokemon/dodrio/icon.png
rename to graphics/pokemon/gen_1/dodrio/icon.png
diff --git a/graphics/pokemon/dodrio/normal.pal b/graphics/pokemon/gen_1/dodrio/normal.pal
similarity index 100%
rename from graphics/pokemon/dodrio/normal.pal
rename to graphics/pokemon/gen_1/dodrio/normal.pal
diff --git a/graphics/pokemon/dodrio/shiny.pal b/graphics/pokemon/gen_1/dodrio/shiny.pal
similarity index 100%
rename from graphics/pokemon/dodrio/shiny.pal
rename to graphics/pokemon/gen_1/dodrio/shiny.pal
diff --git a/graphics/pokemon/doduo/anim_front.png b/graphics/pokemon/gen_1/doduo/anim_front.png
similarity index 100%
rename from graphics/pokemon/doduo/anim_front.png
rename to graphics/pokemon/gen_1/doduo/anim_front.png
diff --git a/graphics/pokemon/doduo/anim_frontf.png b/graphics/pokemon/gen_1/doduo/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/doduo/anim_frontf.png
rename to graphics/pokemon/gen_1/doduo/anim_frontf.png
diff --git a/graphics/pokemon/doduo/back.png b/graphics/pokemon/gen_1/doduo/back.png
similarity index 100%
rename from graphics/pokemon/doduo/back.png
rename to graphics/pokemon/gen_1/doduo/back.png
diff --git a/graphics/pokemon/doduo/backf.png b/graphics/pokemon/gen_1/doduo/backf.png
similarity index 100%
rename from graphics/pokemon/doduo/backf.png
rename to graphics/pokemon/gen_1/doduo/backf.png
diff --git a/graphics/pokemon/doduo/footprint.png b/graphics/pokemon/gen_1/doduo/footprint.png
similarity index 100%
rename from graphics/pokemon/doduo/footprint.png
rename to graphics/pokemon/gen_1/doduo/footprint.png
diff --git a/graphics/pokemon/doduo/icon.png b/graphics/pokemon/gen_1/doduo/icon.png
similarity index 100%
rename from graphics/pokemon/doduo/icon.png
rename to graphics/pokemon/gen_1/doduo/icon.png
diff --git a/graphics/pokemon/doduo/normal.pal b/graphics/pokemon/gen_1/doduo/normal.pal
similarity index 100%
rename from graphics/pokemon/doduo/normal.pal
rename to graphics/pokemon/gen_1/doduo/normal.pal
diff --git a/graphics/pokemon/doduo/shiny.pal b/graphics/pokemon/gen_1/doduo/shiny.pal
similarity index 100%
rename from graphics/pokemon/doduo/shiny.pal
rename to graphics/pokemon/gen_1/doduo/shiny.pal
diff --git a/graphics/pokemon/dragonair/anim_front.png b/graphics/pokemon/gen_1/dragonair/anim_front.png
similarity index 100%
rename from graphics/pokemon/dragonair/anim_front.png
rename to graphics/pokemon/gen_1/dragonair/anim_front.png
diff --git a/graphics/pokemon/dragonair/back.png b/graphics/pokemon/gen_1/dragonair/back.png
similarity index 100%
rename from graphics/pokemon/dragonair/back.png
rename to graphics/pokemon/gen_1/dragonair/back.png
diff --git a/graphics/pokemon/anorith/footprint.png b/graphics/pokemon/gen_1/dragonair/footprint.png
similarity index 100%
rename from graphics/pokemon/anorith/footprint.png
rename to graphics/pokemon/gen_1/dragonair/footprint.png
diff --git a/graphics/pokemon/dragonair/icon.png b/graphics/pokemon/gen_1/dragonair/icon.png
similarity index 100%
rename from graphics/pokemon/dragonair/icon.png
rename to graphics/pokemon/gen_1/dragonair/icon.png
diff --git a/graphics/pokemon/dragonair/normal.pal b/graphics/pokemon/gen_1/dragonair/normal.pal
similarity index 100%
rename from graphics/pokemon/dragonair/normal.pal
rename to graphics/pokemon/gen_1/dragonair/normal.pal
diff --git a/graphics/pokemon/dragonair/shiny.pal b/graphics/pokemon/gen_1/dragonair/shiny.pal
similarity index 100%
rename from graphics/pokemon/dragonair/shiny.pal
rename to graphics/pokemon/gen_1/dragonair/shiny.pal
diff --git a/graphics/pokemon/dragonite/anim_front.png b/graphics/pokemon/gen_1/dragonite/anim_front.png
similarity index 100%
rename from graphics/pokemon/dragonite/anim_front.png
rename to graphics/pokemon/gen_1/dragonite/anim_front.png
diff --git a/graphics/pokemon/dragonite/back.png b/graphics/pokemon/gen_1/dragonite/back.png
similarity index 100%
rename from graphics/pokemon/dragonite/back.png
rename to graphics/pokemon/gen_1/dragonite/back.png
diff --git a/graphics/pokemon/dracovish/footprint.png b/graphics/pokemon/gen_1/dragonite/footprint.png
similarity index 100%
rename from graphics/pokemon/dracovish/footprint.png
rename to graphics/pokemon/gen_1/dragonite/footprint.png
diff --git a/graphics/pokemon/dragonite/icon.png b/graphics/pokemon/gen_1/dragonite/icon.png
similarity index 100%
rename from graphics/pokemon/dragonite/icon.png
rename to graphics/pokemon/gen_1/dragonite/icon.png
diff --git a/graphics/pokemon/dragonite/normal.pal b/graphics/pokemon/gen_1/dragonite/normal.pal
similarity index 100%
rename from graphics/pokemon/dragonite/normal.pal
rename to graphics/pokemon/gen_1/dragonite/normal.pal
diff --git a/graphics/pokemon/dragonite/shiny.pal b/graphics/pokemon/gen_1/dragonite/shiny.pal
similarity index 100%
rename from graphics/pokemon/dragonite/shiny.pal
rename to graphics/pokemon/gen_1/dragonite/shiny.pal
diff --git a/graphics/pokemon/dratini/anim_front.png b/graphics/pokemon/gen_1/dratini/anim_front.png
similarity index 100%
rename from graphics/pokemon/dratini/anim_front.png
rename to graphics/pokemon/gen_1/dratini/anim_front.png
diff --git a/graphics/pokemon/dratini/back.png b/graphics/pokemon/gen_1/dratini/back.png
similarity index 100%
rename from graphics/pokemon/dratini/back.png
rename to graphics/pokemon/gen_1/dratini/back.png
diff --git a/graphics/pokemon/applin/footprint.png b/graphics/pokemon/gen_1/dratini/footprint.png
similarity index 100%
rename from graphics/pokemon/applin/footprint.png
rename to graphics/pokemon/gen_1/dratini/footprint.png
diff --git a/graphics/pokemon/dratini/icon.png b/graphics/pokemon/gen_1/dratini/icon.png
similarity index 100%
rename from graphics/pokemon/dratini/icon.png
rename to graphics/pokemon/gen_1/dratini/icon.png
diff --git a/graphics/pokemon/dratini/normal.pal b/graphics/pokemon/gen_1/dratini/normal.pal
similarity index 100%
rename from graphics/pokemon/dratini/normal.pal
rename to graphics/pokemon/gen_1/dratini/normal.pal
diff --git a/graphics/pokemon/dratini/shiny.pal b/graphics/pokemon/gen_1/dratini/shiny.pal
similarity index 100%
rename from graphics/pokemon/dratini/shiny.pal
rename to graphics/pokemon/gen_1/dratini/shiny.pal
diff --git a/graphics/pokemon/drowzee/anim_front.png b/graphics/pokemon/gen_1/drowzee/anim_front.png
similarity index 100%
rename from graphics/pokemon/drowzee/anim_front.png
rename to graphics/pokemon/gen_1/drowzee/anim_front.png
diff --git a/graphics/pokemon/drowzee/back.png b/graphics/pokemon/gen_1/drowzee/back.png
similarity index 100%
rename from graphics/pokemon/drowzee/back.png
rename to graphics/pokemon/gen_1/drowzee/back.png
diff --git a/graphics/pokemon/drowzee/footprint.png b/graphics/pokemon/gen_1/drowzee/footprint.png
similarity index 100%
rename from graphics/pokemon/drowzee/footprint.png
rename to graphics/pokemon/gen_1/drowzee/footprint.png
diff --git a/graphics/pokemon/drowzee/icon.png b/graphics/pokemon/gen_1/drowzee/icon.png
similarity index 100%
rename from graphics/pokemon/drowzee/icon.png
rename to graphics/pokemon/gen_1/drowzee/icon.png
diff --git a/graphics/pokemon/drowzee/normal.pal b/graphics/pokemon/gen_1/drowzee/normal.pal
similarity index 100%
rename from graphics/pokemon/drowzee/normal.pal
rename to graphics/pokemon/gen_1/drowzee/normal.pal
diff --git a/graphics/pokemon/drowzee/shiny.pal b/graphics/pokemon/gen_1/drowzee/shiny.pal
similarity index 100%
rename from graphics/pokemon/drowzee/shiny.pal
rename to graphics/pokemon/gen_1/drowzee/shiny.pal
diff --git a/graphics/pokemon/dugtrio/alolan/back.png b/graphics/pokemon/gen_1/dugtrio/alolan/back.png
similarity index 100%
rename from graphics/pokemon/dugtrio/alolan/back.png
rename to graphics/pokemon/gen_1/dugtrio/alolan/back.png
diff --git a/graphics/pokemon/dugtrio/alolan/front.png b/graphics/pokemon/gen_1/dugtrio/alolan/front.png
similarity index 100%
rename from graphics/pokemon/dugtrio/alolan/front.png
rename to graphics/pokemon/gen_1/dugtrio/alolan/front.png
diff --git a/graphics/pokemon/dugtrio/alolan/icon.png b/graphics/pokemon/gen_1/dugtrio/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/dugtrio/alolan/icon.png
rename to graphics/pokemon/gen_1/dugtrio/alolan/icon.png
diff --git a/graphics/pokemon/dugtrio/alolan/normal.pal b/graphics/pokemon/gen_1/dugtrio/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/dugtrio/alolan/normal.pal
rename to graphics/pokemon/gen_1/dugtrio/alolan/normal.pal
diff --git a/graphics/pokemon/dugtrio/alolan/shiny.pal b/graphics/pokemon/gen_1/dugtrio/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/dugtrio/alolan/shiny.pal
rename to graphics/pokemon/gen_1/dugtrio/alolan/shiny.pal
diff --git a/graphics/pokemon/dugtrio/anim_front.png b/graphics/pokemon/gen_1/dugtrio/anim_front.png
similarity index 100%
rename from graphics/pokemon/dugtrio/anim_front.png
rename to graphics/pokemon/gen_1/dugtrio/anim_front.png
diff --git a/graphics/pokemon/dugtrio/back.png b/graphics/pokemon/gen_1/dugtrio/back.png
similarity index 100%
rename from graphics/pokemon/dugtrio/back.png
rename to graphics/pokemon/gen_1/dugtrio/back.png
diff --git a/graphics/pokemon/arbok/footprint.png b/graphics/pokemon/gen_1/dugtrio/footprint.png
similarity index 100%
rename from graphics/pokemon/arbok/footprint.png
rename to graphics/pokemon/gen_1/dugtrio/footprint.png
diff --git a/graphics/pokemon/dugtrio/icon.png b/graphics/pokemon/gen_1/dugtrio/icon.png
similarity index 100%
rename from graphics/pokemon/dugtrio/icon.png
rename to graphics/pokemon/gen_1/dugtrio/icon.png
diff --git a/graphics/pokemon/dugtrio/normal.pal b/graphics/pokemon/gen_1/dugtrio/normal.pal
similarity index 100%
rename from graphics/pokemon/dugtrio/normal.pal
rename to graphics/pokemon/gen_1/dugtrio/normal.pal
diff --git a/graphics/pokemon/dugtrio/shiny.pal b/graphics/pokemon/gen_1/dugtrio/shiny.pal
similarity index 100%
rename from graphics/pokemon/dugtrio/shiny.pal
rename to graphics/pokemon/gen_1/dugtrio/shiny.pal
diff --git a/graphics/pokemon/eevee/anim_front.png b/graphics/pokemon/gen_1/eevee/anim_front.png
similarity index 100%
rename from graphics/pokemon/eevee/anim_front.png
rename to graphics/pokemon/gen_1/eevee/anim_front.png
diff --git a/graphics/pokemon/eevee/anim_frontf.png b/graphics/pokemon/gen_1/eevee/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/eevee/anim_frontf.png
rename to graphics/pokemon/gen_1/eevee/anim_frontf.png
diff --git a/graphics/pokemon/eevee/back.png b/graphics/pokemon/gen_1/eevee/back.png
similarity index 100%
rename from graphics/pokemon/eevee/back.png
rename to graphics/pokemon/gen_1/eevee/back.png
diff --git a/graphics/pokemon/eevee/backf.png b/graphics/pokemon/gen_1/eevee/backf.png
similarity index 100%
rename from graphics/pokemon/eevee/backf.png
rename to graphics/pokemon/gen_1/eevee/backf.png
diff --git a/graphics/pokemon/eevee/footprint.png b/graphics/pokemon/gen_1/eevee/footprint.png
similarity index 100%
rename from graphics/pokemon/eevee/footprint.png
rename to graphics/pokemon/gen_1/eevee/footprint.png
diff --git a/graphics/pokemon/eevee/frontf.png b/graphics/pokemon/gen_1/eevee/frontf.png
similarity index 100%
rename from graphics/pokemon/eevee/frontf.png
rename to graphics/pokemon/gen_1/eevee/frontf.png
diff --git a/graphics/pokemon/eevee/gigantamax/back.png b/graphics/pokemon/gen_1/eevee/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/eevee/gigantamax/back.png
rename to graphics/pokemon/gen_1/eevee/gigantamax/back.png
diff --git a/graphics/pokemon/eevee/gigantamax/front.png b/graphics/pokemon/gen_1/eevee/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/eevee/gigantamax/front.png
rename to graphics/pokemon/gen_1/eevee/gigantamax/front.png
diff --git a/graphics/pokemon/eevee/gigantamax/icon.png b/graphics/pokemon/gen_1/eevee/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/eevee/gigantamax/icon.png
rename to graphics/pokemon/gen_1/eevee/gigantamax/icon.png
diff --git a/graphics/pokemon/eevee/gigantamax/normal.pal b/graphics/pokemon/gen_1/eevee/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/eevee/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/eevee/gigantamax/normal.pal
diff --git a/graphics/pokemon/eevee/gigantamax/shiny.pal b/graphics/pokemon/gen_1/eevee/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/eevee/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/eevee/gigantamax/shiny.pal
diff --git a/graphics/pokemon/eevee/icon.png b/graphics/pokemon/gen_1/eevee/icon.png
similarity index 100%
rename from graphics/pokemon/eevee/icon.png
rename to graphics/pokemon/gen_1/eevee/icon.png
diff --git a/graphics/pokemon/eevee/normal.pal b/graphics/pokemon/gen_1/eevee/normal.pal
similarity index 100%
rename from graphics/pokemon/eevee/normal.pal
rename to graphics/pokemon/gen_1/eevee/normal.pal
diff --git a/graphics/pokemon/eevee/shiny.pal b/graphics/pokemon/gen_1/eevee/shiny.pal
similarity index 100%
rename from graphics/pokemon/eevee/shiny.pal
rename to graphics/pokemon/gen_1/eevee/shiny.pal
diff --git a/graphics/pokemon/ekans/anim_front.png b/graphics/pokemon/gen_1/ekans/anim_front.png
similarity index 100%
rename from graphics/pokemon/ekans/anim_front.png
rename to graphics/pokemon/gen_1/ekans/anim_front.png
diff --git a/graphics/pokemon/ekans/back.png b/graphics/pokemon/gen_1/ekans/back.png
similarity index 100%
rename from graphics/pokemon/ekans/back.png
rename to graphics/pokemon/gen_1/ekans/back.png
diff --git a/graphics/pokemon/arrokuda/footprint.png b/graphics/pokemon/gen_1/ekans/footprint.png
similarity index 100%
rename from graphics/pokemon/arrokuda/footprint.png
rename to graphics/pokemon/gen_1/ekans/footprint.png
diff --git a/graphics/pokemon/ekans/icon.png b/graphics/pokemon/gen_1/ekans/icon.png
similarity index 100%
rename from graphics/pokemon/ekans/icon.png
rename to graphics/pokemon/gen_1/ekans/icon.png
diff --git a/graphics/pokemon/ekans/normal.pal b/graphics/pokemon/gen_1/ekans/normal.pal
similarity index 100%
rename from graphics/pokemon/ekans/normal.pal
rename to graphics/pokemon/gen_1/ekans/normal.pal
diff --git a/graphics/pokemon/ekans/shiny.pal b/graphics/pokemon/gen_1/ekans/shiny.pal
similarity index 100%
rename from graphics/pokemon/ekans/shiny.pal
rename to graphics/pokemon/gen_1/ekans/shiny.pal
diff --git a/graphics/pokemon/electabuzz/anim_front.png b/graphics/pokemon/gen_1/electabuzz/anim_front.png
similarity index 100%
rename from graphics/pokemon/electabuzz/anim_front.png
rename to graphics/pokemon/gen_1/electabuzz/anim_front.png
diff --git a/graphics/pokemon/electabuzz/back.png b/graphics/pokemon/gen_1/electabuzz/back.png
similarity index 100%
rename from graphics/pokemon/electabuzz/back.png
rename to graphics/pokemon/gen_1/electabuzz/back.png
diff --git a/graphics/pokemon/electabuzz/footprint.png b/graphics/pokemon/gen_1/electabuzz/footprint.png
similarity index 100%
rename from graphics/pokemon/electabuzz/footprint.png
rename to graphics/pokemon/gen_1/electabuzz/footprint.png
diff --git a/graphics/pokemon/electabuzz/icon.png b/graphics/pokemon/gen_1/electabuzz/icon.png
similarity index 100%
rename from graphics/pokemon/electabuzz/icon.png
rename to graphics/pokemon/gen_1/electabuzz/icon.png
diff --git a/graphics/pokemon/electabuzz/normal.pal b/graphics/pokemon/gen_1/electabuzz/normal.pal
similarity index 100%
rename from graphics/pokemon/electabuzz/normal.pal
rename to graphics/pokemon/gen_1/electabuzz/normal.pal
diff --git a/graphics/pokemon/electabuzz/shiny.pal b/graphics/pokemon/gen_1/electabuzz/shiny.pal
similarity index 100%
rename from graphics/pokemon/electabuzz/shiny.pal
rename to graphics/pokemon/gen_1/electabuzz/shiny.pal
diff --git a/graphics/pokemon/electrode/anim_front.png b/graphics/pokemon/gen_1/electrode/anim_front.png
similarity index 100%
rename from graphics/pokemon/electrode/anim_front.png
rename to graphics/pokemon/gen_1/electrode/anim_front.png
diff --git a/graphics/pokemon/electrode/back.png b/graphics/pokemon/gen_1/electrode/back.png
similarity index 100%
rename from graphics/pokemon/electrode/back.png
rename to graphics/pokemon/gen_1/electrode/back.png
diff --git a/graphics/pokemon/barboach/footprint.png b/graphics/pokemon/gen_1/electrode/footprint.png
similarity index 100%
rename from graphics/pokemon/barboach/footprint.png
rename to graphics/pokemon/gen_1/electrode/footprint.png
diff --git a/graphics/pokemon/electrode/hisuian/back.png b/graphics/pokemon/gen_1/electrode/hisuian/back.png
similarity index 100%
rename from graphics/pokemon/electrode/hisuian/back.png
rename to graphics/pokemon/gen_1/electrode/hisuian/back.png
diff --git a/graphics/pokemon/electrode/hisuian/front.png b/graphics/pokemon/gen_1/electrode/hisuian/front.png
similarity index 100%
rename from graphics/pokemon/electrode/hisuian/front.png
rename to graphics/pokemon/gen_1/electrode/hisuian/front.png
diff --git a/graphics/pokemon/electrode/hisuian/icon.png b/graphics/pokemon/gen_1/electrode/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/electrode/hisuian/icon.png
rename to graphics/pokemon/gen_1/electrode/hisuian/icon.png
diff --git a/graphics/pokemon/electrode/hisuian/normal.pal b/graphics/pokemon/gen_1/electrode/hisuian/normal.pal
similarity index 100%
rename from graphics/pokemon/electrode/hisuian/normal.pal
rename to graphics/pokemon/gen_1/electrode/hisuian/normal.pal
diff --git a/graphics/pokemon/electrode/hisuian/shiny.pal b/graphics/pokemon/gen_1/electrode/hisuian/shiny.pal
similarity index 100%
rename from graphics/pokemon/electrode/hisuian/shiny.pal
rename to graphics/pokemon/gen_1/electrode/hisuian/shiny.pal
diff --git a/graphics/pokemon/electrode/icon.png b/graphics/pokemon/gen_1/electrode/icon.png
similarity index 100%
rename from graphics/pokemon/electrode/icon.png
rename to graphics/pokemon/gen_1/electrode/icon.png
diff --git a/graphics/pokemon/electrode/normal.pal b/graphics/pokemon/gen_1/electrode/normal.pal
similarity index 100%
rename from graphics/pokemon/electrode/normal.pal
rename to graphics/pokemon/gen_1/electrode/normal.pal
diff --git a/graphics/pokemon/electrode/shiny.pal b/graphics/pokemon/gen_1/electrode/shiny.pal
similarity index 100%
rename from graphics/pokemon/electrode/shiny.pal
rename to graphics/pokemon/gen_1/electrode/shiny.pal
diff --git a/graphics/pokemon/exeggcute/anim_front.png b/graphics/pokemon/gen_1/exeggcute/anim_front.png
similarity index 100%
rename from graphics/pokemon/exeggcute/anim_front.png
rename to graphics/pokemon/gen_1/exeggcute/anim_front.png
diff --git a/graphics/pokemon/exeggcute/back.png b/graphics/pokemon/gen_1/exeggcute/back.png
similarity index 100%
rename from graphics/pokemon/exeggcute/back.png
rename to graphics/pokemon/gen_1/exeggcute/back.png
diff --git a/graphics/pokemon/barraskewda/footprint.png b/graphics/pokemon/gen_1/exeggcute/footprint.png
similarity index 100%
rename from graphics/pokemon/barraskewda/footprint.png
rename to graphics/pokemon/gen_1/exeggcute/footprint.png
diff --git a/graphics/pokemon/exeggcute/icon.png b/graphics/pokemon/gen_1/exeggcute/icon.png
similarity index 100%
rename from graphics/pokemon/exeggcute/icon.png
rename to graphics/pokemon/gen_1/exeggcute/icon.png
diff --git a/graphics/pokemon/exeggcute/normal.pal b/graphics/pokemon/gen_1/exeggcute/normal.pal
similarity index 100%
rename from graphics/pokemon/exeggcute/normal.pal
rename to graphics/pokemon/gen_1/exeggcute/normal.pal
diff --git a/graphics/pokemon/exeggcute/shiny.pal b/graphics/pokemon/gen_1/exeggcute/shiny.pal
similarity index 100%
rename from graphics/pokemon/exeggcute/shiny.pal
rename to graphics/pokemon/gen_1/exeggcute/shiny.pal
diff --git a/graphics/pokemon/exeggutor/alolan/anim_front.png b/graphics/pokemon/gen_1/exeggutor/alolan/anim_front.png
similarity index 100%
rename from graphics/pokemon/exeggutor/alolan/anim_front.png
rename to graphics/pokemon/gen_1/exeggutor/alolan/anim_front.png
diff --git a/graphics/pokemon/exeggutor/alolan/back.png b/graphics/pokemon/gen_1/exeggutor/alolan/back.png
similarity index 100%
rename from graphics/pokemon/exeggutor/alolan/back.png
rename to graphics/pokemon/gen_1/exeggutor/alolan/back.png
diff --git a/graphics/pokemon/exeggutor/alolan/icon.png b/graphics/pokemon/gen_1/exeggutor/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/exeggutor/alolan/icon.png
rename to graphics/pokemon/gen_1/exeggutor/alolan/icon.png
diff --git a/graphics/pokemon/exeggutor/alolan/normal.pal b/graphics/pokemon/gen_1/exeggutor/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/exeggutor/alolan/normal.pal
rename to graphics/pokemon/gen_1/exeggutor/alolan/normal.pal
diff --git a/graphics/pokemon/exeggutor/alolan/shiny.pal b/graphics/pokemon/gen_1/exeggutor/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/exeggutor/alolan/shiny.pal
rename to graphics/pokemon/gen_1/exeggutor/alolan/shiny.pal
diff --git a/graphics/pokemon/exeggutor/anim_front.png b/graphics/pokemon/gen_1/exeggutor/anim_front.png
similarity index 100%
rename from graphics/pokemon/exeggutor/anim_front.png
rename to graphics/pokemon/gen_1/exeggutor/anim_front.png
diff --git a/graphics/pokemon/exeggutor/back.png b/graphics/pokemon/gen_1/exeggutor/back.png
similarity index 100%
rename from graphics/pokemon/exeggutor/back.png
rename to graphics/pokemon/gen_1/exeggutor/back.png
diff --git a/graphics/pokemon/exeggutor/footprint.png b/graphics/pokemon/gen_1/exeggutor/footprint.png
similarity index 100%
rename from graphics/pokemon/exeggutor/footprint.png
rename to graphics/pokemon/gen_1/exeggutor/footprint.png
diff --git a/graphics/pokemon/exeggutor/icon.png b/graphics/pokemon/gen_1/exeggutor/icon.png
similarity index 100%
rename from graphics/pokemon/exeggutor/icon.png
rename to graphics/pokemon/gen_1/exeggutor/icon.png
diff --git a/graphics/pokemon/exeggutor/normal.pal b/graphics/pokemon/gen_1/exeggutor/normal.pal
similarity index 100%
rename from graphics/pokemon/exeggutor/normal.pal
rename to graphics/pokemon/gen_1/exeggutor/normal.pal
diff --git a/graphics/pokemon/exeggutor/shiny.pal b/graphics/pokemon/gen_1/exeggutor/shiny.pal
similarity index 100%
rename from graphics/pokemon/exeggutor/shiny.pal
rename to graphics/pokemon/gen_1/exeggutor/shiny.pal
diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/gen_1/farfetchd/anim_front.png
similarity index 100%
rename from graphics/pokemon/farfetchd/anim_front.png
rename to graphics/pokemon/gen_1/farfetchd/anim_front.png
diff --git a/graphics/pokemon/farfetchd/back.png b/graphics/pokemon/gen_1/farfetchd/back.png
similarity index 100%
rename from graphics/pokemon/farfetchd/back.png
rename to graphics/pokemon/gen_1/farfetchd/back.png
diff --git a/graphics/pokemon/farfetchd/footprint.png b/graphics/pokemon/gen_1/farfetchd/footprint.png
similarity index 100%
rename from graphics/pokemon/farfetchd/footprint.png
rename to graphics/pokemon/gen_1/farfetchd/footprint.png
diff --git a/graphics/pokemon/farfetchd/galarian/back.png b/graphics/pokemon/gen_1/farfetchd/galarian/back.png
similarity index 100%
rename from graphics/pokemon/farfetchd/galarian/back.png
rename to graphics/pokemon/gen_1/farfetchd/galarian/back.png
diff --git a/graphics/pokemon/farfetchd/galarian/front.png b/graphics/pokemon/gen_1/farfetchd/galarian/front.png
similarity index 100%
rename from graphics/pokemon/farfetchd/galarian/front.png
rename to graphics/pokemon/gen_1/farfetchd/galarian/front.png
diff --git a/graphics/pokemon/farfetchd/galarian/icon.png b/graphics/pokemon/gen_1/farfetchd/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/farfetchd/galarian/icon.png
rename to graphics/pokemon/gen_1/farfetchd/galarian/icon.png
diff --git a/graphics/pokemon/farfetchd/galarian/normal.pal b/graphics/pokemon/gen_1/farfetchd/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/farfetchd/galarian/normal.pal
rename to graphics/pokemon/gen_1/farfetchd/galarian/normal.pal
diff --git a/graphics/pokemon/farfetchd/galarian/shiny.pal b/graphics/pokemon/gen_1/farfetchd/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/farfetchd/galarian/shiny.pal
rename to graphics/pokemon/gen_1/farfetchd/galarian/shiny.pal
diff --git a/graphics/pokemon/farfetchd/icon.png b/graphics/pokemon/gen_1/farfetchd/icon.png
similarity index 100%
rename from graphics/pokemon/farfetchd/icon.png
rename to graphics/pokemon/gen_1/farfetchd/icon.png
diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/gen_1/farfetchd/normal.pal
similarity index 100%
rename from graphics/pokemon/farfetchd/normal.pal
rename to graphics/pokemon/gen_1/farfetchd/normal.pal
diff --git a/graphics/pokemon/farfetchd/shiny.pal b/graphics/pokemon/gen_1/farfetchd/shiny.pal
similarity index 100%
rename from graphics/pokemon/farfetchd/shiny.pal
rename to graphics/pokemon/gen_1/farfetchd/shiny.pal
diff --git a/graphics/pokemon/fearow/anim_front.png b/graphics/pokemon/gen_1/fearow/anim_front.png
similarity index 100%
rename from graphics/pokemon/fearow/anim_front.png
rename to graphics/pokemon/gen_1/fearow/anim_front.png
diff --git a/graphics/pokemon/fearow/back.png b/graphics/pokemon/gen_1/fearow/back.png
similarity index 100%
rename from graphics/pokemon/fearow/back.png
rename to graphics/pokemon/gen_1/fearow/back.png
diff --git a/graphics/pokemon/fearow/footprint.png b/graphics/pokemon/gen_1/fearow/footprint.png
similarity index 100%
rename from graphics/pokemon/fearow/footprint.png
rename to graphics/pokemon/gen_1/fearow/footprint.png
diff --git a/graphics/pokemon/fearow/icon.png b/graphics/pokemon/gen_1/fearow/icon.png
similarity index 100%
rename from graphics/pokemon/fearow/icon.png
rename to graphics/pokemon/gen_1/fearow/icon.png
diff --git a/graphics/pokemon/fearow/normal.pal b/graphics/pokemon/gen_1/fearow/normal.pal
similarity index 100%
rename from graphics/pokemon/fearow/normal.pal
rename to graphics/pokemon/gen_1/fearow/normal.pal
diff --git a/graphics/pokemon/fearow/shiny.pal b/graphics/pokemon/gen_1/fearow/shiny.pal
similarity index 100%
rename from graphics/pokemon/fearow/shiny.pal
rename to graphics/pokemon/gen_1/fearow/shiny.pal
diff --git a/graphics/pokemon/flareon/anim_front.png b/graphics/pokemon/gen_1/flareon/anim_front.png
similarity index 100%
rename from graphics/pokemon/flareon/anim_front.png
rename to graphics/pokemon/gen_1/flareon/anim_front.png
diff --git a/graphics/pokemon/flareon/back.png b/graphics/pokemon/gen_1/flareon/back.png
similarity index 100%
rename from graphics/pokemon/flareon/back.png
rename to graphics/pokemon/gen_1/flareon/back.png
diff --git a/graphics/pokemon/boltund/footprint.png b/graphics/pokemon/gen_1/flareon/footprint.png
similarity index 100%
rename from graphics/pokemon/boltund/footprint.png
rename to graphics/pokemon/gen_1/flareon/footprint.png
diff --git a/graphics/pokemon/flareon/icon.png b/graphics/pokemon/gen_1/flareon/icon.png
similarity index 100%
rename from graphics/pokemon/flareon/icon.png
rename to graphics/pokemon/gen_1/flareon/icon.png
diff --git a/graphics/pokemon/flareon/normal.pal b/graphics/pokemon/gen_1/flareon/normal.pal
similarity index 100%
rename from graphics/pokemon/flareon/normal.pal
rename to graphics/pokemon/gen_1/flareon/normal.pal
diff --git a/graphics/pokemon/flareon/shiny.pal b/graphics/pokemon/gen_1/flareon/shiny.pal
similarity index 100%
rename from graphics/pokemon/flareon/shiny.pal
rename to graphics/pokemon/gen_1/flareon/shiny.pal
diff --git a/graphics/pokemon/gastly/anim_front.png b/graphics/pokemon/gen_1/gastly/anim_front.png
similarity index 100%
rename from graphics/pokemon/gastly/anim_front.png
rename to graphics/pokemon/gen_1/gastly/anim_front.png
diff --git a/graphics/pokemon/gastly/back.png b/graphics/pokemon/gen_1/gastly/back.png
similarity index 100%
rename from graphics/pokemon/gastly/back.png
rename to graphics/pokemon/gen_1/gastly/back.png
diff --git a/graphics/pokemon/basculin/footprint.png b/graphics/pokemon/gen_1/gastly/footprint.png
similarity index 100%
rename from graphics/pokemon/basculin/footprint.png
rename to graphics/pokemon/gen_1/gastly/footprint.png
diff --git a/graphics/pokemon/gastly/icon.png b/graphics/pokemon/gen_1/gastly/icon.png
similarity index 100%
rename from graphics/pokemon/gastly/icon.png
rename to graphics/pokemon/gen_1/gastly/icon.png
diff --git a/graphics/pokemon/gastly/normal.pal b/graphics/pokemon/gen_1/gastly/normal.pal
similarity index 100%
rename from graphics/pokemon/gastly/normal.pal
rename to graphics/pokemon/gen_1/gastly/normal.pal
diff --git a/graphics/pokemon/gastly/shiny.pal b/graphics/pokemon/gen_1/gastly/shiny.pal
similarity index 100%
rename from graphics/pokemon/gastly/shiny.pal
rename to graphics/pokemon/gen_1/gastly/shiny.pal
diff --git a/graphics/pokemon/gengar/anim_front.png b/graphics/pokemon/gen_1/gengar/anim_front.png
similarity index 100%
rename from graphics/pokemon/gengar/anim_front.png
rename to graphics/pokemon/gen_1/gengar/anim_front.png
diff --git a/graphics/pokemon/gengar/back.png b/graphics/pokemon/gen_1/gengar/back.png
similarity index 100%
rename from graphics/pokemon/gengar/back.png
rename to graphics/pokemon/gen_1/gengar/back.png
diff --git a/graphics/pokemon/gengar/footprint.png b/graphics/pokemon/gen_1/gengar/footprint.png
similarity index 100%
rename from graphics/pokemon/gengar/footprint.png
rename to graphics/pokemon/gen_1/gengar/footprint.png
diff --git a/graphics/pokemon/gengar/gigantamax/back.png b/graphics/pokemon/gen_1/gengar/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/gengar/gigantamax/back.png
rename to graphics/pokemon/gen_1/gengar/gigantamax/back.png
diff --git a/graphics/pokemon/gengar/gigantamax/front.png b/graphics/pokemon/gen_1/gengar/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/gengar/gigantamax/front.png
rename to graphics/pokemon/gen_1/gengar/gigantamax/front.png
diff --git a/graphics/pokemon/gengar/gigantamax/icon.png b/graphics/pokemon/gen_1/gengar/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/gengar/gigantamax/icon.png
rename to graphics/pokemon/gen_1/gengar/gigantamax/icon.png
diff --git a/graphics/pokemon/gengar/gigantamax/normal.pal b/graphics/pokemon/gen_1/gengar/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/gengar/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/gengar/gigantamax/normal.pal
diff --git a/graphics/pokemon/gengar/gigantamax/shiny.pal b/graphics/pokemon/gen_1/gengar/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gengar/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/gengar/gigantamax/shiny.pal
diff --git a/graphics/pokemon/gengar/icon.png b/graphics/pokemon/gen_1/gengar/icon.png
similarity index 100%
rename from graphics/pokemon/gengar/icon.png
rename to graphics/pokemon/gen_1/gengar/icon.png
diff --git a/graphics/pokemon/gengar/mega/back.png b/graphics/pokemon/gen_1/gengar/mega/back.png
similarity index 100%
rename from graphics/pokemon/gengar/mega/back.png
rename to graphics/pokemon/gen_1/gengar/mega/back.png
diff --git a/graphics/pokemon/gengar/mega/front.png b/graphics/pokemon/gen_1/gengar/mega/front.png
similarity index 100%
rename from graphics/pokemon/gengar/mega/front.png
rename to graphics/pokemon/gen_1/gengar/mega/front.png
diff --git a/graphics/pokemon/gengar/mega/icon.png b/graphics/pokemon/gen_1/gengar/mega/icon.png
similarity index 100%
rename from graphics/pokemon/gengar/mega/icon.png
rename to graphics/pokemon/gen_1/gengar/mega/icon.png
diff --git a/graphics/pokemon/gengar/mega/normal.pal b/graphics/pokemon/gen_1/gengar/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/gengar/mega/normal.pal
rename to graphics/pokemon/gen_1/gengar/mega/normal.pal
diff --git a/graphics/pokemon/gengar/mega/shiny.pal b/graphics/pokemon/gen_1/gengar/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/gengar/mega/shiny.pal
rename to graphics/pokemon/gen_1/gengar/mega/shiny.pal
diff --git a/graphics/pokemon/gengar/normal.pal b/graphics/pokemon/gen_1/gengar/normal.pal
similarity index 100%
rename from graphics/pokemon/gengar/normal.pal
rename to graphics/pokemon/gen_1/gengar/normal.pal
diff --git a/graphics/pokemon/gengar/shiny.pal b/graphics/pokemon/gen_1/gengar/shiny.pal
similarity index 100%
rename from graphics/pokemon/gengar/shiny.pal
rename to graphics/pokemon/gen_1/gengar/shiny.pal
diff --git a/graphics/pokemon/geodude/alolan/back.png b/graphics/pokemon/gen_1/geodude/alolan/back.png
similarity index 100%
rename from graphics/pokemon/geodude/alolan/back.png
rename to graphics/pokemon/gen_1/geodude/alolan/back.png
diff --git a/graphics/pokemon/geodude/alolan/front.png b/graphics/pokemon/gen_1/geodude/alolan/front.png
similarity index 100%
rename from graphics/pokemon/geodude/alolan/front.png
rename to graphics/pokemon/gen_1/geodude/alolan/front.png
diff --git a/graphics/pokemon/geodude/alolan/icon.png b/graphics/pokemon/gen_1/geodude/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/geodude/alolan/icon.png
rename to graphics/pokemon/gen_1/geodude/alolan/icon.png
diff --git a/graphics/pokemon/geodude/alolan/normal.pal b/graphics/pokemon/gen_1/geodude/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/geodude/alolan/normal.pal
rename to graphics/pokemon/gen_1/geodude/alolan/normal.pal
diff --git a/graphics/pokemon/geodude/alolan/shiny.pal b/graphics/pokemon/gen_1/geodude/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/geodude/alolan/shiny.pal
rename to graphics/pokemon/gen_1/geodude/alolan/shiny.pal
diff --git a/graphics/pokemon/geodude/anim_front.png b/graphics/pokemon/gen_1/geodude/anim_front.png
similarity index 100%
rename from graphics/pokemon/geodude/anim_front.png
rename to graphics/pokemon/gen_1/geodude/anim_front.png
diff --git a/graphics/pokemon/geodude/back.png b/graphics/pokemon/gen_1/geodude/back.png
similarity index 100%
rename from graphics/pokemon/geodude/back.png
rename to graphics/pokemon/gen_1/geodude/back.png
diff --git a/graphics/pokemon/bellossom/footprint.png b/graphics/pokemon/gen_1/geodude/footprint.png
similarity index 100%
rename from graphics/pokemon/bellossom/footprint.png
rename to graphics/pokemon/gen_1/geodude/footprint.png
diff --git a/graphics/pokemon/geodude/icon.png b/graphics/pokemon/gen_1/geodude/icon.png
similarity index 100%
rename from graphics/pokemon/geodude/icon.png
rename to graphics/pokemon/gen_1/geodude/icon.png
diff --git a/graphics/pokemon/geodude/normal.pal b/graphics/pokemon/gen_1/geodude/normal.pal
similarity index 100%
rename from graphics/pokemon/geodude/normal.pal
rename to graphics/pokemon/gen_1/geodude/normal.pal
diff --git a/graphics/pokemon/geodude/shiny.pal b/graphics/pokemon/gen_1/geodude/shiny.pal
similarity index 100%
rename from graphics/pokemon/geodude/shiny.pal
rename to graphics/pokemon/gen_1/geodude/shiny.pal
diff --git a/graphics/pokemon/gloom/anim_front.png b/graphics/pokemon/gen_1/gloom/anim_front.png
similarity index 100%
rename from graphics/pokemon/gloom/anim_front.png
rename to graphics/pokemon/gen_1/gloom/anim_front.png
diff --git a/graphics/pokemon/gloom/anim_frontf.png b/graphics/pokemon/gen_1/gloom/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gloom/anim_frontf.png
rename to graphics/pokemon/gen_1/gloom/anim_frontf.png
diff --git a/graphics/pokemon/gloom/back.png b/graphics/pokemon/gen_1/gloom/back.png
similarity index 100%
rename from graphics/pokemon/gloom/back.png
rename to graphics/pokemon/gen_1/gloom/back.png
diff --git a/graphics/pokemon/gloom/backf.png b/graphics/pokemon/gen_1/gloom/backf.png
similarity index 100%
rename from graphics/pokemon/gloom/backf.png
rename to graphics/pokemon/gen_1/gloom/backf.png
diff --git a/graphics/pokemon/gloom/footprint.png b/graphics/pokemon/gen_1/gloom/footprint.png
similarity index 100%
rename from graphics/pokemon/gloom/footprint.png
rename to graphics/pokemon/gen_1/gloom/footprint.png
diff --git a/graphics/pokemon/gloom/icon.png b/graphics/pokemon/gen_1/gloom/icon.png
similarity index 100%
rename from graphics/pokemon/gloom/icon.png
rename to graphics/pokemon/gen_1/gloom/icon.png
diff --git a/graphics/pokemon/gloom/normal.pal b/graphics/pokemon/gen_1/gloom/normal.pal
similarity index 100%
rename from graphics/pokemon/gloom/normal.pal
rename to graphics/pokemon/gen_1/gloom/normal.pal
diff --git a/graphics/pokemon/gloom/shiny.pal b/graphics/pokemon/gen_1/gloom/shiny.pal
similarity index 100%
rename from graphics/pokemon/gloom/shiny.pal
rename to graphics/pokemon/gen_1/gloom/shiny.pal
diff --git a/graphics/pokemon/golbat/anim_front.png b/graphics/pokemon/gen_1/golbat/anim_front.png
similarity index 100%
rename from graphics/pokemon/golbat/anim_front.png
rename to graphics/pokemon/gen_1/golbat/anim_front.png
diff --git a/graphics/pokemon/golbat/anim_frontf.png b/graphics/pokemon/gen_1/golbat/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/golbat/anim_frontf.png
rename to graphics/pokemon/gen_1/golbat/anim_frontf.png
diff --git a/graphics/pokemon/golbat/back.png b/graphics/pokemon/gen_1/golbat/back.png
similarity index 100%
rename from graphics/pokemon/golbat/back.png
rename to graphics/pokemon/gen_1/golbat/back.png
diff --git a/graphics/pokemon/golbat/backf.png b/graphics/pokemon/gen_1/golbat/backf.png
similarity index 100%
rename from graphics/pokemon/golbat/backf.png
rename to graphics/pokemon/gen_1/golbat/backf.png
diff --git a/graphics/pokemon/golbat/footprint.png b/graphics/pokemon/gen_1/golbat/footprint.png
similarity index 100%
rename from graphics/pokemon/golbat/footprint.png
rename to graphics/pokemon/gen_1/golbat/footprint.png
diff --git a/graphics/pokemon/golbat/icon.png b/graphics/pokemon/gen_1/golbat/icon.png
similarity index 100%
rename from graphics/pokemon/golbat/icon.png
rename to graphics/pokemon/gen_1/golbat/icon.png
diff --git a/graphics/pokemon/golbat/normal.pal b/graphics/pokemon/gen_1/golbat/normal.pal
similarity index 100%
rename from graphics/pokemon/golbat/normal.pal
rename to graphics/pokemon/gen_1/golbat/normal.pal
diff --git a/graphics/pokemon/golbat/shiny.pal b/graphics/pokemon/gen_1/golbat/shiny.pal
similarity index 100%
rename from graphics/pokemon/golbat/shiny.pal
rename to graphics/pokemon/gen_1/golbat/shiny.pal
diff --git a/graphics/pokemon/goldeen/anim_front.png b/graphics/pokemon/gen_1/goldeen/anim_front.png
similarity index 100%
rename from graphics/pokemon/goldeen/anim_front.png
rename to graphics/pokemon/gen_1/goldeen/anim_front.png
diff --git a/graphics/pokemon/goldeen/anim_frontf.png b/graphics/pokemon/gen_1/goldeen/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/goldeen/anim_frontf.png
rename to graphics/pokemon/gen_1/goldeen/anim_frontf.png
diff --git a/graphics/pokemon/goldeen/back.png b/graphics/pokemon/gen_1/goldeen/back.png
similarity index 100%
rename from graphics/pokemon/goldeen/back.png
rename to graphics/pokemon/gen_1/goldeen/back.png
diff --git a/graphics/pokemon/goldeen/backf.png b/graphics/pokemon/gen_1/goldeen/backf.png
similarity index 100%
rename from graphics/pokemon/goldeen/backf.png
rename to graphics/pokemon/gen_1/goldeen/backf.png
diff --git a/graphics/pokemon/binacle/footprint.png b/graphics/pokemon/gen_1/goldeen/footprint.png
similarity index 100%
rename from graphics/pokemon/binacle/footprint.png
rename to graphics/pokemon/gen_1/goldeen/footprint.png
diff --git a/graphics/pokemon/goldeen/icon.png b/graphics/pokemon/gen_1/goldeen/icon.png
similarity index 100%
rename from graphics/pokemon/goldeen/icon.png
rename to graphics/pokemon/gen_1/goldeen/icon.png
diff --git a/graphics/pokemon/goldeen/normal.pal b/graphics/pokemon/gen_1/goldeen/normal.pal
similarity index 100%
rename from graphics/pokemon/goldeen/normal.pal
rename to graphics/pokemon/gen_1/goldeen/normal.pal
diff --git a/graphics/pokemon/goldeen/shiny.pal b/graphics/pokemon/gen_1/goldeen/shiny.pal
similarity index 100%
rename from graphics/pokemon/goldeen/shiny.pal
rename to graphics/pokemon/gen_1/goldeen/shiny.pal
diff --git a/graphics/pokemon/golduck/anim_front.png b/graphics/pokemon/gen_1/golduck/anim_front.png
similarity index 100%
rename from graphics/pokemon/golduck/anim_front.png
rename to graphics/pokemon/gen_1/golduck/anim_front.png
diff --git a/graphics/pokemon/golduck/back.png b/graphics/pokemon/gen_1/golduck/back.png
similarity index 100%
rename from graphics/pokemon/golduck/back.png
rename to graphics/pokemon/gen_1/golduck/back.png
diff --git a/graphics/pokemon/golduck/footprint.png b/graphics/pokemon/gen_1/golduck/footprint.png
similarity index 100%
rename from graphics/pokemon/golduck/footprint.png
rename to graphics/pokemon/gen_1/golduck/footprint.png
diff --git a/graphics/pokemon/golduck/icon.png b/graphics/pokemon/gen_1/golduck/icon.png
similarity index 100%
rename from graphics/pokemon/golduck/icon.png
rename to graphics/pokemon/gen_1/golduck/icon.png
diff --git a/graphics/pokemon/golduck/normal.pal b/graphics/pokemon/gen_1/golduck/normal.pal
similarity index 100%
rename from graphics/pokemon/golduck/normal.pal
rename to graphics/pokemon/gen_1/golduck/normal.pal
diff --git a/graphics/pokemon/golduck/shiny.pal b/graphics/pokemon/gen_1/golduck/shiny.pal
similarity index 100%
rename from graphics/pokemon/golduck/shiny.pal
rename to graphics/pokemon/gen_1/golduck/shiny.pal
diff --git a/graphics/pokemon/golem/alolan/back.png b/graphics/pokemon/gen_1/golem/alolan/back.png
similarity index 100%
rename from graphics/pokemon/golem/alolan/back.png
rename to graphics/pokemon/gen_1/golem/alolan/back.png
diff --git a/graphics/pokemon/golem/alolan/front.png b/graphics/pokemon/gen_1/golem/alolan/front.png
similarity index 100%
rename from graphics/pokemon/golem/alolan/front.png
rename to graphics/pokemon/gen_1/golem/alolan/front.png
diff --git a/graphics/pokemon/golem/alolan/icon.png b/graphics/pokemon/gen_1/golem/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/golem/alolan/icon.png
rename to graphics/pokemon/gen_1/golem/alolan/icon.png
diff --git a/graphics/pokemon/golem/alolan/normal.pal b/graphics/pokemon/gen_1/golem/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/golem/alolan/normal.pal
rename to graphics/pokemon/gen_1/golem/alolan/normal.pal
diff --git a/graphics/pokemon/golem/alolan/shiny.pal b/graphics/pokemon/gen_1/golem/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/golem/alolan/shiny.pal
rename to graphics/pokemon/gen_1/golem/alolan/shiny.pal
diff --git a/graphics/pokemon/golem/anim_front.png b/graphics/pokemon/gen_1/golem/anim_front.png
similarity index 100%
rename from graphics/pokemon/golem/anim_front.png
rename to graphics/pokemon/gen_1/golem/anim_front.png
diff --git a/graphics/pokemon/golem/back.png b/graphics/pokemon/gen_1/golem/back.png
similarity index 100%
rename from graphics/pokemon/golem/back.png
rename to graphics/pokemon/gen_1/golem/back.png
diff --git a/graphics/pokemon/golem/footprint.png b/graphics/pokemon/gen_1/golem/footprint.png
similarity index 100%
rename from graphics/pokemon/golem/footprint.png
rename to graphics/pokemon/gen_1/golem/footprint.png
diff --git a/graphics/pokemon/golem/icon.png b/graphics/pokemon/gen_1/golem/icon.png
similarity index 100%
rename from graphics/pokemon/golem/icon.png
rename to graphics/pokemon/gen_1/golem/icon.png
diff --git a/graphics/pokemon/golem/normal.pal b/graphics/pokemon/gen_1/golem/normal.pal
similarity index 100%
rename from graphics/pokemon/golem/normal.pal
rename to graphics/pokemon/gen_1/golem/normal.pal
diff --git a/graphics/pokemon/golem/shiny.pal b/graphics/pokemon/gen_1/golem/shiny.pal
similarity index 100%
rename from graphics/pokemon/golem/shiny.pal
rename to graphics/pokemon/gen_1/golem/shiny.pal
diff --git a/graphics/pokemon/graveler/alolan/back.png b/graphics/pokemon/gen_1/graveler/alolan/back.png
similarity index 100%
rename from graphics/pokemon/graveler/alolan/back.png
rename to graphics/pokemon/gen_1/graveler/alolan/back.png
diff --git a/graphics/pokemon/graveler/alolan/front.png b/graphics/pokemon/gen_1/graveler/alolan/front.png
similarity index 100%
rename from graphics/pokemon/graveler/alolan/front.png
rename to graphics/pokemon/gen_1/graveler/alolan/front.png
diff --git a/graphics/pokemon/graveler/alolan/icon.png b/graphics/pokemon/gen_1/graveler/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/graveler/alolan/icon.png
rename to graphics/pokemon/gen_1/graveler/alolan/icon.png
diff --git a/graphics/pokemon/graveler/alolan/normal.pal b/graphics/pokemon/gen_1/graveler/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/graveler/alolan/normal.pal
rename to graphics/pokemon/gen_1/graveler/alolan/normal.pal
diff --git a/graphics/pokemon/graveler/alolan/shiny.pal b/graphics/pokemon/gen_1/graveler/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/graveler/alolan/shiny.pal
rename to graphics/pokemon/gen_1/graveler/alolan/shiny.pal
diff --git a/graphics/pokemon/graveler/anim_front.png b/graphics/pokemon/gen_1/graveler/anim_front.png
similarity index 100%
rename from graphics/pokemon/graveler/anim_front.png
rename to graphics/pokemon/gen_1/graveler/anim_front.png
diff --git a/graphics/pokemon/graveler/back.png b/graphics/pokemon/gen_1/graveler/back.png
similarity index 100%
rename from graphics/pokemon/graveler/back.png
rename to graphics/pokemon/gen_1/graveler/back.png
diff --git a/graphics/pokemon/graveler/footprint.png b/graphics/pokemon/gen_1/graveler/footprint.png
similarity index 100%
rename from graphics/pokemon/graveler/footprint.png
rename to graphics/pokemon/gen_1/graveler/footprint.png
diff --git a/graphics/pokemon/graveler/icon.png b/graphics/pokemon/gen_1/graveler/icon.png
similarity index 100%
rename from graphics/pokemon/graveler/icon.png
rename to graphics/pokemon/gen_1/graveler/icon.png
diff --git a/graphics/pokemon/graveler/normal.pal b/graphics/pokemon/gen_1/graveler/normal.pal
similarity index 100%
rename from graphics/pokemon/graveler/normal.pal
rename to graphics/pokemon/gen_1/graveler/normal.pal
diff --git a/graphics/pokemon/graveler/shiny.pal b/graphics/pokemon/gen_1/graveler/shiny.pal
similarity index 100%
rename from graphics/pokemon/graveler/shiny.pal
rename to graphics/pokemon/gen_1/graveler/shiny.pal
diff --git a/graphics/pokemon/grimer/alolan/back.png b/graphics/pokemon/gen_1/grimer/alolan/back.png
similarity index 100%
rename from graphics/pokemon/grimer/alolan/back.png
rename to graphics/pokemon/gen_1/grimer/alolan/back.png
diff --git a/graphics/pokemon/grimer/alolan/front.png b/graphics/pokemon/gen_1/grimer/alolan/front.png
similarity index 100%
rename from graphics/pokemon/grimer/alolan/front.png
rename to graphics/pokemon/gen_1/grimer/alolan/front.png
diff --git a/graphics/pokemon/grimer/alolan/icon.png b/graphics/pokemon/gen_1/grimer/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/grimer/alolan/icon.png
rename to graphics/pokemon/gen_1/grimer/alolan/icon.png
diff --git a/graphics/pokemon/grimer/alolan/normal.pal b/graphics/pokemon/gen_1/grimer/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/grimer/alolan/normal.pal
rename to graphics/pokemon/gen_1/grimer/alolan/normal.pal
diff --git a/graphics/pokemon/grimer/alolan/shiny.pal b/graphics/pokemon/gen_1/grimer/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/grimer/alolan/shiny.pal
rename to graphics/pokemon/gen_1/grimer/alolan/shiny.pal
diff --git a/graphics/pokemon/grimer/anim_front.png b/graphics/pokemon/gen_1/grimer/anim_front.png
similarity index 100%
rename from graphics/pokemon/grimer/anim_front.png
rename to graphics/pokemon/gen_1/grimer/anim_front.png
diff --git a/graphics/pokemon/grimer/back.png b/graphics/pokemon/gen_1/grimer/back.png
similarity index 100%
rename from graphics/pokemon/grimer/back.png
rename to graphics/pokemon/gen_1/grimer/back.png
diff --git a/graphics/pokemon/brionne/footprint.png b/graphics/pokemon/gen_1/grimer/footprint.png
similarity index 100%
rename from graphics/pokemon/brionne/footprint.png
rename to graphics/pokemon/gen_1/grimer/footprint.png
diff --git a/graphics/pokemon/grimer/icon.png b/graphics/pokemon/gen_1/grimer/icon.png
similarity index 100%
rename from graphics/pokemon/grimer/icon.png
rename to graphics/pokemon/gen_1/grimer/icon.png
diff --git a/graphics/pokemon/grimer/normal.pal b/graphics/pokemon/gen_1/grimer/normal.pal
similarity index 100%
rename from graphics/pokemon/grimer/normal.pal
rename to graphics/pokemon/gen_1/grimer/normal.pal
diff --git a/graphics/pokemon/grimer/shiny.pal b/graphics/pokemon/gen_1/grimer/shiny.pal
similarity index 100%
rename from graphics/pokemon/grimer/shiny.pal
rename to graphics/pokemon/gen_1/grimer/shiny.pal
diff --git a/graphics/pokemon/growlithe/anim_front.png b/graphics/pokemon/gen_1/growlithe/anim_front.png
similarity index 100%
rename from graphics/pokemon/growlithe/anim_front.png
rename to graphics/pokemon/gen_1/growlithe/anim_front.png
diff --git a/graphics/pokemon/growlithe/back.png b/graphics/pokemon/gen_1/growlithe/back.png
similarity index 100%
rename from graphics/pokemon/growlithe/back.png
rename to graphics/pokemon/gen_1/growlithe/back.png
diff --git a/graphics/pokemon/growlithe/footprint.png b/graphics/pokemon/gen_1/growlithe/footprint.png
similarity index 100%
rename from graphics/pokemon/growlithe/footprint.png
rename to graphics/pokemon/gen_1/growlithe/footprint.png
diff --git a/graphics/pokemon/growlithe/hisuian/back.png b/graphics/pokemon/gen_1/growlithe/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/growlithe/hisuian/back.png
rename to graphics/pokemon/gen_1/growlithe/hisuian/back.png
diff --git a/graphics/pokemon/growlithe/hisuian/front.png b/graphics/pokemon/gen_1/growlithe/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/growlithe/hisuian/front.png
rename to graphics/pokemon/gen_1/growlithe/hisuian/front.png
diff --git a/graphics/pokemon/growlithe/hisuian/icon.png b/graphics/pokemon/gen_1/growlithe/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/growlithe/hisuian/icon.png
rename to graphics/pokemon/gen_1/growlithe/hisuian/icon.png
diff --git a/graphics/pokemon/growlithe/hisuian/normal.pal b/graphics/pokemon/gen_1/growlithe/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/growlithe/hisuian/normal.pal
rename to graphics/pokemon/gen_1/growlithe/hisuian/normal.pal
diff --git a/graphics/pokemon/growlithe/hisuian/shiny.pal b/graphics/pokemon/gen_1/growlithe/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/growlithe/hisuian/shiny.pal
rename to graphics/pokemon/gen_1/growlithe/hisuian/shiny.pal
diff --git a/graphics/pokemon/growlithe/icon.png b/graphics/pokemon/gen_1/growlithe/icon.png
similarity index 100%
rename from graphics/pokemon/growlithe/icon.png
rename to graphics/pokemon/gen_1/growlithe/icon.png
diff --git a/graphics/pokemon/growlithe/normal.pal b/graphics/pokemon/gen_1/growlithe/normal.pal
similarity index 100%
rename from graphics/pokemon/growlithe/normal.pal
rename to graphics/pokemon/gen_1/growlithe/normal.pal
diff --git a/graphics/pokemon/growlithe/shiny.pal b/graphics/pokemon/gen_1/growlithe/shiny.pal
similarity index 100%
rename from graphics/pokemon/growlithe/shiny.pal
rename to graphics/pokemon/gen_1/growlithe/shiny.pal
diff --git a/graphics/pokemon/gyarados/anim_front.png b/graphics/pokemon/gen_1/gyarados/anim_front.png
similarity index 100%
rename from graphics/pokemon/gyarados/anim_front.png
rename to graphics/pokemon/gen_1/gyarados/anim_front.png
diff --git a/graphics/pokemon/gyarados/anim_frontf.png b/graphics/pokemon/gen_1/gyarados/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gyarados/anim_frontf.png
rename to graphics/pokemon/gen_1/gyarados/anim_frontf.png
diff --git a/graphics/pokemon/gyarados/back.png b/graphics/pokemon/gen_1/gyarados/back.png
similarity index 100%
rename from graphics/pokemon/gyarados/back.png
rename to graphics/pokemon/gen_1/gyarados/back.png
diff --git a/graphics/pokemon/gyarados/backf.png b/graphics/pokemon/gen_1/gyarados/backf.png
similarity index 100%
rename from graphics/pokemon/gyarados/backf.png
rename to graphics/pokemon/gen_1/gyarados/backf.png
diff --git a/graphics/pokemon/bronzong/footprint.png b/graphics/pokemon/gen_1/gyarados/footprint.png
similarity index 100%
rename from graphics/pokemon/bronzong/footprint.png
rename to graphics/pokemon/gen_1/gyarados/footprint.png
diff --git a/graphics/pokemon/gyarados/icon.png b/graphics/pokemon/gen_1/gyarados/icon.png
similarity index 100%
rename from graphics/pokemon/gyarados/icon.png
rename to graphics/pokemon/gen_1/gyarados/icon.png
diff --git a/graphics/pokemon/gyarados/mega/back.png b/graphics/pokemon/gen_1/gyarados/mega/back.png
similarity index 100%
rename from graphics/pokemon/gyarados/mega/back.png
rename to graphics/pokemon/gen_1/gyarados/mega/back.png
diff --git a/graphics/pokemon/gyarados/mega/front.png b/graphics/pokemon/gen_1/gyarados/mega/front.png
similarity index 100%
rename from graphics/pokemon/gyarados/mega/front.png
rename to graphics/pokemon/gen_1/gyarados/mega/front.png
diff --git a/graphics/pokemon/gyarados/mega/icon.png b/graphics/pokemon/gen_1/gyarados/mega/icon.png
similarity index 100%
rename from graphics/pokemon/gyarados/mega/icon.png
rename to graphics/pokemon/gen_1/gyarados/mega/icon.png
diff --git a/graphics/pokemon/gyarados/mega/normal.pal b/graphics/pokemon/gen_1/gyarados/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/gyarados/mega/normal.pal
rename to graphics/pokemon/gen_1/gyarados/mega/normal.pal
diff --git a/graphics/pokemon/gyarados/mega/shiny.pal b/graphics/pokemon/gen_1/gyarados/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/gyarados/mega/shiny.pal
rename to graphics/pokemon/gen_1/gyarados/mega/shiny.pal
diff --git a/graphics/pokemon/gyarados/normal.pal b/graphics/pokemon/gen_1/gyarados/normal.pal
similarity index 100%
rename from graphics/pokemon/gyarados/normal.pal
rename to graphics/pokemon/gen_1/gyarados/normal.pal
diff --git a/graphics/pokemon/gyarados/shiny.pal b/graphics/pokemon/gen_1/gyarados/shiny.pal
similarity index 100%
rename from graphics/pokemon/gyarados/shiny.pal
rename to graphics/pokemon/gen_1/gyarados/shiny.pal
diff --git a/graphics/pokemon/haunter/anim_front.png b/graphics/pokemon/gen_1/haunter/anim_front.png
similarity index 100%
rename from graphics/pokemon/haunter/anim_front.png
rename to graphics/pokemon/gen_1/haunter/anim_front.png
diff --git a/graphics/pokemon/haunter/back.png b/graphics/pokemon/gen_1/haunter/back.png
similarity index 100%
rename from graphics/pokemon/haunter/back.png
rename to graphics/pokemon/gen_1/haunter/back.png
diff --git a/graphics/pokemon/bronzor/footprint.png b/graphics/pokemon/gen_1/haunter/footprint.png
similarity index 100%
rename from graphics/pokemon/bronzor/footprint.png
rename to graphics/pokemon/gen_1/haunter/footprint.png
diff --git a/graphics/pokemon/haunter/icon.png b/graphics/pokemon/gen_1/haunter/icon.png
similarity index 100%
rename from graphics/pokemon/haunter/icon.png
rename to graphics/pokemon/gen_1/haunter/icon.png
diff --git a/graphics/pokemon/haunter/normal.pal b/graphics/pokemon/gen_1/haunter/normal.pal
similarity index 100%
rename from graphics/pokemon/haunter/normal.pal
rename to graphics/pokemon/gen_1/haunter/normal.pal
diff --git a/graphics/pokemon/haunter/shiny.pal b/graphics/pokemon/gen_1/haunter/shiny.pal
similarity index 100%
rename from graphics/pokemon/haunter/shiny.pal
rename to graphics/pokemon/gen_1/haunter/shiny.pal
diff --git a/graphics/pokemon/hitmonchan/anim_front.png b/graphics/pokemon/gen_1/hitmonchan/anim_front.png
similarity index 100%
rename from graphics/pokemon/hitmonchan/anim_front.png
rename to graphics/pokemon/gen_1/hitmonchan/anim_front.png
diff --git a/graphics/pokemon/hitmonchan/back.png b/graphics/pokemon/gen_1/hitmonchan/back.png
similarity index 100%
rename from graphics/pokemon/hitmonchan/back.png
rename to graphics/pokemon/gen_1/hitmonchan/back.png
diff --git a/graphics/pokemon/hitmonchan/footprint.png b/graphics/pokemon/gen_1/hitmonchan/footprint.png
similarity index 100%
rename from graphics/pokemon/hitmonchan/footprint.png
rename to graphics/pokemon/gen_1/hitmonchan/footprint.png
diff --git a/graphics/pokemon/hitmonchan/icon.png b/graphics/pokemon/gen_1/hitmonchan/icon.png
similarity index 100%
rename from graphics/pokemon/hitmonchan/icon.png
rename to graphics/pokemon/gen_1/hitmonchan/icon.png
diff --git a/graphics/pokemon/hitmonchan/normal.pal b/graphics/pokemon/gen_1/hitmonchan/normal.pal
similarity index 100%
rename from graphics/pokemon/hitmonchan/normal.pal
rename to graphics/pokemon/gen_1/hitmonchan/normal.pal
diff --git a/graphics/pokemon/hitmonchan/shiny.pal b/graphics/pokemon/gen_1/hitmonchan/shiny.pal
similarity index 100%
rename from graphics/pokemon/hitmonchan/shiny.pal
rename to graphics/pokemon/gen_1/hitmonchan/shiny.pal
diff --git a/graphics/pokemon/hitmonlee/anim_front.png b/graphics/pokemon/gen_1/hitmonlee/anim_front.png
similarity index 100%
rename from graphics/pokemon/hitmonlee/anim_front.png
rename to graphics/pokemon/gen_1/hitmonlee/anim_front.png
diff --git a/graphics/pokemon/hitmonlee/back.png b/graphics/pokemon/gen_1/hitmonlee/back.png
similarity index 100%
rename from graphics/pokemon/hitmonlee/back.png
rename to graphics/pokemon/gen_1/hitmonlee/back.png
diff --git a/graphics/pokemon/hitmonlee/footprint.png b/graphics/pokemon/gen_1/hitmonlee/footprint.png
similarity index 100%
rename from graphics/pokemon/hitmonlee/footprint.png
rename to graphics/pokemon/gen_1/hitmonlee/footprint.png
diff --git a/graphics/pokemon/hitmonlee/icon.png b/graphics/pokemon/gen_1/hitmonlee/icon.png
similarity index 100%
rename from graphics/pokemon/hitmonlee/icon.png
rename to graphics/pokemon/gen_1/hitmonlee/icon.png
diff --git a/graphics/pokemon/hitmonlee/normal.pal b/graphics/pokemon/gen_1/hitmonlee/normal.pal
similarity index 100%
rename from graphics/pokemon/hitmonlee/normal.pal
rename to graphics/pokemon/gen_1/hitmonlee/normal.pal
diff --git a/graphics/pokemon/hitmonlee/shiny.pal b/graphics/pokemon/gen_1/hitmonlee/shiny.pal
similarity index 100%
rename from graphics/pokemon/hitmonlee/shiny.pal
rename to graphics/pokemon/gen_1/hitmonlee/shiny.pal
diff --git a/graphics/pokemon/horsea/anim_front.png b/graphics/pokemon/gen_1/horsea/anim_front.png
similarity index 100%
rename from graphics/pokemon/horsea/anim_front.png
rename to graphics/pokemon/gen_1/horsea/anim_front.png
diff --git a/graphics/pokemon/horsea/back.png b/graphics/pokemon/gen_1/horsea/back.png
similarity index 100%
rename from graphics/pokemon/horsea/back.png
rename to graphics/pokemon/gen_1/horsea/back.png
diff --git a/graphics/pokemon/bruxish/footprint.png b/graphics/pokemon/gen_1/horsea/footprint.png
similarity index 100%
rename from graphics/pokemon/bruxish/footprint.png
rename to graphics/pokemon/gen_1/horsea/footprint.png
diff --git a/graphics/pokemon/horsea/icon.png b/graphics/pokemon/gen_1/horsea/icon.png
similarity index 100%
rename from graphics/pokemon/horsea/icon.png
rename to graphics/pokemon/gen_1/horsea/icon.png
diff --git a/graphics/pokemon/horsea/normal.pal b/graphics/pokemon/gen_1/horsea/normal.pal
similarity index 100%
rename from graphics/pokemon/horsea/normal.pal
rename to graphics/pokemon/gen_1/horsea/normal.pal
diff --git a/graphics/pokemon/horsea/shiny.pal b/graphics/pokemon/gen_1/horsea/shiny.pal
similarity index 100%
rename from graphics/pokemon/horsea/shiny.pal
rename to graphics/pokemon/gen_1/horsea/shiny.pal
diff --git a/graphics/pokemon/hypno/anim_front.png b/graphics/pokemon/gen_1/hypno/anim_front.png
similarity index 100%
rename from graphics/pokemon/hypno/anim_front.png
rename to graphics/pokemon/gen_1/hypno/anim_front.png
diff --git a/graphics/pokemon/hypno/anim_frontf.png b/graphics/pokemon/gen_1/hypno/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/hypno/anim_frontf.png
rename to graphics/pokemon/gen_1/hypno/anim_frontf.png
diff --git a/graphics/pokemon/hypno/back.png b/graphics/pokemon/gen_1/hypno/back.png
similarity index 100%
rename from graphics/pokemon/hypno/back.png
rename to graphics/pokemon/gen_1/hypno/back.png
diff --git a/graphics/pokemon/hypno/backf.png b/graphics/pokemon/gen_1/hypno/backf.png
similarity index 100%
rename from graphics/pokemon/hypno/backf.png
rename to graphics/pokemon/gen_1/hypno/backf.png
diff --git a/graphics/pokemon/hypno/footprint.png b/graphics/pokemon/gen_1/hypno/footprint.png
similarity index 100%
rename from graphics/pokemon/hypno/footprint.png
rename to graphics/pokemon/gen_1/hypno/footprint.png
diff --git a/graphics/pokemon/hypno/icon.png b/graphics/pokemon/gen_1/hypno/icon.png
similarity index 100%
rename from graphics/pokemon/hypno/icon.png
rename to graphics/pokemon/gen_1/hypno/icon.png
diff --git a/graphics/pokemon/hypno/normal.pal b/graphics/pokemon/gen_1/hypno/normal.pal
similarity index 100%
rename from graphics/pokemon/hypno/normal.pal
rename to graphics/pokemon/gen_1/hypno/normal.pal
diff --git a/graphics/pokemon/hypno/shiny.pal b/graphics/pokemon/gen_1/hypno/shiny.pal
similarity index 100%
rename from graphics/pokemon/hypno/shiny.pal
rename to graphics/pokemon/gen_1/hypno/shiny.pal
diff --git a/graphics/pokemon/ivysaur/anim_front.png b/graphics/pokemon/gen_1/ivysaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/ivysaur/anim_front.png
rename to graphics/pokemon/gen_1/ivysaur/anim_front.png
diff --git a/graphics/pokemon/ivysaur/back.png b/graphics/pokemon/gen_1/ivysaur/back.png
similarity index 100%
rename from graphics/pokemon/ivysaur/back.png
rename to graphics/pokemon/gen_1/ivysaur/back.png
diff --git a/graphics/pokemon/drednaw/footprint.png b/graphics/pokemon/gen_1/ivysaur/footprint.png
similarity index 100%
rename from graphics/pokemon/drednaw/footprint.png
rename to graphics/pokemon/gen_1/ivysaur/footprint.png
diff --git a/graphics/pokemon/ivysaur/icon.png b/graphics/pokemon/gen_1/ivysaur/icon.png
similarity index 100%
rename from graphics/pokemon/ivysaur/icon.png
rename to graphics/pokemon/gen_1/ivysaur/icon.png
diff --git a/graphics/pokemon/ivysaur/normal.pal b/graphics/pokemon/gen_1/ivysaur/normal.pal
similarity index 100%
rename from graphics/pokemon/ivysaur/normal.pal
rename to graphics/pokemon/gen_1/ivysaur/normal.pal
diff --git a/graphics/pokemon/ivysaur/shiny.pal b/graphics/pokemon/gen_1/ivysaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/ivysaur/shiny.pal
rename to graphics/pokemon/gen_1/ivysaur/shiny.pal
diff --git a/graphics/pokemon/jigglypuff/anim_front.png b/graphics/pokemon/gen_1/jigglypuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/jigglypuff/anim_front.png
rename to graphics/pokemon/gen_1/jigglypuff/anim_front.png
diff --git a/graphics/pokemon/jigglypuff/back.png b/graphics/pokemon/gen_1/jigglypuff/back.png
similarity index 100%
rename from graphics/pokemon/jigglypuff/back.png
rename to graphics/pokemon/gen_1/jigglypuff/back.png
diff --git a/graphics/pokemon/jigglypuff/footprint.png b/graphics/pokemon/gen_1/jigglypuff/footprint.png
similarity index 100%
rename from graphics/pokemon/jigglypuff/footprint.png
rename to graphics/pokemon/gen_1/jigglypuff/footprint.png
diff --git a/graphics/pokemon/jigglypuff/icon.png b/graphics/pokemon/gen_1/jigglypuff/icon.png
similarity index 100%
rename from graphics/pokemon/jigglypuff/icon.png
rename to graphics/pokemon/gen_1/jigglypuff/icon.png
diff --git a/graphics/pokemon/jigglypuff/normal.pal b/graphics/pokemon/gen_1/jigglypuff/normal.pal
similarity index 100%
rename from graphics/pokemon/jigglypuff/normal.pal
rename to graphics/pokemon/gen_1/jigglypuff/normal.pal
diff --git a/graphics/pokemon/jigglypuff/shiny.pal b/graphics/pokemon/gen_1/jigglypuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/jigglypuff/shiny.pal
rename to graphics/pokemon/gen_1/jigglypuff/shiny.pal
diff --git a/graphics/pokemon/jolteon/anim_front.png b/graphics/pokemon/gen_1/jolteon/anim_front.png
similarity index 100%
rename from graphics/pokemon/jolteon/anim_front.png
rename to graphics/pokemon/gen_1/jolteon/anim_front.png
diff --git a/graphics/pokemon/jolteon/back.png b/graphics/pokemon/gen_1/jolteon/back.png
similarity index 100%
rename from graphics/pokemon/jolteon/back.png
rename to graphics/pokemon/gen_1/jolteon/back.png
diff --git a/graphics/pokemon/jolteon/footprint.png b/graphics/pokemon/gen_1/jolteon/footprint.png
similarity index 100%
rename from graphics/pokemon/jolteon/footprint.png
rename to graphics/pokemon/gen_1/jolteon/footprint.png
diff --git a/graphics/pokemon/jolteon/icon.png b/graphics/pokemon/gen_1/jolteon/icon.png
similarity index 100%
rename from graphics/pokemon/jolteon/icon.png
rename to graphics/pokemon/gen_1/jolteon/icon.png
diff --git a/graphics/pokemon/jolteon/normal.pal b/graphics/pokemon/gen_1/jolteon/normal.pal
similarity index 100%
rename from graphics/pokemon/jolteon/normal.pal
rename to graphics/pokemon/gen_1/jolteon/normal.pal
diff --git a/graphics/pokemon/jolteon/shiny.pal b/graphics/pokemon/gen_1/jolteon/shiny.pal
similarity index 100%
rename from graphics/pokemon/jolteon/shiny.pal
rename to graphics/pokemon/gen_1/jolteon/shiny.pal
diff --git a/graphics/pokemon/jynx/anim_front.png b/graphics/pokemon/gen_1/jynx/anim_front.png
similarity index 100%
rename from graphics/pokemon/jynx/anim_front.png
rename to graphics/pokemon/gen_1/jynx/anim_front.png
diff --git a/graphics/pokemon/jynx/back.png b/graphics/pokemon/gen_1/jynx/back.png
similarity index 100%
rename from graphics/pokemon/jynx/back.png
rename to graphics/pokemon/gen_1/jynx/back.png
diff --git a/graphics/pokemon/burmy/plant/footprint.png b/graphics/pokemon/gen_1/jynx/footprint.png
similarity index 100%
rename from graphics/pokemon/burmy/plant/footprint.png
rename to graphics/pokemon/gen_1/jynx/footprint.png
diff --git a/graphics/pokemon/jynx/icon.png b/graphics/pokemon/gen_1/jynx/icon.png
similarity index 100%
rename from graphics/pokemon/jynx/icon.png
rename to graphics/pokemon/gen_1/jynx/icon.png
diff --git a/graphics/pokemon/jynx/normal.pal b/graphics/pokemon/gen_1/jynx/normal.pal
similarity index 100%
rename from graphics/pokemon/jynx/normal.pal
rename to graphics/pokemon/gen_1/jynx/normal.pal
diff --git a/graphics/pokemon/jynx/shiny.pal b/graphics/pokemon/gen_1/jynx/shiny.pal
similarity index 100%
rename from graphics/pokemon/jynx/shiny.pal
rename to graphics/pokemon/gen_1/jynx/shiny.pal
diff --git a/graphics/pokemon/kabuto/anim_front.png b/graphics/pokemon/gen_1/kabuto/anim_front.png
similarity index 100%
rename from graphics/pokemon/kabuto/anim_front.png
rename to graphics/pokemon/gen_1/kabuto/anim_front.png
diff --git a/graphics/pokemon/kabuto/back.png b/graphics/pokemon/gen_1/kabuto/back.png
similarity index 100%
rename from graphics/pokemon/kabuto/back.png
rename to graphics/pokemon/gen_1/kabuto/back.png
diff --git a/graphics/pokemon/baltoy/footprint.png b/graphics/pokemon/gen_1/kabuto/footprint.png
similarity index 100%
rename from graphics/pokemon/baltoy/footprint.png
rename to graphics/pokemon/gen_1/kabuto/footprint.png
diff --git a/graphics/pokemon/kabuto/icon.png b/graphics/pokemon/gen_1/kabuto/icon.png
similarity index 100%
rename from graphics/pokemon/kabuto/icon.png
rename to graphics/pokemon/gen_1/kabuto/icon.png
diff --git a/graphics/pokemon/kabuto/normal.pal b/graphics/pokemon/gen_1/kabuto/normal.pal
similarity index 100%
rename from graphics/pokemon/kabuto/normal.pal
rename to graphics/pokemon/gen_1/kabuto/normal.pal
diff --git a/graphics/pokemon/kabuto/shiny.pal b/graphics/pokemon/gen_1/kabuto/shiny.pal
similarity index 100%
rename from graphics/pokemon/kabuto/shiny.pal
rename to graphics/pokemon/gen_1/kabuto/shiny.pal
diff --git a/graphics/pokemon/kabutops/anim_front.png b/graphics/pokemon/gen_1/kabutops/anim_front.png
similarity index 100%
rename from graphics/pokemon/kabutops/anim_front.png
rename to graphics/pokemon/gen_1/kabutops/anim_front.png
diff --git a/graphics/pokemon/kabutops/back.png b/graphics/pokemon/gen_1/kabutops/back.png
similarity index 100%
rename from graphics/pokemon/kabutops/back.png
rename to graphics/pokemon/gen_1/kabutops/back.png
diff --git a/graphics/pokemon/kabutops/footprint.png b/graphics/pokemon/gen_1/kabutops/footprint.png
similarity index 100%
rename from graphics/pokemon/kabutops/footprint.png
rename to graphics/pokemon/gen_1/kabutops/footprint.png
diff --git a/graphics/pokemon/kabutops/icon.png b/graphics/pokemon/gen_1/kabutops/icon.png
similarity index 100%
rename from graphics/pokemon/kabutops/icon.png
rename to graphics/pokemon/gen_1/kabutops/icon.png
diff --git a/graphics/pokemon/kabutops/normal.pal b/graphics/pokemon/gen_1/kabutops/normal.pal
similarity index 100%
rename from graphics/pokemon/kabutops/normal.pal
rename to graphics/pokemon/gen_1/kabutops/normal.pal
diff --git a/graphics/pokemon/kabutops/shiny.pal b/graphics/pokemon/gen_1/kabutops/shiny.pal
similarity index 100%
rename from graphics/pokemon/kabutops/shiny.pal
rename to graphics/pokemon/gen_1/kabutops/shiny.pal
diff --git a/graphics/pokemon/kadabra/anim_front.png b/graphics/pokemon/gen_1/kadabra/anim_front.png
similarity index 100%
rename from graphics/pokemon/kadabra/anim_front.png
rename to graphics/pokemon/gen_1/kadabra/anim_front.png
diff --git a/graphics/pokemon/kadabra/anim_frontf.png b/graphics/pokemon/gen_1/kadabra/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/kadabra/anim_frontf.png
rename to graphics/pokemon/gen_1/kadabra/anim_frontf.png
diff --git a/graphics/pokemon/kadabra/back.png b/graphics/pokemon/gen_1/kadabra/back.png
similarity index 100%
rename from graphics/pokemon/kadabra/back.png
rename to graphics/pokemon/gen_1/kadabra/back.png
diff --git a/graphics/pokemon/kadabra/backf.png b/graphics/pokemon/gen_1/kadabra/backf.png
similarity index 100%
rename from graphics/pokemon/kadabra/backf.png
rename to graphics/pokemon/gen_1/kadabra/backf.png
diff --git a/graphics/pokemon/kadabra/footprint.png b/graphics/pokemon/gen_1/kadabra/footprint.png
similarity index 100%
rename from graphics/pokemon/kadabra/footprint.png
rename to graphics/pokemon/gen_1/kadabra/footprint.png
diff --git a/graphics/pokemon/kadabra/icon.png b/graphics/pokemon/gen_1/kadabra/icon.png
similarity index 100%
rename from graphics/pokemon/kadabra/icon.png
rename to graphics/pokemon/gen_1/kadabra/icon.png
diff --git a/graphics/pokemon/kadabra/normal.pal b/graphics/pokemon/gen_1/kadabra/normal.pal
similarity index 100%
rename from graphics/pokemon/kadabra/normal.pal
rename to graphics/pokemon/gen_1/kadabra/normal.pal
diff --git a/graphics/pokemon/kadabra/shiny.pal b/graphics/pokemon/gen_1/kadabra/shiny.pal
similarity index 100%
rename from graphics/pokemon/kadabra/shiny.pal
rename to graphics/pokemon/gen_1/kadabra/shiny.pal
diff --git a/graphics/pokemon/kakuna/anim_front.png b/graphics/pokemon/gen_1/kakuna/anim_front.png
similarity index 100%
rename from graphics/pokemon/kakuna/anim_front.png
rename to graphics/pokemon/gen_1/kakuna/anim_front.png
diff --git a/graphics/pokemon/kakuna/back.png b/graphics/pokemon/gen_1/kakuna/back.png
similarity index 100%
rename from graphics/pokemon/kakuna/back.png
rename to graphics/pokemon/gen_1/kakuna/back.png
diff --git a/graphics/pokemon/carbink/footprint.png b/graphics/pokemon/gen_1/kakuna/footprint.png
similarity index 100%
rename from graphics/pokemon/carbink/footprint.png
rename to graphics/pokemon/gen_1/kakuna/footprint.png
diff --git a/graphics/pokemon/kakuna/icon.png b/graphics/pokemon/gen_1/kakuna/icon.png
similarity index 100%
rename from graphics/pokemon/kakuna/icon.png
rename to graphics/pokemon/gen_1/kakuna/icon.png
diff --git a/graphics/pokemon/kakuna/normal.pal b/graphics/pokemon/gen_1/kakuna/normal.pal
similarity index 100%
rename from graphics/pokemon/kakuna/normal.pal
rename to graphics/pokemon/gen_1/kakuna/normal.pal
diff --git a/graphics/pokemon/kakuna/shiny.pal b/graphics/pokemon/gen_1/kakuna/shiny.pal
similarity index 100%
rename from graphics/pokemon/kakuna/shiny.pal
rename to graphics/pokemon/gen_1/kakuna/shiny.pal
diff --git a/graphics/pokemon/kangaskhan/anim_front.png b/graphics/pokemon/gen_1/kangaskhan/anim_front.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/anim_front.png
rename to graphics/pokemon/gen_1/kangaskhan/anim_front.png
diff --git a/graphics/pokemon/kangaskhan/back.png b/graphics/pokemon/gen_1/kangaskhan/back.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/back.png
rename to graphics/pokemon/gen_1/kangaskhan/back.png
diff --git a/graphics/pokemon/kangaskhan/footprint.png b/graphics/pokemon/gen_1/kangaskhan/footprint.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/footprint.png
rename to graphics/pokemon/gen_1/kangaskhan/footprint.png
diff --git a/graphics/pokemon/kangaskhan/icon.png b/graphics/pokemon/gen_1/kangaskhan/icon.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/icon.png
rename to graphics/pokemon/gen_1/kangaskhan/icon.png
diff --git a/graphics/pokemon/kangaskhan/mega/back.png b/graphics/pokemon/gen_1/kangaskhan/mega/back.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/mega/back.png
rename to graphics/pokemon/gen_1/kangaskhan/mega/back.png
diff --git a/graphics/pokemon/kangaskhan/mega/front.png b/graphics/pokemon/gen_1/kangaskhan/mega/front.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/mega/front.png
rename to graphics/pokemon/gen_1/kangaskhan/mega/front.png
diff --git a/graphics/pokemon/kangaskhan/mega/icon.png b/graphics/pokemon/gen_1/kangaskhan/mega/icon.png
similarity index 100%
rename from graphics/pokemon/kangaskhan/mega/icon.png
rename to graphics/pokemon/gen_1/kangaskhan/mega/icon.png
diff --git a/graphics/pokemon/kangaskhan/mega/normal.pal b/graphics/pokemon/gen_1/kangaskhan/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/kangaskhan/mega/normal.pal
rename to graphics/pokemon/gen_1/kangaskhan/mega/normal.pal
diff --git a/graphics/pokemon/kangaskhan/mega/shiny.pal b/graphics/pokemon/gen_1/kangaskhan/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/kangaskhan/mega/shiny.pal
rename to graphics/pokemon/gen_1/kangaskhan/mega/shiny.pal
diff --git a/graphics/pokemon/kangaskhan/normal.pal b/graphics/pokemon/gen_1/kangaskhan/normal.pal
similarity index 100%
rename from graphics/pokemon/kangaskhan/normal.pal
rename to graphics/pokemon/gen_1/kangaskhan/normal.pal
diff --git a/graphics/pokemon/kangaskhan/shiny.pal b/graphics/pokemon/gen_1/kangaskhan/shiny.pal
similarity index 100%
rename from graphics/pokemon/kangaskhan/shiny.pal
rename to graphics/pokemon/gen_1/kangaskhan/shiny.pal
diff --git a/graphics/pokemon/kingler/anim_front.png b/graphics/pokemon/gen_1/kingler/anim_front.png
similarity index 100%
rename from graphics/pokemon/kingler/anim_front.png
rename to graphics/pokemon/gen_1/kingler/anim_front.png
diff --git a/graphics/pokemon/kingler/back.png b/graphics/pokemon/gen_1/kingler/back.png
similarity index 100%
rename from graphics/pokemon/kingler/back.png
rename to graphics/pokemon/gen_1/kingler/back.png
diff --git a/graphics/pokemon/kingler/footprint.png b/graphics/pokemon/gen_1/kingler/footprint.png
similarity index 100%
rename from graphics/pokemon/kingler/footprint.png
rename to graphics/pokemon/gen_1/kingler/footprint.png
diff --git a/graphics/pokemon/kingler/gigantamax/back.png b/graphics/pokemon/gen_1/kingler/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/kingler/gigantamax/back.png
rename to graphics/pokemon/gen_1/kingler/gigantamax/back.png
diff --git a/graphics/pokemon/kingler/gigantamax/front.png b/graphics/pokemon/gen_1/kingler/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/kingler/gigantamax/front.png
rename to graphics/pokemon/gen_1/kingler/gigantamax/front.png
diff --git a/graphics/pokemon/kingler/gigantamax/icon.png b/graphics/pokemon/gen_1/kingler/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/kingler/gigantamax/icon.png
rename to graphics/pokemon/gen_1/kingler/gigantamax/icon.png
diff --git a/graphics/pokemon/kingler/gigantamax/normal.pal b/graphics/pokemon/gen_1/kingler/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/kingler/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/kingler/gigantamax/normal.pal
diff --git a/graphics/pokemon/kingler/gigantamax/shiny.pal b/graphics/pokemon/gen_1/kingler/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/kingler/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/kingler/gigantamax/shiny.pal
diff --git a/graphics/pokemon/kingler/icon.png b/graphics/pokemon/gen_1/kingler/icon.png
similarity index 100%
rename from graphics/pokemon/kingler/icon.png
rename to graphics/pokemon/gen_1/kingler/icon.png
diff --git a/graphics/pokemon/kingler/normal.pal b/graphics/pokemon/gen_1/kingler/normal.pal
similarity index 100%
rename from graphics/pokemon/kingler/normal.pal
rename to graphics/pokemon/gen_1/kingler/normal.pal
diff --git a/graphics/pokemon/kingler/shiny.pal b/graphics/pokemon/gen_1/kingler/shiny.pal
similarity index 100%
rename from graphics/pokemon/kingler/shiny.pal
rename to graphics/pokemon/gen_1/kingler/shiny.pal
diff --git a/graphics/pokemon/koffing/anim_front.png b/graphics/pokemon/gen_1/koffing/anim_front.png
similarity index 100%
rename from graphics/pokemon/koffing/anim_front.png
rename to graphics/pokemon/gen_1/koffing/anim_front.png
diff --git a/graphics/pokemon/koffing/back.png b/graphics/pokemon/gen_1/koffing/back.png
similarity index 100%
rename from graphics/pokemon/koffing/back.png
rename to graphics/pokemon/gen_1/koffing/back.png
diff --git a/graphics/pokemon/carnivine/footprint.png b/graphics/pokemon/gen_1/koffing/footprint.png
similarity index 100%
rename from graphics/pokemon/carnivine/footprint.png
rename to graphics/pokemon/gen_1/koffing/footprint.png
diff --git a/graphics/pokemon/koffing/icon.png b/graphics/pokemon/gen_1/koffing/icon.png
similarity index 100%
rename from graphics/pokemon/koffing/icon.png
rename to graphics/pokemon/gen_1/koffing/icon.png
diff --git a/graphics/pokemon/koffing/normal.pal b/graphics/pokemon/gen_1/koffing/normal.pal
similarity index 100%
rename from graphics/pokemon/koffing/normal.pal
rename to graphics/pokemon/gen_1/koffing/normal.pal
diff --git a/graphics/pokemon/koffing/shiny.pal b/graphics/pokemon/gen_1/koffing/shiny.pal
similarity index 100%
rename from graphics/pokemon/koffing/shiny.pal
rename to graphics/pokemon/gen_1/koffing/shiny.pal
diff --git a/graphics/pokemon/krabby/anim_front.png b/graphics/pokemon/gen_1/krabby/anim_front.png
similarity index 100%
rename from graphics/pokemon/krabby/anim_front.png
rename to graphics/pokemon/gen_1/krabby/anim_front.png
diff --git a/graphics/pokemon/krabby/back.png b/graphics/pokemon/gen_1/krabby/back.png
similarity index 100%
rename from graphics/pokemon/krabby/back.png
rename to graphics/pokemon/gen_1/krabby/back.png
diff --git a/graphics/pokemon/krabby/footprint.png b/graphics/pokemon/gen_1/krabby/footprint.png
similarity index 100%
rename from graphics/pokemon/krabby/footprint.png
rename to graphics/pokemon/gen_1/krabby/footprint.png
diff --git a/graphics/pokemon/krabby/icon.png b/graphics/pokemon/gen_1/krabby/icon.png
similarity index 100%
rename from graphics/pokemon/krabby/icon.png
rename to graphics/pokemon/gen_1/krabby/icon.png
diff --git a/graphics/pokemon/krabby/normal.pal b/graphics/pokemon/gen_1/krabby/normal.pal
similarity index 100%
rename from graphics/pokemon/krabby/normal.pal
rename to graphics/pokemon/gen_1/krabby/normal.pal
diff --git a/graphics/pokemon/krabby/shiny.pal b/graphics/pokemon/gen_1/krabby/shiny.pal
similarity index 100%
rename from graphics/pokemon/krabby/shiny.pal
rename to graphics/pokemon/gen_1/krabby/shiny.pal
diff --git a/graphics/pokemon/lapras/anim_front.png b/graphics/pokemon/gen_1/lapras/anim_front.png
similarity index 100%
rename from graphics/pokemon/lapras/anim_front.png
rename to graphics/pokemon/gen_1/lapras/anim_front.png
diff --git a/graphics/pokemon/lapras/back.png b/graphics/pokemon/gen_1/lapras/back.png
similarity index 100%
rename from graphics/pokemon/lapras/back.png
rename to graphics/pokemon/gen_1/lapras/back.png
diff --git a/graphics/pokemon/carvanha/footprint.png b/graphics/pokemon/gen_1/lapras/footprint.png
similarity index 100%
rename from graphics/pokemon/carvanha/footprint.png
rename to graphics/pokemon/gen_1/lapras/footprint.png
diff --git a/graphics/pokemon/lapras/gigantamax/back.png b/graphics/pokemon/gen_1/lapras/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/lapras/gigantamax/back.png
rename to graphics/pokemon/gen_1/lapras/gigantamax/back.png
diff --git a/graphics/pokemon/lapras/gigantamax/front.png b/graphics/pokemon/gen_1/lapras/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/lapras/gigantamax/front.png
rename to graphics/pokemon/gen_1/lapras/gigantamax/front.png
diff --git a/graphics/pokemon/lapras/gigantamax/icon.png b/graphics/pokemon/gen_1/lapras/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/lapras/gigantamax/icon.png
rename to graphics/pokemon/gen_1/lapras/gigantamax/icon.png
diff --git a/graphics/pokemon/lapras/gigantamax/normal.pal b/graphics/pokemon/gen_1/lapras/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/lapras/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/lapras/gigantamax/normal.pal
diff --git a/graphics/pokemon/lapras/gigantamax/shiny.pal b/graphics/pokemon/gen_1/lapras/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/lapras/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/lapras/gigantamax/shiny.pal
diff --git a/graphics/pokemon/lapras/icon.png b/graphics/pokemon/gen_1/lapras/icon.png
similarity index 100%
rename from graphics/pokemon/lapras/icon.png
rename to graphics/pokemon/gen_1/lapras/icon.png
diff --git a/graphics/pokemon/lapras/normal.pal b/graphics/pokemon/gen_1/lapras/normal.pal
similarity index 100%
rename from graphics/pokemon/lapras/normal.pal
rename to graphics/pokemon/gen_1/lapras/normal.pal
diff --git a/graphics/pokemon/lapras/shiny.pal b/graphics/pokemon/gen_1/lapras/shiny.pal
similarity index 100%
rename from graphics/pokemon/lapras/shiny.pal
rename to graphics/pokemon/gen_1/lapras/shiny.pal
diff --git a/graphics/pokemon/lickitung/anim_front.png b/graphics/pokemon/gen_1/lickitung/anim_front.png
similarity index 100%
rename from graphics/pokemon/lickitung/anim_front.png
rename to graphics/pokemon/gen_1/lickitung/anim_front.png
diff --git a/graphics/pokemon/lickitung/back.png b/graphics/pokemon/gen_1/lickitung/back.png
similarity index 100%
rename from graphics/pokemon/lickitung/back.png
rename to graphics/pokemon/gen_1/lickitung/back.png
diff --git a/graphics/pokemon/lickitung/footprint.png b/graphics/pokemon/gen_1/lickitung/footprint.png
similarity index 100%
rename from graphics/pokemon/lickitung/footprint.png
rename to graphics/pokemon/gen_1/lickitung/footprint.png
diff --git a/graphics/pokemon/lickitung/icon.png b/graphics/pokemon/gen_1/lickitung/icon.png
similarity index 100%
rename from graphics/pokemon/lickitung/icon.png
rename to graphics/pokemon/gen_1/lickitung/icon.png
diff --git a/graphics/pokemon/lickitung/normal.pal b/graphics/pokemon/gen_1/lickitung/normal.pal
similarity index 100%
rename from graphics/pokemon/lickitung/normal.pal
rename to graphics/pokemon/gen_1/lickitung/normal.pal
diff --git a/graphics/pokemon/lickitung/shiny.pal b/graphics/pokemon/gen_1/lickitung/shiny.pal
similarity index 100%
rename from graphics/pokemon/lickitung/shiny.pal
rename to graphics/pokemon/gen_1/lickitung/shiny.pal
diff --git a/graphics/pokemon/machamp/anim_front.png b/graphics/pokemon/gen_1/machamp/anim_front.png
similarity index 100%
rename from graphics/pokemon/machamp/anim_front.png
rename to graphics/pokemon/gen_1/machamp/anim_front.png
diff --git a/graphics/pokemon/machamp/back.png b/graphics/pokemon/gen_1/machamp/back.png
similarity index 100%
rename from graphics/pokemon/machamp/back.png
rename to graphics/pokemon/gen_1/machamp/back.png
diff --git a/graphics/pokemon/machamp/footprint.png b/graphics/pokemon/gen_1/machamp/footprint.png
similarity index 100%
rename from graphics/pokemon/machamp/footprint.png
rename to graphics/pokemon/gen_1/machamp/footprint.png
diff --git a/graphics/pokemon/machamp/gigantamax/back.png b/graphics/pokemon/gen_1/machamp/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/machamp/gigantamax/back.png
rename to graphics/pokemon/gen_1/machamp/gigantamax/back.png
diff --git a/graphics/pokemon/machamp/gigantamax/front.png b/graphics/pokemon/gen_1/machamp/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/machamp/gigantamax/front.png
rename to graphics/pokemon/gen_1/machamp/gigantamax/front.png
diff --git a/graphics/pokemon/machamp/gigantamax/icon.png b/graphics/pokemon/gen_1/machamp/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/machamp/gigantamax/icon.png
rename to graphics/pokemon/gen_1/machamp/gigantamax/icon.png
diff --git a/graphics/pokemon/machamp/gigantamax/normal.pal b/graphics/pokemon/gen_1/machamp/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/machamp/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/machamp/gigantamax/normal.pal
diff --git a/graphics/pokemon/machamp/gigantamax/shiny.pal b/graphics/pokemon/gen_1/machamp/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/machamp/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/machamp/gigantamax/shiny.pal
diff --git a/graphics/pokemon/machamp/icon.png b/graphics/pokemon/gen_1/machamp/icon.png
similarity index 100%
rename from graphics/pokemon/machamp/icon.png
rename to graphics/pokemon/gen_1/machamp/icon.png
diff --git a/graphics/pokemon/machamp/normal.pal b/graphics/pokemon/gen_1/machamp/normal.pal
similarity index 100%
rename from graphics/pokemon/machamp/normal.pal
rename to graphics/pokemon/gen_1/machamp/normal.pal
diff --git a/graphics/pokemon/machamp/shiny.pal b/graphics/pokemon/gen_1/machamp/shiny.pal
similarity index 100%
rename from graphics/pokemon/machamp/shiny.pal
rename to graphics/pokemon/gen_1/machamp/shiny.pal
diff --git a/graphics/pokemon/machoke/anim_front.png b/graphics/pokemon/gen_1/machoke/anim_front.png
similarity index 100%
rename from graphics/pokemon/machoke/anim_front.png
rename to graphics/pokemon/gen_1/machoke/anim_front.png
diff --git a/graphics/pokemon/machoke/back.png b/graphics/pokemon/gen_1/machoke/back.png
similarity index 100%
rename from graphics/pokemon/machoke/back.png
rename to graphics/pokemon/gen_1/machoke/back.png
diff --git a/graphics/pokemon/machoke/footprint.png b/graphics/pokemon/gen_1/machoke/footprint.png
similarity index 100%
rename from graphics/pokemon/machoke/footprint.png
rename to graphics/pokemon/gen_1/machoke/footprint.png
diff --git a/graphics/pokemon/machoke/icon.png b/graphics/pokemon/gen_1/machoke/icon.png
similarity index 100%
rename from graphics/pokemon/machoke/icon.png
rename to graphics/pokemon/gen_1/machoke/icon.png
diff --git a/graphics/pokemon/machoke/normal.pal b/graphics/pokemon/gen_1/machoke/normal.pal
similarity index 100%
rename from graphics/pokemon/machoke/normal.pal
rename to graphics/pokemon/gen_1/machoke/normal.pal
diff --git a/graphics/pokemon/machoke/shiny.pal b/graphics/pokemon/gen_1/machoke/shiny.pal
similarity index 100%
rename from graphics/pokemon/machoke/shiny.pal
rename to graphics/pokemon/gen_1/machoke/shiny.pal
diff --git a/graphics/pokemon/machop/anim_front.png b/graphics/pokemon/gen_1/machop/anim_front.png
similarity index 100%
rename from graphics/pokemon/machop/anim_front.png
rename to graphics/pokemon/gen_1/machop/anim_front.png
diff --git a/graphics/pokemon/machop/back.png b/graphics/pokemon/gen_1/machop/back.png
similarity index 100%
rename from graphics/pokemon/machop/back.png
rename to graphics/pokemon/gen_1/machop/back.png
diff --git a/graphics/pokemon/machop/footprint.png b/graphics/pokemon/gen_1/machop/footprint.png
similarity index 100%
rename from graphics/pokemon/machop/footprint.png
rename to graphics/pokemon/gen_1/machop/footprint.png
diff --git a/graphics/pokemon/machop/icon.png b/graphics/pokemon/gen_1/machop/icon.png
similarity index 100%
rename from graphics/pokemon/machop/icon.png
rename to graphics/pokemon/gen_1/machop/icon.png
diff --git a/graphics/pokemon/machop/normal.pal b/graphics/pokemon/gen_1/machop/normal.pal
similarity index 100%
rename from graphics/pokemon/machop/normal.pal
rename to graphics/pokemon/gen_1/machop/normal.pal
diff --git a/graphics/pokemon/machop/shiny.pal b/graphics/pokemon/gen_1/machop/shiny.pal
similarity index 100%
rename from graphics/pokemon/machop/shiny.pal
rename to graphics/pokemon/gen_1/machop/shiny.pal
diff --git a/graphics/pokemon/magikarp/anim_front.png b/graphics/pokemon/gen_1/magikarp/anim_front.png
similarity index 100%
rename from graphics/pokemon/magikarp/anim_front.png
rename to graphics/pokemon/gen_1/magikarp/anim_front.png
diff --git a/graphics/pokemon/magikarp/anim_frontf.png b/graphics/pokemon/gen_1/magikarp/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/magikarp/anim_frontf.png
rename to graphics/pokemon/gen_1/magikarp/anim_frontf.png
diff --git a/graphics/pokemon/magikarp/back.png b/graphics/pokemon/gen_1/magikarp/back.png
similarity index 100%
rename from graphics/pokemon/magikarp/back.png
rename to graphics/pokemon/gen_1/magikarp/back.png
diff --git a/graphics/pokemon/magikarp/backf.png b/graphics/pokemon/gen_1/magikarp/backf.png
similarity index 100%
rename from graphics/pokemon/magikarp/backf.png
rename to graphics/pokemon/gen_1/magikarp/backf.png
diff --git a/graphics/pokemon/cascoon/footprint.png b/graphics/pokemon/gen_1/magikarp/footprint.png
similarity index 100%
rename from graphics/pokemon/cascoon/footprint.png
rename to graphics/pokemon/gen_1/magikarp/footprint.png
diff --git a/graphics/pokemon/magikarp/icon.png b/graphics/pokemon/gen_1/magikarp/icon.png
similarity index 100%
rename from graphics/pokemon/magikarp/icon.png
rename to graphics/pokemon/gen_1/magikarp/icon.png
diff --git a/graphics/pokemon/magikarp/normal.pal b/graphics/pokemon/gen_1/magikarp/normal.pal
similarity index 100%
rename from graphics/pokemon/magikarp/normal.pal
rename to graphics/pokemon/gen_1/magikarp/normal.pal
diff --git a/graphics/pokemon/magikarp/shiny.pal b/graphics/pokemon/gen_1/magikarp/shiny.pal
similarity index 100%
rename from graphics/pokemon/magikarp/shiny.pal
rename to graphics/pokemon/gen_1/magikarp/shiny.pal
diff --git a/graphics/pokemon/magmar/anim_front.png b/graphics/pokemon/gen_1/magmar/anim_front.png
similarity index 100%
rename from graphics/pokemon/magmar/anim_front.png
rename to graphics/pokemon/gen_1/magmar/anim_front.png
diff --git a/graphics/pokemon/magmar/back.png b/graphics/pokemon/gen_1/magmar/back.png
similarity index 100%
rename from graphics/pokemon/magmar/back.png
rename to graphics/pokemon/gen_1/magmar/back.png
diff --git a/graphics/pokemon/magmar/footprint.png b/graphics/pokemon/gen_1/magmar/footprint.png
similarity index 100%
rename from graphics/pokemon/magmar/footprint.png
rename to graphics/pokemon/gen_1/magmar/footprint.png
diff --git a/graphics/pokemon/magmar/icon.png b/graphics/pokemon/gen_1/magmar/icon.png
similarity index 100%
rename from graphics/pokemon/magmar/icon.png
rename to graphics/pokemon/gen_1/magmar/icon.png
diff --git a/graphics/pokemon/magmar/normal.pal b/graphics/pokemon/gen_1/magmar/normal.pal
similarity index 100%
rename from graphics/pokemon/magmar/normal.pal
rename to graphics/pokemon/gen_1/magmar/normal.pal
diff --git a/graphics/pokemon/magmar/shiny.pal b/graphics/pokemon/gen_1/magmar/shiny.pal
similarity index 100%
rename from graphics/pokemon/magmar/shiny.pal
rename to graphics/pokemon/gen_1/magmar/shiny.pal
diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/gen_1/magnemite/anim_front.png
similarity index 100%
rename from graphics/pokemon/magnemite/anim_front.png
rename to graphics/pokemon/gen_1/magnemite/anim_front.png
diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/gen_1/magnemite/back.png
similarity index 100%
rename from graphics/pokemon/magnemite/back.png
rename to graphics/pokemon/gen_1/magnemite/back.png
diff --git a/graphics/pokemon/magnemite/footprint.png b/graphics/pokemon/gen_1/magnemite/footprint.png
similarity index 100%
rename from graphics/pokemon/magnemite/footprint.png
rename to graphics/pokemon/gen_1/magnemite/footprint.png
diff --git a/graphics/pokemon/magnemite/icon.png b/graphics/pokemon/gen_1/magnemite/icon.png
similarity index 100%
rename from graphics/pokemon/magnemite/icon.png
rename to graphics/pokemon/gen_1/magnemite/icon.png
diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/gen_1/magnemite/normal.pal
similarity index 100%
rename from graphics/pokemon/magnemite/normal.pal
rename to graphics/pokemon/gen_1/magnemite/normal.pal
diff --git a/graphics/pokemon/magnemite/shiny.pal b/graphics/pokemon/gen_1/magnemite/shiny.pal
similarity index 100%
rename from graphics/pokemon/magnemite/shiny.pal
rename to graphics/pokemon/gen_1/magnemite/shiny.pal
diff --git a/graphics/pokemon/magneton/anim_front.png b/graphics/pokemon/gen_1/magneton/anim_front.png
similarity index 100%
rename from graphics/pokemon/magneton/anim_front.png
rename to graphics/pokemon/gen_1/magneton/anim_front.png
diff --git a/graphics/pokemon/magneton/back.png b/graphics/pokemon/gen_1/magneton/back.png
similarity index 100%
rename from graphics/pokemon/magneton/back.png
rename to graphics/pokemon/gen_1/magneton/back.png
diff --git a/graphics/pokemon/magneton/footprint.png b/graphics/pokemon/gen_1/magneton/footprint.png
similarity index 100%
rename from graphics/pokemon/magneton/footprint.png
rename to graphics/pokemon/gen_1/magneton/footprint.png
diff --git a/graphics/pokemon/magneton/icon.png b/graphics/pokemon/gen_1/magneton/icon.png
similarity index 100%
rename from graphics/pokemon/magneton/icon.png
rename to graphics/pokemon/gen_1/magneton/icon.png
diff --git a/graphics/pokemon/magneton/normal.pal b/graphics/pokemon/gen_1/magneton/normal.pal
similarity index 100%
rename from graphics/pokemon/magneton/normal.pal
rename to graphics/pokemon/gen_1/magneton/normal.pal
diff --git a/graphics/pokemon/magneton/shiny.pal b/graphics/pokemon/gen_1/magneton/shiny.pal
similarity index 100%
rename from graphics/pokemon/magneton/shiny.pal
rename to graphics/pokemon/gen_1/magneton/shiny.pal
diff --git a/graphics/pokemon/mankey/anim_front.png b/graphics/pokemon/gen_1/mankey/anim_front.png
similarity index 100%
rename from graphics/pokemon/mankey/anim_front.png
rename to graphics/pokemon/gen_1/mankey/anim_front.png
diff --git a/graphics/pokemon/mankey/back.png b/graphics/pokemon/gen_1/mankey/back.png
similarity index 100%
rename from graphics/pokemon/mankey/back.png
rename to graphics/pokemon/gen_1/mankey/back.png
diff --git a/graphics/pokemon/mankey/footprint.png b/graphics/pokemon/gen_1/mankey/footprint.png
similarity index 100%
rename from graphics/pokemon/mankey/footprint.png
rename to graphics/pokemon/gen_1/mankey/footprint.png
diff --git a/graphics/pokemon/mankey/icon.png b/graphics/pokemon/gen_1/mankey/icon.png
similarity index 100%
rename from graphics/pokemon/mankey/icon.png
rename to graphics/pokemon/gen_1/mankey/icon.png
diff --git a/graphics/pokemon/mankey/normal.pal b/graphics/pokemon/gen_1/mankey/normal.pal
similarity index 100%
rename from graphics/pokemon/mankey/normal.pal
rename to graphics/pokemon/gen_1/mankey/normal.pal
diff --git a/graphics/pokemon/mankey/shiny.pal b/graphics/pokemon/gen_1/mankey/shiny.pal
similarity index 100%
rename from graphics/pokemon/mankey/shiny.pal
rename to graphics/pokemon/gen_1/mankey/shiny.pal
diff --git a/graphics/pokemon/marowak/alolan/back.png b/graphics/pokemon/gen_1/marowak/alolan/back.png
similarity index 100%
rename from graphics/pokemon/marowak/alolan/back.png
rename to graphics/pokemon/gen_1/marowak/alolan/back.png
diff --git a/graphics/pokemon/marowak/alolan/front.png b/graphics/pokemon/gen_1/marowak/alolan/front.png
similarity index 100%
rename from graphics/pokemon/marowak/alolan/front.png
rename to graphics/pokemon/gen_1/marowak/alolan/front.png
diff --git a/graphics/pokemon/marowak/alolan/icon.png b/graphics/pokemon/gen_1/marowak/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/marowak/alolan/icon.png
rename to graphics/pokemon/gen_1/marowak/alolan/icon.png
diff --git a/graphics/pokemon/marowak/alolan/normal.pal b/graphics/pokemon/gen_1/marowak/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/marowak/alolan/normal.pal
rename to graphics/pokemon/gen_1/marowak/alolan/normal.pal
diff --git a/graphics/pokemon/marowak/alolan/shiny.pal b/graphics/pokemon/gen_1/marowak/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/marowak/alolan/shiny.pal
rename to graphics/pokemon/gen_1/marowak/alolan/shiny.pal
diff --git a/graphics/pokemon/marowak/anim_front.png b/graphics/pokemon/gen_1/marowak/anim_front.png
similarity index 100%
rename from graphics/pokemon/marowak/anim_front.png
rename to graphics/pokemon/gen_1/marowak/anim_front.png
diff --git a/graphics/pokemon/marowak/back.png b/graphics/pokemon/gen_1/marowak/back.png
similarity index 100%
rename from graphics/pokemon/marowak/back.png
rename to graphics/pokemon/gen_1/marowak/back.png
diff --git a/graphics/pokemon/marowak/footprint.png b/graphics/pokemon/gen_1/marowak/footprint.png
similarity index 100%
rename from graphics/pokemon/marowak/footprint.png
rename to graphics/pokemon/gen_1/marowak/footprint.png
diff --git a/graphics/pokemon/marowak/icon.png b/graphics/pokemon/gen_1/marowak/icon.png
similarity index 100%
rename from graphics/pokemon/marowak/icon.png
rename to graphics/pokemon/gen_1/marowak/icon.png
diff --git a/graphics/pokemon/marowak/normal.pal b/graphics/pokemon/gen_1/marowak/normal.pal
similarity index 100%
rename from graphics/pokemon/marowak/normal.pal
rename to graphics/pokemon/gen_1/marowak/normal.pal
diff --git a/graphics/pokemon/marowak/shiny.pal b/graphics/pokemon/gen_1/marowak/shiny.pal
similarity index 100%
rename from graphics/pokemon/marowak/shiny.pal
rename to graphics/pokemon/gen_1/marowak/shiny.pal
diff --git a/graphics/pokemon/meowth/alolan/back.png b/graphics/pokemon/gen_1/meowth/alolan/back.png
similarity index 100%
rename from graphics/pokemon/meowth/alolan/back.png
rename to graphics/pokemon/gen_1/meowth/alolan/back.png
diff --git a/graphics/pokemon/meowth/alolan/front.png b/graphics/pokemon/gen_1/meowth/alolan/front.png
similarity index 100%
rename from graphics/pokemon/meowth/alolan/front.png
rename to graphics/pokemon/gen_1/meowth/alolan/front.png
diff --git a/graphics/pokemon/meowth/alolan/icon.png b/graphics/pokemon/gen_1/meowth/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/meowth/alolan/icon.png
rename to graphics/pokemon/gen_1/meowth/alolan/icon.png
diff --git a/graphics/pokemon/meowth/alolan/normal.pal b/graphics/pokemon/gen_1/meowth/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/meowth/alolan/normal.pal
rename to graphics/pokemon/gen_1/meowth/alolan/normal.pal
diff --git a/graphics/pokemon/meowth/alolan/shiny.pal b/graphics/pokemon/gen_1/meowth/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowth/alolan/shiny.pal
rename to graphics/pokemon/gen_1/meowth/alolan/shiny.pal
diff --git a/graphics/pokemon/meowth/anim_front.png b/graphics/pokemon/gen_1/meowth/anim_front.png
similarity index 100%
rename from graphics/pokemon/meowth/anim_front.png
rename to graphics/pokemon/gen_1/meowth/anim_front.png
diff --git a/graphics/pokemon/meowth/back.png b/graphics/pokemon/gen_1/meowth/back.png
similarity index 100%
rename from graphics/pokemon/meowth/back.png
rename to graphics/pokemon/gen_1/meowth/back.png
diff --git a/graphics/pokemon/meowth/footprint.png b/graphics/pokemon/gen_1/meowth/footprint.png
similarity index 100%
rename from graphics/pokemon/meowth/footprint.png
rename to graphics/pokemon/gen_1/meowth/footprint.png
diff --git a/graphics/pokemon/meowth/galarian/back.png b/graphics/pokemon/gen_1/meowth/galarian/back.png
similarity index 100%
rename from graphics/pokemon/meowth/galarian/back.png
rename to graphics/pokemon/gen_1/meowth/galarian/back.png
diff --git a/graphics/pokemon/meowth/galarian/front.png b/graphics/pokemon/gen_1/meowth/galarian/front.png
similarity index 100%
rename from graphics/pokemon/meowth/galarian/front.png
rename to graphics/pokemon/gen_1/meowth/galarian/front.png
diff --git a/graphics/pokemon/meowth/galarian/icon.png b/graphics/pokemon/gen_1/meowth/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/meowth/galarian/icon.png
rename to graphics/pokemon/gen_1/meowth/galarian/icon.png
diff --git a/graphics/pokemon/meowth/galarian/normal.pal b/graphics/pokemon/gen_1/meowth/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/meowth/galarian/normal.pal
rename to graphics/pokemon/gen_1/meowth/galarian/normal.pal
diff --git a/graphics/pokemon/meowth/galarian/shiny.pal b/graphics/pokemon/gen_1/meowth/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowth/galarian/shiny.pal
rename to graphics/pokemon/gen_1/meowth/galarian/shiny.pal
diff --git a/graphics/pokemon/meowth/gigantamax/back.png b/graphics/pokemon/gen_1/meowth/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/meowth/gigantamax/back.png
rename to graphics/pokemon/gen_1/meowth/gigantamax/back.png
diff --git a/graphics/pokemon/meowth/gigantamax/front.png b/graphics/pokemon/gen_1/meowth/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/meowth/gigantamax/front.png
rename to graphics/pokemon/gen_1/meowth/gigantamax/front.png
diff --git a/graphics/pokemon/meowth/gigantamax/icon.png b/graphics/pokemon/gen_1/meowth/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/meowth/gigantamax/icon.png
rename to graphics/pokemon/gen_1/meowth/gigantamax/icon.png
diff --git a/graphics/pokemon/meowth/gigantamax/normal.pal b/graphics/pokemon/gen_1/meowth/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/meowth/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/meowth/gigantamax/normal.pal
diff --git a/graphics/pokemon/meowth/gigantamax/shiny.pal b/graphics/pokemon/gen_1/meowth/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowth/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/meowth/gigantamax/shiny.pal
diff --git a/graphics/pokemon/meowth/icon.png b/graphics/pokemon/gen_1/meowth/icon.png
similarity index 100%
rename from graphics/pokemon/meowth/icon.png
rename to graphics/pokemon/gen_1/meowth/icon.png
diff --git a/graphics/pokemon/meowth/normal.pal b/graphics/pokemon/gen_1/meowth/normal.pal
similarity index 100%
rename from graphics/pokemon/meowth/normal.pal
rename to graphics/pokemon/gen_1/meowth/normal.pal
diff --git a/graphics/pokemon/meowth/shiny.pal b/graphics/pokemon/gen_1/meowth/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowth/shiny.pal
rename to graphics/pokemon/gen_1/meowth/shiny.pal
diff --git a/graphics/pokemon/metapod/anim_front.png b/graphics/pokemon/gen_1/metapod/anim_front.png
similarity index 100%
rename from graphics/pokemon/metapod/anim_front.png
rename to graphics/pokemon/gen_1/metapod/anim_front.png
diff --git a/graphics/pokemon/metapod/back.png b/graphics/pokemon/gen_1/metapod/back.png
similarity index 100%
rename from graphics/pokemon/metapod/back.png
rename to graphics/pokemon/gen_1/metapod/back.png
diff --git a/graphics/pokemon/castform/footprint.png b/graphics/pokemon/gen_1/metapod/footprint.png
similarity index 100%
rename from graphics/pokemon/castform/footprint.png
rename to graphics/pokemon/gen_1/metapod/footprint.png
diff --git a/graphics/pokemon/metapod/icon.png b/graphics/pokemon/gen_1/metapod/icon.png
similarity index 100%
rename from graphics/pokemon/metapod/icon.png
rename to graphics/pokemon/gen_1/metapod/icon.png
diff --git a/graphics/pokemon/metapod/normal.pal b/graphics/pokemon/gen_1/metapod/normal.pal
similarity index 100%
rename from graphics/pokemon/metapod/normal.pal
rename to graphics/pokemon/gen_1/metapod/normal.pal
diff --git a/graphics/pokemon/metapod/shiny.pal b/graphics/pokemon/gen_1/metapod/shiny.pal
similarity index 100%
rename from graphics/pokemon/metapod/shiny.pal
rename to graphics/pokemon/gen_1/metapod/shiny.pal
diff --git a/graphics/pokemon/mew/anim_front.png b/graphics/pokemon/gen_1/mew/anim_front.png
similarity index 100%
rename from graphics/pokemon/mew/anim_front.png
rename to graphics/pokemon/gen_1/mew/anim_front.png
diff --git a/graphics/pokemon/mew/back.png b/graphics/pokemon/gen_1/mew/back.png
similarity index 100%
rename from graphics/pokemon/mew/back.png
rename to graphics/pokemon/gen_1/mew/back.png
diff --git a/graphics/pokemon/mew/footprint.png b/graphics/pokemon/gen_1/mew/footprint.png
similarity index 100%
rename from graphics/pokemon/mew/footprint.png
rename to graphics/pokemon/gen_1/mew/footprint.png
diff --git a/graphics/pokemon/mew/icon.png b/graphics/pokemon/gen_1/mew/icon.png
similarity index 100%
rename from graphics/pokemon/mew/icon.png
rename to graphics/pokemon/gen_1/mew/icon.png
diff --git a/graphics/pokemon/mew/normal.pal b/graphics/pokemon/gen_1/mew/normal.pal
similarity index 100%
rename from graphics/pokemon/mew/normal.pal
rename to graphics/pokemon/gen_1/mew/normal.pal
diff --git a/graphics/pokemon/mew/shiny.pal b/graphics/pokemon/gen_1/mew/shiny.pal
similarity index 100%
rename from graphics/pokemon/mew/shiny.pal
rename to graphics/pokemon/gen_1/mew/shiny.pal
diff --git a/graphics/pokemon/mewtwo/anim_front.png b/graphics/pokemon/gen_1/mewtwo/anim_front.png
similarity index 100%
rename from graphics/pokemon/mewtwo/anim_front.png
rename to graphics/pokemon/gen_1/mewtwo/anim_front.png
diff --git a/graphics/pokemon/mewtwo/back.png b/graphics/pokemon/gen_1/mewtwo/back.png
similarity index 100%
rename from graphics/pokemon/mewtwo/back.png
rename to graphics/pokemon/gen_1/mewtwo/back.png
diff --git a/graphics/pokemon/mewtwo/footprint.png b/graphics/pokemon/gen_1/mewtwo/footprint.png
similarity index 100%
rename from graphics/pokemon/mewtwo/footprint.png
rename to graphics/pokemon/gen_1/mewtwo/footprint.png
diff --git a/graphics/pokemon/mewtwo/icon.png b/graphics/pokemon/gen_1/mewtwo/icon.png
similarity index 100%
rename from graphics/pokemon/mewtwo/icon.png
rename to graphics/pokemon/gen_1/mewtwo/icon.png
diff --git a/graphics/pokemon/mewtwo/mega_x/back.png b/graphics/pokemon/gen_1/mewtwo/mega_x/back.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_x/back.png
rename to graphics/pokemon/gen_1/mewtwo/mega_x/back.png
diff --git a/graphics/pokemon/mewtwo/mega_x/front.png b/graphics/pokemon/gen_1/mewtwo/mega_x/front.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_x/front.png
rename to graphics/pokemon/gen_1/mewtwo/mega_x/front.png
diff --git a/graphics/pokemon/mewtwo/mega_x/icon.png b/graphics/pokemon/gen_1/mewtwo/mega_x/icon.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_x/icon.png
rename to graphics/pokemon/gen_1/mewtwo/mega_x/icon.png
diff --git a/graphics/pokemon/mewtwo/mega_x/normal.pal b/graphics/pokemon/gen_1/mewtwo/mega_x/normal.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_x/normal.pal
rename to graphics/pokemon/gen_1/mewtwo/mega_x/normal.pal
diff --git a/graphics/pokemon/mewtwo/mega_x/shiny.pal b/graphics/pokemon/gen_1/mewtwo/mega_x/shiny.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_x/shiny.pal
rename to graphics/pokemon/gen_1/mewtwo/mega_x/shiny.pal
diff --git a/graphics/pokemon/mewtwo/mega_y/back.png b/graphics/pokemon/gen_1/mewtwo/mega_y/back.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_y/back.png
rename to graphics/pokemon/gen_1/mewtwo/mega_y/back.png
diff --git a/graphics/pokemon/mewtwo/mega_y/front.png b/graphics/pokemon/gen_1/mewtwo/mega_y/front.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_y/front.png
rename to graphics/pokemon/gen_1/mewtwo/mega_y/front.png
diff --git a/graphics/pokemon/mewtwo/mega_y/icon.png b/graphics/pokemon/gen_1/mewtwo/mega_y/icon.png
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_y/icon.png
rename to graphics/pokemon/gen_1/mewtwo/mega_y/icon.png
diff --git a/graphics/pokemon/mewtwo/mega_y/normal.pal b/graphics/pokemon/gen_1/mewtwo/mega_y/normal.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_y/normal.pal
rename to graphics/pokemon/gen_1/mewtwo/mega_y/normal.pal
diff --git a/graphics/pokemon/mewtwo/mega_y/shiny.pal b/graphics/pokemon/gen_1/mewtwo/mega_y/shiny.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/mega_y/shiny.pal
rename to graphics/pokemon/gen_1/mewtwo/mega_y/shiny.pal
diff --git a/graphics/pokemon/mewtwo/normal.pal b/graphics/pokemon/gen_1/mewtwo/normal.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/normal.pal
rename to graphics/pokemon/gen_1/mewtwo/normal.pal
diff --git a/graphics/pokemon/mewtwo/shiny.pal b/graphics/pokemon/gen_1/mewtwo/shiny.pal
similarity index 100%
rename from graphics/pokemon/mewtwo/shiny.pal
rename to graphics/pokemon/gen_1/mewtwo/shiny.pal
diff --git a/graphics/pokemon/moltres/anim_front.png b/graphics/pokemon/gen_1/moltres/anim_front.png
similarity index 100%
rename from graphics/pokemon/moltres/anim_front.png
rename to graphics/pokemon/gen_1/moltres/anim_front.png
diff --git a/graphics/pokemon/moltres/back.png b/graphics/pokemon/gen_1/moltres/back.png
similarity index 100%
rename from graphics/pokemon/moltres/back.png
rename to graphics/pokemon/gen_1/moltres/back.png
diff --git a/graphics/pokemon/moltres/footprint.png b/graphics/pokemon/gen_1/moltres/footprint.png
similarity index 100%
rename from graphics/pokemon/moltres/footprint.png
rename to graphics/pokemon/gen_1/moltres/footprint.png
diff --git a/graphics/pokemon/moltres/galarian/back.png b/graphics/pokemon/gen_1/moltres/galarian/back.png
similarity index 100%
rename from graphics/pokemon/moltres/galarian/back.png
rename to graphics/pokemon/gen_1/moltres/galarian/back.png
diff --git a/graphics/pokemon/moltres/galarian/front.png b/graphics/pokemon/gen_1/moltres/galarian/front.png
similarity index 100%
rename from graphics/pokemon/moltres/galarian/front.png
rename to graphics/pokemon/gen_1/moltres/galarian/front.png
diff --git a/graphics/pokemon/moltres/galarian/icon.png b/graphics/pokemon/gen_1/moltres/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/moltres/galarian/icon.png
rename to graphics/pokemon/gen_1/moltres/galarian/icon.png
diff --git a/graphics/pokemon/moltres/galarian/normal.pal b/graphics/pokemon/gen_1/moltres/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/moltres/galarian/normal.pal
rename to graphics/pokemon/gen_1/moltres/galarian/normal.pal
diff --git a/graphics/pokemon/moltres/galarian/shiny.pal b/graphics/pokemon/gen_1/moltres/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/moltres/galarian/shiny.pal
rename to graphics/pokemon/gen_1/moltres/galarian/shiny.pal
diff --git a/graphics/pokemon/moltres/icon.png b/graphics/pokemon/gen_1/moltres/icon.png
similarity index 100%
rename from graphics/pokemon/moltres/icon.png
rename to graphics/pokemon/gen_1/moltres/icon.png
diff --git a/graphics/pokemon/moltres/normal.pal b/graphics/pokemon/gen_1/moltres/normal.pal
similarity index 100%
rename from graphics/pokemon/moltres/normal.pal
rename to graphics/pokemon/gen_1/moltres/normal.pal
diff --git a/graphics/pokemon/moltres/shiny.pal b/graphics/pokemon/gen_1/moltres/shiny.pal
similarity index 100%
rename from graphics/pokemon/moltres/shiny.pal
rename to graphics/pokemon/gen_1/moltres/shiny.pal
diff --git a/graphics/pokemon/mr_mime/anim_front.png b/graphics/pokemon/gen_1/mr_mime/anim_front.png
similarity index 100%
rename from graphics/pokemon/mr_mime/anim_front.png
rename to graphics/pokemon/gen_1/mr_mime/anim_front.png
diff --git a/graphics/pokemon/mr_mime/back.png b/graphics/pokemon/gen_1/mr_mime/back.png
similarity index 100%
rename from graphics/pokemon/mr_mime/back.png
rename to graphics/pokemon/gen_1/mr_mime/back.png
diff --git a/graphics/pokemon/blacephalon/footprint.png b/graphics/pokemon/gen_1/mr_mime/footprint.png
similarity index 100%
rename from graphics/pokemon/blacephalon/footprint.png
rename to graphics/pokemon/gen_1/mr_mime/footprint.png
diff --git a/graphics/pokemon/mr_mime/galarian/back.png b/graphics/pokemon/gen_1/mr_mime/galarian/back.png
similarity index 100%
rename from graphics/pokemon/mr_mime/galarian/back.png
rename to graphics/pokemon/gen_1/mr_mime/galarian/back.png
diff --git a/graphics/pokemon/mr_mime/galarian/front.png b/graphics/pokemon/gen_1/mr_mime/galarian/front.png
similarity index 100%
rename from graphics/pokemon/mr_mime/galarian/front.png
rename to graphics/pokemon/gen_1/mr_mime/galarian/front.png
diff --git a/graphics/pokemon/mr_mime/galarian/icon.png b/graphics/pokemon/gen_1/mr_mime/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/mr_mime/galarian/icon.png
rename to graphics/pokemon/gen_1/mr_mime/galarian/icon.png
diff --git a/graphics/pokemon/mr_mime/galarian/normal.pal b/graphics/pokemon/gen_1/mr_mime/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/mr_mime/galarian/normal.pal
rename to graphics/pokemon/gen_1/mr_mime/galarian/normal.pal
diff --git a/graphics/pokemon/mr_mime/galarian/shiny.pal b/graphics/pokemon/gen_1/mr_mime/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/mr_mime/galarian/shiny.pal
rename to graphics/pokemon/gen_1/mr_mime/galarian/shiny.pal
diff --git a/graphics/pokemon/mr_mime/icon.png b/graphics/pokemon/gen_1/mr_mime/icon.png
similarity index 100%
rename from graphics/pokemon/mr_mime/icon.png
rename to graphics/pokemon/gen_1/mr_mime/icon.png
diff --git a/graphics/pokemon/mr_mime/normal.pal b/graphics/pokemon/gen_1/mr_mime/normal.pal
similarity index 100%
rename from graphics/pokemon/mr_mime/normal.pal
rename to graphics/pokemon/gen_1/mr_mime/normal.pal
diff --git a/graphics/pokemon/mr_mime/shiny.pal b/graphics/pokemon/gen_1/mr_mime/shiny.pal
similarity index 100%
rename from graphics/pokemon/mr_mime/shiny.pal
rename to graphics/pokemon/gen_1/mr_mime/shiny.pal
diff --git a/graphics/pokemon/muk/alolan/back.png b/graphics/pokemon/gen_1/muk/alolan/back.png
similarity index 100%
rename from graphics/pokemon/muk/alolan/back.png
rename to graphics/pokemon/gen_1/muk/alolan/back.png
diff --git a/graphics/pokemon/muk/alolan/front.png b/graphics/pokemon/gen_1/muk/alolan/front.png
similarity index 100%
rename from graphics/pokemon/muk/alolan/front.png
rename to graphics/pokemon/gen_1/muk/alolan/front.png
diff --git a/graphics/pokemon/muk/alolan/icon.png b/graphics/pokemon/gen_1/muk/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/muk/alolan/icon.png
rename to graphics/pokemon/gen_1/muk/alolan/icon.png
diff --git a/graphics/pokemon/muk/alolan/normal.pal b/graphics/pokemon/gen_1/muk/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/muk/alolan/normal.pal
rename to graphics/pokemon/gen_1/muk/alolan/normal.pal
diff --git a/graphics/pokemon/muk/alolan/shiny.pal b/graphics/pokemon/gen_1/muk/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/muk/alolan/shiny.pal
rename to graphics/pokemon/gen_1/muk/alolan/shiny.pal
diff --git a/graphics/pokemon/muk/anim_front.png b/graphics/pokemon/gen_1/muk/anim_front.png
similarity index 100%
rename from graphics/pokemon/muk/anim_front.png
rename to graphics/pokemon/gen_1/muk/anim_front.png
diff --git a/graphics/pokemon/muk/back.png b/graphics/pokemon/gen_1/muk/back.png
similarity index 100%
rename from graphics/pokemon/muk/back.png
rename to graphics/pokemon/gen_1/muk/back.png
diff --git a/graphics/pokemon/chandelure/footprint.png b/graphics/pokemon/gen_1/muk/footprint.png
similarity index 100%
rename from graphics/pokemon/chandelure/footprint.png
rename to graphics/pokemon/gen_1/muk/footprint.png
diff --git a/graphics/pokemon/muk/icon.png b/graphics/pokemon/gen_1/muk/icon.png
similarity index 100%
rename from graphics/pokemon/muk/icon.png
rename to graphics/pokemon/gen_1/muk/icon.png
diff --git a/graphics/pokemon/muk/normal.pal b/graphics/pokemon/gen_1/muk/normal.pal
similarity index 100%
rename from graphics/pokemon/muk/normal.pal
rename to graphics/pokemon/gen_1/muk/normal.pal
diff --git a/graphics/pokemon/muk/shiny.pal b/graphics/pokemon/gen_1/muk/shiny.pal
similarity index 100%
rename from graphics/pokemon/muk/shiny.pal
rename to graphics/pokemon/gen_1/muk/shiny.pal
diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/gen_1/nidoking/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidoking/anim_front.png
rename to graphics/pokemon/gen_1/nidoking/anim_front.png
diff --git a/graphics/pokemon/nidoking/back.png b/graphics/pokemon/gen_1/nidoking/back.png
similarity index 100%
rename from graphics/pokemon/nidoking/back.png
rename to graphics/pokemon/gen_1/nidoking/back.png
diff --git a/graphics/pokemon/nidoking/footprint.png b/graphics/pokemon/gen_1/nidoking/footprint.png
similarity index 100%
rename from graphics/pokemon/nidoking/footprint.png
rename to graphics/pokemon/gen_1/nidoking/footprint.png
diff --git a/graphics/pokemon/nidoking/icon.png b/graphics/pokemon/gen_1/nidoking/icon.png
similarity index 100%
rename from graphics/pokemon/nidoking/icon.png
rename to graphics/pokemon/gen_1/nidoking/icon.png
diff --git a/graphics/pokemon/nidoking/normal.pal b/graphics/pokemon/gen_1/nidoking/normal.pal
similarity index 100%
rename from graphics/pokemon/nidoking/normal.pal
rename to graphics/pokemon/gen_1/nidoking/normal.pal
diff --git a/graphics/pokemon/nidoking/shiny.pal b/graphics/pokemon/gen_1/nidoking/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidoking/shiny.pal
rename to graphics/pokemon/gen_1/nidoking/shiny.pal
diff --git a/graphics/pokemon/nidoqueen/anim_front.png b/graphics/pokemon/gen_1/nidoqueen/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidoqueen/anim_front.png
rename to graphics/pokemon/gen_1/nidoqueen/anim_front.png
diff --git a/graphics/pokemon/nidoqueen/back.png b/graphics/pokemon/gen_1/nidoqueen/back.png
similarity index 100%
rename from graphics/pokemon/nidoqueen/back.png
rename to graphics/pokemon/gen_1/nidoqueen/back.png
diff --git a/graphics/pokemon/nidoqueen/footprint.png b/graphics/pokemon/gen_1/nidoqueen/footprint.png
similarity index 100%
rename from graphics/pokemon/nidoqueen/footprint.png
rename to graphics/pokemon/gen_1/nidoqueen/footprint.png
diff --git a/graphics/pokemon/nidoqueen/icon.png b/graphics/pokemon/gen_1/nidoqueen/icon.png
similarity index 100%
rename from graphics/pokemon/nidoqueen/icon.png
rename to graphics/pokemon/gen_1/nidoqueen/icon.png
diff --git a/graphics/pokemon/nidoqueen/normal.pal b/graphics/pokemon/gen_1/nidoqueen/normal.pal
similarity index 100%
rename from graphics/pokemon/nidoqueen/normal.pal
rename to graphics/pokemon/gen_1/nidoqueen/normal.pal
diff --git a/graphics/pokemon/nidoqueen/shiny.pal b/graphics/pokemon/gen_1/nidoqueen/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidoqueen/shiny.pal
rename to graphics/pokemon/gen_1/nidoqueen/shiny.pal
diff --git a/graphics/pokemon/nidoran_f/anim_front.png b/graphics/pokemon/gen_1/nidoran_f/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidoran_f/anim_front.png
rename to graphics/pokemon/gen_1/nidoran_f/anim_front.png
diff --git a/graphics/pokemon/nidoran_f/back.png b/graphics/pokemon/gen_1/nidoran_f/back.png
similarity index 100%
rename from graphics/pokemon/nidoran_f/back.png
rename to graphics/pokemon/gen_1/nidoran_f/back.png
diff --git a/graphics/pokemon/nidoran_f/footprint.png b/graphics/pokemon/gen_1/nidoran_f/footprint.png
similarity index 100%
rename from graphics/pokemon/nidoran_f/footprint.png
rename to graphics/pokemon/gen_1/nidoran_f/footprint.png
diff --git a/graphics/pokemon/nidoran_f/icon.png b/graphics/pokemon/gen_1/nidoran_f/icon.png
similarity index 100%
rename from graphics/pokemon/nidoran_f/icon.png
rename to graphics/pokemon/gen_1/nidoran_f/icon.png
diff --git a/graphics/pokemon/nidoran_f/normal.pal b/graphics/pokemon/gen_1/nidoran_f/normal.pal
similarity index 100%
rename from graphics/pokemon/nidoran_f/normal.pal
rename to graphics/pokemon/gen_1/nidoran_f/normal.pal
diff --git a/graphics/pokemon/nidoran_f/shiny.pal b/graphics/pokemon/gen_1/nidoran_f/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidoran_f/shiny.pal
rename to graphics/pokemon/gen_1/nidoran_f/shiny.pal
diff --git a/graphics/pokemon/nidoran_m/anim_front.png b/graphics/pokemon/gen_1/nidoran_m/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidoran_m/anim_front.png
rename to graphics/pokemon/gen_1/nidoran_m/anim_front.png
diff --git a/graphics/pokemon/nidoran_m/back.png b/graphics/pokemon/gen_1/nidoran_m/back.png
similarity index 100%
rename from graphics/pokemon/nidoran_m/back.png
rename to graphics/pokemon/gen_1/nidoran_m/back.png
diff --git a/graphics/pokemon/nidoran_m/footprint.png b/graphics/pokemon/gen_1/nidoran_m/footprint.png
similarity index 100%
rename from graphics/pokemon/nidoran_m/footprint.png
rename to graphics/pokemon/gen_1/nidoran_m/footprint.png
diff --git a/graphics/pokemon/nidoran_m/icon.png b/graphics/pokemon/gen_1/nidoran_m/icon.png
similarity index 100%
rename from graphics/pokemon/nidoran_m/icon.png
rename to graphics/pokemon/gen_1/nidoran_m/icon.png
diff --git a/graphics/pokemon/nidoran_m/normal.pal b/graphics/pokemon/gen_1/nidoran_m/normal.pal
similarity index 100%
rename from graphics/pokemon/nidoran_m/normal.pal
rename to graphics/pokemon/gen_1/nidoran_m/normal.pal
diff --git a/graphics/pokemon/nidoran_m/shiny.pal b/graphics/pokemon/gen_1/nidoran_m/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidoran_m/shiny.pal
rename to graphics/pokemon/gen_1/nidoran_m/shiny.pal
diff --git a/graphics/pokemon/nidorina/anim_front.png b/graphics/pokemon/gen_1/nidorina/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidorina/anim_front.png
rename to graphics/pokemon/gen_1/nidorina/anim_front.png
diff --git a/graphics/pokemon/nidorina/back.png b/graphics/pokemon/gen_1/nidorina/back.png
similarity index 100%
rename from graphics/pokemon/nidorina/back.png
rename to graphics/pokemon/gen_1/nidorina/back.png
diff --git a/graphics/pokemon/nidorina/footprint.png b/graphics/pokemon/gen_1/nidorina/footprint.png
similarity index 100%
rename from graphics/pokemon/nidorina/footprint.png
rename to graphics/pokemon/gen_1/nidorina/footprint.png
diff --git a/graphics/pokemon/nidorina/icon.png b/graphics/pokemon/gen_1/nidorina/icon.png
similarity index 100%
rename from graphics/pokemon/nidorina/icon.png
rename to graphics/pokemon/gen_1/nidorina/icon.png
diff --git a/graphics/pokemon/nidorina/normal.pal b/graphics/pokemon/gen_1/nidorina/normal.pal
similarity index 100%
rename from graphics/pokemon/nidorina/normal.pal
rename to graphics/pokemon/gen_1/nidorina/normal.pal
diff --git a/graphics/pokemon/nidorina/shiny.pal b/graphics/pokemon/gen_1/nidorina/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidorina/shiny.pal
rename to graphics/pokemon/gen_1/nidorina/shiny.pal
diff --git a/graphics/pokemon/nidorino/anim_front.png b/graphics/pokemon/gen_1/nidorino/anim_front.png
similarity index 100%
rename from graphics/pokemon/nidorino/anim_front.png
rename to graphics/pokemon/gen_1/nidorino/anim_front.png
diff --git a/graphics/pokemon/nidorino/back.png b/graphics/pokemon/gen_1/nidorino/back.png
similarity index 100%
rename from graphics/pokemon/nidorino/back.png
rename to graphics/pokemon/gen_1/nidorino/back.png
diff --git a/graphics/pokemon/nidorino/footprint.png b/graphics/pokemon/gen_1/nidorino/footprint.png
similarity index 100%
rename from graphics/pokemon/nidorino/footprint.png
rename to graphics/pokemon/gen_1/nidorino/footprint.png
diff --git a/graphics/pokemon/nidorino/icon.png b/graphics/pokemon/gen_1/nidorino/icon.png
similarity index 100%
rename from graphics/pokemon/nidorino/icon.png
rename to graphics/pokemon/gen_1/nidorino/icon.png
diff --git a/graphics/pokemon/nidorino/normal.pal b/graphics/pokemon/gen_1/nidorino/normal.pal
similarity index 100%
rename from graphics/pokemon/nidorino/normal.pal
rename to graphics/pokemon/gen_1/nidorino/normal.pal
diff --git a/graphics/pokemon/nidorino/shiny.pal b/graphics/pokemon/gen_1/nidorino/shiny.pal
similarity index 100%
rename from graphics/pokemon/nidorino/shiny.pal
rename to graphics/pokemon/gen_1/nidorino/shiny.pal
diff --git a/graphics/pokemon/ninetales/alolan/back.png b/graphics/pokemon/gen_1/ninetales/alolan/back.png
similarity index 100%
rename from graphics/pokemon/ninetales/alolan/back.png
rename to graphics/pokemon/gen_1/ninetales/alolan/back.png
diff --git a/graphics/pokemon/ninetales/alolan/front.png b/graphics/pokemon/gen_1/ninetales/alolan/front.png
similarity index 100%
rename from graphics/pokemon/ninetales/alolan/front.png
rename to graphics/pokemon/gen_1/ninetales/alolan/front.png
diff --git a/graphics/pokemon/ninetales/alolan/icon.png b/graphics/pokemon/gen_1/ninetales/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/ninetales/alolan/icon.png
rename to graphics/pokemon/gen_1/ninetales/alolan/icon.png
diff --git a/graphics/pokemon/ninetales/alolan/normal.pal b/graphics/pokemon/gen_1/ninetales/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/ninetales/alolan/normal.pal
rename to graphics/pokemon/gen_1/ninetales/alolan/normal.pal
diff --git a/graphics/pokemon/ninetales/alolan/shiny.pal b/graphics/pokemon/gen_1/ninetales/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/ninetales/alolan/shiny.pal
rename to graphics/pokemon/gen_1/ninetales/alolan/shiny.pal
diff --git a/graphics/pokemon/ninetales/anim_front.png b/graphics/pokemon/gen_1/ninetales/anim_front.png
similarity index 100%
rename from graphics/pokemon/ninetales/anim_front.png
rename to graphics/pokemon/gen_1/ninetales/anim_front.png
diff --git a/graphics/pokemon/ninetales/back.png b/graphics/pokemon/gen_1/ninetales/back.png
similarity index 100%
rename from graphics/pokemon/ninetales/back.png
rename to graphics/pokemon/gen_1/ninetales/back.png
diff --git a/graphics/pokemon/ninetales/footprint.png b/graphics/pokemon/gen_1/ninetales/footprint.png
similarity index 100%
rename from graphics/pokemon/ninetales/footprint.png
rename to graphics/pokemon/gen_1/ninetales/footprint.png
diff --git a/graphics/pokemon/ninetales/icon.png b/graphics/pokemon/gen_1/ninetales/icon.png
similarity index 100%
rename from graphics/pokemon/ninetales/icon.png
rename to graphics/pokemon/gen_1/ninetales/icon.png
diff --git a/graphics/pokemon/ninetales/normal.pal b/graphics/pokemon/gen_1/ninetales/normal.pal
similarity index 100%
rename from graphics/pokemon/ninetales/normal.pal
rename to graphics/pokemon/gen_1/ninetales/normal.pal
diff --git a/graphics/pokemon/ninetales/shiny.pal b/graphics/pokemon/gen_1/ninetales/shiny.pal
similarity index 100%
rename from graphics/pokemon/ninetales/shiny.pal
rename to graphics/pokemon/gen_1/ninetales/shiny.pal
diff --git a/graphics/pokemon/oddish/anim_front.png b/graphics/pokemon/gen_1/oddish/anim_front.png
similarity index 100%
rename from graphics/pokemon/oddish/anim_front.png
rename to graphics/pokemon/gen_1/oddish/anim_front.png
diff --git a/graphics/pokemon/oddish/back.png b/graphics/pokemon/gen_1/oddish/back.png
similarity index 100%
rename from graphics/pokemon/oddish/back.png
rename to graphics/pokemon/gen_1/oddish/back.png
diff --git a/graphics/pokemon/oddish/footprint.png b/graphics/pokemon/gen_1/oddish/footprint.png
similarity index 100%
rename from graphics/pokemon/oddish/footprint.png
rename to graphics/pokemon/gen_1/oddish/footprint.png
diff --git a/graphics/pokemon/oddish/icon.png b/graphics/pokemon/gen_1/oddish/icon.png
similarity index 100%
rename from graphics/pokemon/oddish/icon.png
rename to graphics/pokemon/gen_1/oddish/icon.png
diff --git a/graphics/pokemon/oddish/normal.pal b/graphics/pokemon/gen_1/oddish/normal.pal
similarity index 100%
rename from graphics/pokemon/oddish/normal.pal
rename to graphics/pokemon/gen_1/oddish/normal.pal
diff --git a/graphics/pokemon/oddish/shiny.pal b/graphics/pokemon/gen_1/oddish/shiny.pal
similarity index 100%
rename from graphics/pokemon/oddish/shiny.pal
rename to graphics/pokemon/gen_1/oddish/shiny.pal
diff --git a/graphics/pokemon/omanyte/anim_front.png b/graphics/pokemon/gen_1/omanyte/anim_front.png
similarity index 100%
rename from graphics/pokemon/omanyte/anim_front.png
rename to graphics/pokemon/gen_1/omanyte/anim_front.png
diff --git a/graphics/pokemon/omanyte/back.png b/graphics/pokemon/gen_1/omanyte/back.png
similarity index 100%
rename from graphics/pokemon/omanyte/back.png
rename to graphics/pokemon/gen_1/omanyte/back.png
diff --git a/graphics/pokemon/omanyte/footprint.png b/graphics/pokemon/gen_1/omanyte/footprint.png
similarity index 100%
rename from graphics/pokemon/omanyte/footprint.png
rename to graphics/pokemon/gen_1/omanyte/footprint.png
diff --git a/graphics/pokemon/omanyte/icon.png b/graphics/pokemon/gen_1/omanyte/icon.png
similarity index 100%
rename from graphics/pokemon/omanyte/icon.png
rename to graphics/pokemon/gen_1/omanyte/icon.png
diff --git a/graphics/pokemon/omanyte/normal.pal b/graphics/pokemon/gen_1/omanyte/normal.pal
similarity index 100%
rename from graphics/pokemon/omanyte/normal.pal
rename to graphics/pokemon/gen_1/omanyte/normal.pal
diff --git a/graphics/pokemon/omanyte/shiny.pal b/graphics/pokemon/gen_1/omanyte/shiny.pal
similarity index 100%
rename from graphics/pokemon/omanyte/shiny.pal
rename to graphics/pokemon/gen_1/omanyte/shiny.pal
diff --git a/graphics/pokemon/omastar/anim_front.png b/graphics/pokemon/gen_1/omastar/anim_front.png
similarity index 100%
rename from graphics/pokemon/omastar/anim_front.png
rename to graphics/pokemon/gen_1/omastar/anim_front.png
diff --git a/graphics/pokemon/omastar/back.png b/graphics/pokemon/gen_1/omastar/back.png
similarity index 100%
rename from graphics/pokemon/omastar/back.png
rename to graphics/pokemon/gen_1/omastar/back.png
diff --git a/graphics/pokemon/omastar/footprint.png b/graphics/pokemon/gen_1/omastar/footprint.png
similarity index 100%
rename from graphics/pokemon/omastar/footprint.png
rename to graphics/pokemon/gen_1/omastar/footprint.png
diff --git a/graphics/pokemon/omastar/icon.png b/graphics/pokemon/gen_1/omastar/icon.png
similarity index 100%
rename from graphics/pokemon/omastar/icon.png
rename to graphics/pokemon/gen_1/omastar/icon.png
diff --git a/graphics/pokemon/omastar/normal.pal b/graphics/pokemon/gen_1/omastar/normal.pal
similarity index 100%
rename from graphics/pokemon/omastar/normal.pal
rename to graphics/pokemon/gen_1/omastar/normal.pal
diff --git a/graphics/pokemon/omastar/shiny.pal b/graphics/pokemon/gen_1/omastar/shiny.pal
similarity index 100%
rename from graphics/pokemon/omastar/shiny.pal
rename to graphics/pokemon/gen_1/omastar/shiny.pal
diff --git a/graphics/pokemon/onix/anim_front.png b/graphics/pokemon/gen_1/onix/anim_front.png
similarity index 100%
rename from graphics/pokemon/onix/anim_front.png
rename to graphics/pokemon/gen_1/onix/anim_front.png
diff --git a/graphics/pokemon/onix/back.png b/graphics/pokemon/gen_1/onix/back.png
similarity index 100%
rename from graphics/pokemon/onix/back.png
rename to graphics/pokemon/gen_1/onix/back.png
diff --git a/graphics/pokemon/charjabug/footprint.png b/graphics/pokemon/gen_1/onix/footprint.png
similarity index 100%
rename from graphics/pokemon/charjabug/footprint.png
rename to graphics/pokemon/gen_1/onix/footprint.png
diff --git a/graphics/pokemon/onix/icon.png b/graphics/pokemon/gen_1/onix/icon.png
similarity index 100%
rename from graphics/pokemon/onix/icon.png
rename to graphics/pokemon/gen_1/onix/icon.png
diff --git a/graphics/pokemon/onix/normal.pal b/graphics/pokemon/gen_1/onix/normal.pal
similarity index 100%
rename from graphics/pokemon/onix/normal.pal
rename to graphics/pokemon/gen_1/onix/normal.pal
diff --git a/graphics/pokemon/onix/shiny.pal b/graphics/pokemon/gen_1/onix/shiny.pal
similarity index 100%
rename from graphics/pokemon/onix/shiny.pal
rename to graphics/pokemon/gen_1/onix/shiny.pal
diff --git a/graphics/pokemon/paras/anim_front.png b/graphics/pokemon/gen_1/paras/anim_front.png
similarity index 100%
rename from graphics/pokemon/paras/anim_front.png
rename to graphics/pokemon/gen_1/paras/anim_front.png
diff --git a/graphics/pokemon/paras/back.png b/graphics/pokemon/gen_1/paras/back.png
similarity index 100%
rename from graphics/pokemon/paras/back.png
rename to graphics/pokemon/gen_1/paras/back.png
diff --git a/graphics/pokemon/gossifleur/footprint.png b/graphics/pokemon/gen_1/paras/footprint.png
similarity index 100%
rename from graphics/pokemon/gossifleur/footprint.png
rename to graphics/pokemon/gen_1/paras/footprint.png
diff --git a/graphics/pokemon/paras/icon.png b/graphics/pokemon/gen_1/paras/icon.png
similarity index 100%
rename from graphics/pokemon/paras/icon.png
rename to graphics/pokemon/gen_1/paras/icon.png
diff --git a/graphics/pokemon/paras/normal.pal b/graphics/pokemon/gen_1/paras/normal.pal
similarity index 100%
rename from graphics/pokemon/paras/normal.pal
rename to graphics/pokemon/gen_1/paras/normal.pal
diff --git a/graphics/pokemon/paras/shiny.pal b/graphics/pokemon/gen_1/paras/shiny.pal
similarity index 100%
rename from graphics/pokemon/paras/shiny.pal
rename to graphics/pokemon/gen_1/paras/shiny.pal
diff --git a/graphics/pokemon/parasect/anim_front.png b/graphics/pokemon/gen_1/parasect/anim_front.png
similarity index 100%
rename from graphics/pokemon/parasect/anim_front.png
rename to graphics/pokemon/gen_1/parasect/anim_front.png
diff --git a/graphics/pokemon/parasect/back.png b/graphics/pokemon/gen_1/parasect/back.png
similarity index 100%
rename from graphics/pokemon/parasect/back.png
rename to graphics/pokemon/gen_1/parasect/back.png
diff --git a/graphics/pokemon/parasect/footprint.png b/graphics/pokemon/gen_1/parasect/footprint.png
similarity index 100%
rename from graphics/pokemon/parasect/footprint.png
rename to graphics/pokemon/gen_1/parasect/footprint.png
diff --git a/graphics/pokemon/parasect/icon.png b/graphics/pokemon/gen_1/parasect/icon.png
similarity index 100%
rename from graphics/pokemon/parasect/icon.png
rename to graphics/pokemon/gen_1/parasect/icon.png
diff --git a/graphics/pokemon/parasect/normal.pal b/graphics/pokemon/gen_1/parasect/normal.pal
similarity index 100%
rename from graphics/pokemon/parasect/normal.pal
rename to graphics/pokemon/gen_1/parasect/normal.pal
diff --git a/graphics/pokemon/parasect/shiny.pal b/graphics/pokemon/gen_1/parasect/shiny.pal
similarity index 100%
rename from graphics/pokemon/parasect/shiny.pal
rename to graphics/pokemon/gen_1/parasect/shiny.pal
diff --git a/graphics/pokemon/persian/alolan/back.png b/graphics/pokemon/gen_1/persian/alolan/back.png
similarity index 100%
rename from graphics/pokemon/persian/alolan/back.png
rename to graphics/pokemon/gen_1/persian/alolan/back.png
diff --git a/graphics/pokemon/persian/alolan/front.png b/graphics/pokemon/gen_1/persian/alolan/front.png
similarity index 100%
rename from graphics/pokemon/persian/alolan/front.png
rename to graphics/pokemon/gen_1/persian/alolan/front.png
diff --git a/graphics/pokemon/persian/alolan/icon.png b/graphics/pokemon/gen_1/persian/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/persian/alolan/icon.png
rename to graphics/pokemon/gen_1/persian/alolan/icon.png
diff --git a/graphics/pokemon/persian/alolan/normal.pal b/graphics/pokemon/gen_1/persian/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/persian/alolan/normal.pal
rename to graphics/pokemon/gen_1/persian/alolan/normal.pal
diff --git a/graphics/pokemon/persian/alolan/shiny.pal b/graphics/pokemon/gen_1/persian/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/persian/alolan/shiny.pal
rename to graphics/pokemon/gen_1/persian/alolan/shiny.pal
diff --git a/graphics/pokemon/persian/anim_front.png b/graphics/pokemon/gen_1/persian/anim_front.png
similarity index 100%
rename from graphics/pokemon/persian/anim_front.png
rename to graphics/pokemon/gen_1/persian/anim_front.png
diff --git a/graphics/pokemon/persian/back.png b/graphics/pokemon/gen_1/persian/back.png
similarity index 100%
rename from graphics/pokemon/persian/back.png
rename to graphics/pokemon/gen_1/persian/back.png
diff --git a/graphics/pokemon/persian/footprint.png b/graphics/pokemon/gen_1/persian/footprint.png
similarity index 100%
rename from graphics/pokemon/persian/footprint.png
rename to graphics/pokemon/gen_1/persian/footprint.png
diff --git a/graphics/pokemon/persian/icon.png b/graphics/pokemon/gen_1/persian/icon.png
similarity index 100%
rename from graphics/pokemon/persian/icon.png
rename to graphics/pokemon/gen_1/persian/icon.png
diff --git a/graphics/pokemon/persian/normal.pal b/graphics/pokemon/gen_1/persian/normal.pal
similarity index 100%
rename from graphics/pokemon/persian/normal.pal
rename to graphics/pokemon/gen_1/persian/normal.pal
diff --git a/graphics/pokemon/persian/shiny.pal b/graphics/pokemon/gen_1/persian/shiny.pal
similarity index 100%
rename from graphics/pokemon/persian/shiny.pal
rename to graphics/pokemon/gen_1/persian/shiny.pal
diff --git a/graphics/pokemon/pidgeot/anim_front.png b/graphics/pokemon/gen_1/pidgeot/anim_front.png
similarity index 100%
rename from graphics/pokemon/pidgeot/anim_front.png
rename to graphics/pokemon/gen_1/pidgeot/anim_front.png
diff --git a/graphics/pokemon/pidgeot/back.png b/graphics/pokemon/gen_1/pidgeot/back.png
similarity index 100%
rename from graphics/pokemon/pidgeot/back.png
rename to graphics/pokemon/gen_1/pidgeot/back.png
diff --git a/graphics/pokemon/corviknight/footprint.png b/graphics/pokemon/gen_1/pidgeot/footprint.png
similarity index 100%
rename from graphics/pokemon/corviknight/footprint.png
rename to graphics/pokemon/gen_1/pidgeot/footprint.png
diff --git a/graphics/pokemon/pidgeot/icon.png b/graphics/pokemon/gen_1/pidgeot/icon.png
similarity index 100%
rename from graphics/pokemon/pidgeot/icon.png
rename to graphics/pokemon/gen_1/pidgeot/icon.png
diff --git a/graphics/pokemon/pidgeot/mega/back.png b/graphics/pokemon/gen_1/pidgeot/mega/back.png
similarity index 100%
rename from graphics/pokemon/pidgeot/mega/back.png
rename to graphics/pokemon/gen_1/pidgeot/mega/back.png
diff --git a/graphics/pokemon/pidgeot/mega/front.png b/graphics/pokemon/gen_1/pidgeot/mega/front.png
similarity index 100%
rename from graphics/pokemon/pidgeot/mega/front.png
rename to graphics/pokemon/gen_1/pidgeot/mega/front.png
diff --git a/graphics/pokemon/pidgeot/mega/icon.png b/graphics/pokemon/gen_1/pidgeot/mega/icon.png
similarity index 100%
rename from graphics/pokemon/pidgeot/mega/icon.png
rename to graphics/pokemon/gen_1/pidgeot/mega/icon.png
diff --git a/graphics/pokemon/pidgeot/mega/normal.pal b/graphics/pokemon/gen_1/pidgeot/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/pidgeot/mega/normal.pal
rename to graphics/pokemon/gen_1/pidgeot/mega/normal.pal
diff --git a/graphics/pokemon/pidgeot/mega/shiny.pal b/graphics/pokemon/gen_1/pidgeot/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/pidgeot/mega/shiny.pal
rename to graphics/pokemon/gen_1/pidgeot/mega/shiny.pal
diff --git a/graphics/pokemon/pidgeot/normal.pal b/graphics/pokemon/gen_1/pidgeot/normal.pal
similarity index 100%
rename from graphics/pokemon/pidgeot/normal.pal
rename to graphics/pokemon/gen_1/pidgeot/normal.pal
diff --git a/graphics/pokemon/pidgeot/shiny.pal b/graphics/pokemon/gen_1/pidgeot/shiny.pal
similarity index 100%
rename from graphics/pokemon/pidgeot/shiny.pal
rename to graphics/pokemon/gen_1/pidgeot/shiny.pal
diff --git a/graphics/pokemon/pidgeotto/anim_front.png b/graphics/pokemon/gen_1/pidgeotto/anim_front.png
similarity index 100%
rename from graphics/pokemon/pidgeotto/anim_front.png
rename to graphics/pokemon/gen_1/pidgeotto/anim_front.png
diff --git a/graphics/pokemon/pidgeotto/back.png b/graphics/pokemon/gen_1/pidgeotto/back.png
similarity index 100%
rename from graphics/pokemon/pidgeotto/back.png
rename to graphics/pokemon/gen_1/pidgeotto/back.png
diff --git a/graphics/pokemon/corvisquire/footprint.png b/graphics/pokemon/gen_1/pidgeotto/footprint.png
similarity index 100%
rename from graphics/pokemon/corvisquire/footprint.png
rename to graphics/pokemon/gen_1/pidgeotto/footprint.png
diff --git a/graphics/pokemon/pidgeotto/icon.png b/graphics/pokemon/gen_1/pidgeotto/icon.png
similarity index 100%
rename from graphics/pokemon/pidgeotto/icon.png
rename to graphics/pokemon/gen_1/pidgeotto/icon.png
diff --git a/graphics/pokemon/pidgeotto/normal.pal b/graphics/pokemon/gen_1/pidgeotto/normal.pal
similarity index 100%
rename from graphics/pokemon/pidgeotto/normal.pal
rename to graphics/pokemon/gen_1/pidgeotto/normal.pal
diff --git a/graphics/pokemon/pidgeotto/shiny.pal b/graphics/pokemon/gen_1/pidgeotto/shiny.pal
similarity index 100%
rename from graphics/pokemon/pidgeotto/shiny.pal
rename to graphics/pokemon/gen_1/pidgeotto/shiny.pal
diff --git a/graphics/pokemon/pidgey/anim_front.png b/graphics/pokemon/gen_1/pidgey/anim_front.png
similarity index 100%
rename from graphics/pokemon/pidgey/anim_front.png
rename to graphics/pokemon/gen_1/pidgey/anim_front.png
diff --git a/graphics/pokemon/pidgey/back.png b/graphics/pokemon/gen_1/pidgey/back.png
similarity index 100%
rename from graphics/pokemon/pidgey/back.png
rename to graphics/pokemon/gen_1/pidgey/back.png
diff --git a/graphics/pokemon/pidgey/footprint.png b/graphics/pokemon/gen_1/pidgey/footprint.png
similarity index 100%
rename from graphics/pokemon/pidgey/footprint.png
rename to graphics/pokemon/gen_1/pidgey/footprint.png
diff --git a/graphics/pokemon/pidgey/icon.png b/graphics/pokemon/gen_1/pidgey/icon.png
similarity index 100%
rename from graphics/pokemon/pidgey/icon.png
rename to graphics/pokemon/gen_1/pidgey/icon.png
diff --git a/graphics/pokemon/pidgey/normal.pal b/graphics/pokemon/gen_1/pidgey/normal.pal
similarity index 100%
rename from graphics/pokemon/pidgey/normal.pal
rename to graphics/pokemon/gen_1/pidgey/normal.pal
diff --git a/graphics/pokemon/pidgey/shiny.pal b/graphics/pokemon/gen_1/pidgey/shiny.pal
similarity index 100%
rename from graphics/pokemon/pidgey/shiny.pal
rename to graphics/pokemon/gen_1/pidgey/shiny.pal
diff --git a/graphics/pokemon/pikachu/alola_cap/back.png b/graphics/pokemon/gen_1/pikachu/alola_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/alola_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/alola_cap/back.png
diff --git a/graphics/pokemon/pikachu/alola_cap/front.png b/graphics/pokemon/gen_1/pikachu/alola_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/alola_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/alola_cap/front.png
diff --git a/graphics/pokemon/pikachu/alola_cap/icon.png b/graphics/pokemon/gen_1/pikachu/alola_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/alola_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/alola_cap/icon.png
diff --git a/graphics/pokemon/pikachu/alola_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/alola_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/alola_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/alola_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/alola_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/alola_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/alola_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/alola_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/anim_front.png b/graphics/pokemon/gen_1/pikachu/anim_front.png
similarity index 100%
rename from graphics/pokemon/pikachu/anim_front.png
rename to graphics/pokemon/gen_1/pikachu/anim_front.png
diff --git a/graphics/pokemon/pikachu/anim_frontf.png b/graphics/pokemon/gen_1/pikachu/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/pikachu/anim_frontf.png
rename to graphics/pokemon/gen_1/pikachu/anim_frontf.png
diff --git a/graphics/pokemon/pikachu/back.png b/graphics/pokemon/gen_1/pikachu/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/back.png
rename to graphics/pokemon/gen_1/pikachu/back.png
diff --git a/graphics/pokemon/pikachu/backf.png b/graphics/pokemon/gen_1/pikachu/backf.png
similarity index 100%
rename from graphics/pokemon/pikachu/backf.png
rename to graphics/pokemon/gen_1/pikachu/backf.png
diff --git a/graphics/pokemon/pikachu/belle/back.png b/graphics/pokemon/gen_1/pikachu/belle/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/belle/back.png
rename to graphics/pokemon/gen_1/pikachu/belle/back.png
diff --git a/graphics/pokemon/pikachu/belle/front.png b/graphics/pokemon/gen_1/pikachu/belle/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/belle/front.png
rename to graphics/pokemon/gen_1/pikachu/belle/front.png
diff --git a/graphics/pokemon/pikachu/belle/icon.png b/graphics/pokemon/gen_1/pikachu/belle/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/belle/icon.png
rename to graphics/pokemon/gen_1/pikachu/belle/icon.png
diff --git a/graphics/pokemon/pikachu/belle/normal.pal b/graphics/pokemon/gen_1/pikachu/belle/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/belle/normal.pal
rename to graphics/pokemon/gen_1/pikachu/belle/normal.pal
diff --git a/graphics/pokemon/pikachu/belle/shiny.pal b/graphics/pokemon/gen_1/pikachu/belle/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/belle/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/belle/shiny.pal
diff --git a/graphics/pokemon/pikachu/cosplay/back.png b/graphics/pokemon/gen_1/pikachu/cosplay/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/cosplay/back.png
rename to graphics/pokemon/gen_1/pikachu/cosplay/back.png
diff --git a/graphics/pokemon/pikachu/cosplay/front.png b/graphics/pokemon/gen_1/pikachu/cosplay/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/cosplay/front.png
rename to graphics/pokemon/gen_1/pikachu/cosplay/front.png
diff --git a/graphics/pokemon/pikachu/cosplay/icon.png b/graphics/pokemon/gen_1/pikachu/cosplay/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/cosplay/icon.png
rename to graphics/pokemon/gen_1/pikachu/cosplay/icon.png
diff --git a/graphics/pokemon/pikachu/cosplay/normal.pal b/graphics/pokemon/gen_1/pikachu/cosplay/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/cosplay/normal.pal
rename to graphics/pokemon/gen_1/pikachu/cosplay/normal.pal
diff --git a/graphics/pokemon/pikachu/cosplay/shiny.pal b/graphics/pokemon/gen_1/pikachu/cosplay/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/cosplay/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/cosplay/shiny.pal
diff --git a/graphics/pokemon/pikachu/footprint.png b/graphics/pokemon/gen_1/pikachu/footprint.png
similarity index 100%
rename from graphics/pokemon/pikachu/footprint.png
rename to graphics/pokemon/gen_1/pikachu/footprint.png
diff --git a/graphics/pokemon/pikachu/gigantamax/back.png b/graphics/pokemon/gen_1/pikachu/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/gigantamax/back.png
rename to graphics/pokemon/gen_1/pikachu/gigantamax/back.png
diff --git a/graphics/pokemon/pikachu/gigantamax/front.png b/graphics/pokemon/gen_1/pikachu/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/gigantamax/front.png
rename to graphics/pokemon/gen_1/pikachu/gigantamax/front.png
diff --git a/graphics/pokemon/pikachu/gigantamax/icon.png b/graphics/pokemon/gen_1/pikachu/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/gigantamax/icon.png
rename to graphics/pokemon/gen_1/pikachu/gigantamax/icon.png
diff --git a/graphics/pokemon/pikachu/gigantamax/normal.pal b/graphics/pokemon/gen_1/pikachu/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/pikachu/gigantamax/normal.pal
diff --git a/graphics/pokemon/pikachu/gigantamax/shiny.pal b/graphics/pokemon/gen_1/pikachu/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/gigantamax/shiny.pal
diff --git a/graphics/pokemon/pikachu/hoenn_cap/back.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/hoenn_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/back.png
diff --git a/graphics/pokemon/pikachu/hoenn_cap/front.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/hoenn_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/front.png
diff --git a/graphics/pokemon/pikachu/hoenn_cap/icon.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/hoenn_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.png
diff --git a/graphics/pokemon/pikachu/hoenn_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/hoenn_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/hoenn_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/hoenn_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/icon.png b/graphics/pokemon/gen_1/pikachu/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/icon.png
rename to graphics/pokemon/gen_1/pikachu/icon.png
diff --git a/graphics/pokemon/pikachu/iconf.png b/graphics/pokemon/gen_1/pikachu/iconf.png
similarity index 100%
rename from graphics/pokemon/pikachu/iconf.png
rename to graphics/pokemon/gen_1/pikachu/iconf.png
diff --git a/graphics/pokemon/pikachu/kalos_cap/back.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/kalos_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/kalos_cap/back.png
diff --git a/graphics/pokemon/pikachu/kalos_cap/front.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/kalos_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/kalos_cap/front.png
diff --git a/graphics/pokemon/pikachu/kalos_cap/icon.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/kalos_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/kalos_cap/icon.png
diff --git a/graphics/pokemon/pikachu/kalos_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/kalos_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/kalos_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/kalos_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/kalos_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/kalos_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/libre/back.png b/graphics/pokemon/gen_1/pikachu/libre/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/libre/back.png
rename to graphics/pokemon/gen_1/pikachu/libre/back.png
diff --git a/graphics/pokemon/pikachu/libre/front.png b/graphics/pokemon/gen_1/pikachu/libre/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/libre/front.png
rename to graphics/pokemon/gen_1/pikachu/libre/front.png
diff --git a/graphics/pokemon/pikachu/libre/icon.png b/graphics/pokemon/gen_1/pikachu/libre/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/libre/icon.png
rename to graphics/pokemon/gen_1/pikachu/libre/icon.png
diff --git a/graphics/pokemon/pikachu/libre/normal.pal b/graphics/pokemon/gen_1/pikachu/libre/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/libre/normal.pal
rename to graphics/pokemon/gen_1/pikachu/libre/normal.pal
diff --git a/graphics/pokemon/pikachu/libre/shiny.pal b/graphics/pokemon/gen_1/pikachu/libre/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/libre/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/libre/shiny.pal
diff --git a/graphics/pokemon/pikachu/normal.pal b/graphics/pokemon/gen_1/pikachu/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/normal.pal
rename to graphics/pokemon/gen_1/pikachu/normal.pal
diff --git a/graphics/pokemon/pikachu/original_cap/back.png b/graphics/pokemon/gen_1/pikachu/original_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/original_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/original_cap/back.png
diff --git a/graphics/pokemon/pikachu/original_cap/front.png b/graphics/pokemon/gen_1/pikachu/original_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/original_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/original_cap/front.png
diff --git a/graphics/pokemon/pikachu/original_cap/icon.png b/graphics/pokemon/gen_1/pikachu/original_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/original_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/original_cap/icon.png
diff --git a/graphics/pokemon/pikachu/original_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/original_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/original_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/original_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/original_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/original_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/original_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/original_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/partner_cap/back.png b/graphics/pokemon/gen_1/pikachu/partner_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/partner_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/partner_cap/back.png
diff --git a/graphics/pokemon/pikachu/partner_cap/front.png b/graphics/pokemon/gen_1/pikachu/partner_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/partner_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/partner_cap/front.png
diff --git a/graphics/pokemon/pikachu/partner_cap/icon.png b/graphics/pokemon/gen_1/pikachu/partner_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/partner_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/partner_cap/icon.png
diff --git a/graphics/pokemon/pikachu/partner_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/partner_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/partner_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/partner_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/partner_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/partner_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/partner_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/partner_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/ph_d/back.png b/graphics/pokemon/gen_1/pikachu/ph_d/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/ph_d/back.png
rename to graphics/pokemon/gen_1/pikachu/ph_d/back.png
diff --git a/graphics/pokemon/pikachu/ph_d/front.png b/graphics/pokemon/gen_1/pikachu/ph_d/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/ph_d/front.png
rename to graphics/pokemon/gen_1/pikachu/ph_d/front.png
diff --git a/graphics/pokemon/pikachu/ph_d/icon.png b/graphics/pokemon/gen_1/pikachu/ph_d/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/ph_d/icon.png
rename to graphics/pokemon/gen_1/pikachu/ph_d/icon.png
diff --git a/graphics/pokemon/pikachu/ph_d/normal.pal b/graphics/pokemon/gen_1/pikachu/ph_d/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/ph_d/normal.pal
rename to graphics/pokemon/gen_1/pikachu/ph_d/normal.pal
diff --git a/graphics/pokemon/pikachu/ph_d/shiny.pal b/graphics/pokemon/gen_1/pikachu/ph_d/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/ph_d/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/ph_d/shiny.pal
diff --git a/graphics/pokemon/pikachu/pop_star/back.png b/graphics/pokemon/gen_1/pikachu/pop_star/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/pop_star/back.png
rename to graphics/pokemon/gen_1/pikachu/pop_star/back.png
diff --git a/graphics/pokemon/pikachu/pop_star/front.png b/graphics/pokemon/gen_1/pikachu/pop_star/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/pop_star/front.png
rename to graphics/pokemon/gen_1/pikachu/pop_star/front.png
diff --git a/graphics/pokemon/pikachu/pop_star/icon.png b/graphics/pokemon/gen_1/pikachu/pop_star/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/pop_star/icon.png
rename to graphics/pokemon/gen_1/pikachu/pop_star/icon.png
diff --git a/graphics/pokemon/pikachu/pop_star/normal.pal b/graphics/pokemon/gen_1/pikachu/pop_star/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/pop_star/normal.pal
rename to graphics/pokemon/gen_1/pikachu/pop_star/normal.pal
diff --git a/graphics/pokemon/pikachu/pop_star/shiny.pal b/graphics/pokemon/gen_1/pikachu/pop_star/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/pop_star/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/pop_star/shiny.pal
diff --git a/graphics/pokemon/pikachu/rock_star/back.png b/graphics/pokemon/gen_1/pikachu/rock_star/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/rock_star/back.png
rename to graphics/pokemon/gen_1/pikachu/rock_star/back.png
diff --git a/graphics/pokemon/pikachu/rock_star/front.png b/graphics/pokemon/gen_1/pikachu/rock_star/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/rock_star/front.png
rename to graphics/pokemon/gen_1/pikachu/rock_star/front.png
diff --git a/graphics/pokemon/pikachu/rock_star/icon.png b/graphics/pokemon/gen_1/pikachu/rock_star/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/rock_star/icon.png
rename to graphics/pokemon/gen_1/pikachu/rock_star/icon.png
diff --git a/graphics/pokemon/pikachu/rock_star/normal.pal b/graphics/pokemon/gen_1/pikachu/rock_star/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/rock_star/normal.pal
rename to graphics/pokemon/gen_1/pikachu/rock_star/normal.pal
diff --git a/graphics/pokemon/pikachu/rock_star/shiny.pal b/graphics/pokemon/gen_1/pikachu/rock_star/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/rock_star/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/rock_star/shiny.pal
diff --git a/graphics/pokemon/pikachu/shiny.pal b/graphics/pokemon/gen_1/pikachu/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/shiny.pal
diff --git a/graphics/pokemon/pikachu/sinnoh_cap/back.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/sinnoh_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.png
diff --git a/graphics/pokemon/pikachu/sinnoh_cap/front.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/sinnoh_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.png
diff --git a/graphics/pokemon/pikachu/sinnoh_cap/icon.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/sinnoh_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.png
diff --git a/graphics/pokemon/pikachu/sinnoh_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/sinnoh_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/sinnoh_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/sinnoh_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/unova_cap/back.png b/graphics/pokemon/gen_1/pikachu/unova_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/unova_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/unova_cap/back.png
diff --git a/graphics/pokemon/pikachu/unova_cap/front.png b/graphics/pokemon/gen_1/pikachu/unova_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/unova_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/unova_cap/front.png
diff --git a/graphics/pokemon/pikachu/unova_cap/icon.png b/graphics/pokemon/gen_1/pikachu/unova_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/unova_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/unova_cap/icon.png
diff --git a/graphics/pokemon/pikachu/unova_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/unova_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/unova_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/unova_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/unova_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/unova_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/unova_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/unova_cap/shiny.pal
diff --git a/graphics/pokemon/pikachu/world_cap/back.png b/graphics/pokemon/gen_1/pikachu/world_cap/back.png
similarity index 100%
rename from graphics/pokemon/pikachu/world_cap/back.png
rename to graphics/pokemon/gen_1/pikachu/world_cap/back.png
diff --git a/graphics/pokemon/pikachu/world_cap/front.png b/graphics/pokemon/gen_1/pikachu/world_cap/front.png
similarity index 100%
rename from graphics/pokemon/pikachu/world_cap/front.png
rename to graphics/pokemon/gen_1/pikachu/world_cap/front.png
diff --git a/graphics/pokemon/pikachu/world_cap/icon.png b/graphics/pokemon/gen_1/pikachu/world_cap/icon.png
similarity index 100%
rename from graphics/pokemon/pikachu/world_cap/icon.png
rename to graphics/pokemon/gen_1/pikachu/world_cap/icon.png
diff --git a/graphics/pokemon/pikachu/world_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/world_cap/normal.pal
similarity index 100%
rename from graphics/pokemon/pikachu/world_cap/normal.pal
rename to graphics/pokemon/gen_1/pikachu/world_cap/normal.pal
diff --git a/graphics/pokemon/pikachu/world_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/world_cap/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikachu/world_cap/shiny.pal
rename to graphics/pokemon/gen_1/pikachu/world_cap/shiny.pal
diff --git a/graphics/pokemon/pinsir/anim_front.png b/graphics/pokemon/gen_1/pinsir/anim_front.png
similarity index 100%
rename from graphics/pokemon/pinsir/anim_front.png
rename to graphics/pokemon/gen_1/pinsir/anim_front.png
diff --git a/graphics/pokemon/pinsir/back.png b/graphics/pokemon/gen_1/pinsir/back.png
similarity index 100%
rename from graphics/pokemon/pinsir/back.png
rename to graphics/pokemon/gen_1/pinsir/back.png
diff --git a/graphics/pokemon/pinsir/footprint.png b/graphics/pokemon/gen_1/pinsir/footprint.png
similarity index 100%
rename from graphics/pokemon/pinsir/footprint.png
rename to graphics/pokemon/gen_1/pinsir/footprint.png
diff --git a/graphics/pokemon/pinsir/icon.png b/graphics/pokemon/gen_1/pinsir/icon.png
similarity index 100%
rename from graphics/pokemon/pinsir/icon.png
rename to graphics/pokemon/gen_1/pinsir/icon.png
diff --git a/graphics/pokemon/pinsir/mega/back.png b/graphics/pokemon/gen_1/pinsir/mega/back.png
similarity index 100%
rename from graphics/pokemon/pinsir/mega/back.png
rename to graphics/pokemon/gen_1/pinsir/mega/back.png
diff --git a/graphics/pokemon/pinsir/mega/front.png b/graphics/pokemon/gen_1/pinsir/mega/front.png
similarity index 100%
rename from graphics/pokemon/pinsir/mega/front.png
rename to graphics/pokemon/gen_1/pinsir/mega/front.png
diff --git a/graphics/pokemon/pinsir/mega/icon.png b/graphics/pokemon/gen_1/pinsir/mega/icon.png
similarity index 100%
rename from graphics/pokemon/pinsir/mega/icon.png
rename to graphics/pokemon/gen_1/pinsir/mega/icon.png
diff --git a/graphics/pokemon/pinsir/mega/normal.pal b/graphics/pokemon/gen_1/pinsir/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/pinsir/mega/normal.pal
rename to graphics/pokemon/gen_1/pinsir/mega/normal.pal
diff --git a/graphics/pokemon/pinsir/mega/shiny.pal b/graphics/pokemon/gen_1/pinsir/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/pinsir/mega/shiny.pal
rename to graphics/pokemon/gen_1/pinsir/mega/shiny.pal
diff --git a/graphics/pokemon/pinsir/normal.pal b/graphics/pokemon/gen_1/pinsir/normal.pal
similarity index 100%
rename from graphics/pokemon/pinsir/normal.pal
rename to graphics/pokemon/gen_1/pinsir/normal.pal
diff --git a/graphics/pokemon/pinsir/shiny.pal b/graphics/pokemon/gen_1/pinsir/shiny.pal
similarity index 100%
rename from graphics/pokemon/pinsir/shiny.pal
rename to graphics/pokemon/gen_1/pinsir/shiny.pal
diff --git a/graphics/pokemon/poliwag/anim_front.png b/graphics/pokemon/gen_1/poliwag/anim_front.png
similarity index 100%
rename from graphics/pokemon/poliwag/anim_front.png
rename to graphics/pokemon/gen_1/poliwag/anim_front.png
diff --git a/graphics/pokemon/poliwag/back.png b/graphics/pokemon/gen_1/poliwag/back.png
similarity index 100%
rename from graphics/pokemon/poliwag/back.png
rename to graphics/pokemon/gen_1/poliwag/back.png
diff --git a/graphics/pokemon/clobbopus/footprint.png b/graphics/pokemon/gen_1/poliwag/footprint.png
similarity index 100%
rename from graphics/pokemon/clobbopus/footprint.png
rename to graphics/pokemon/gen_1/poliwag/footprint.png
diff --git a/graphics/pokemon/poliwag/icon.png b/graphics/pokemon/gen_1/poliwag/icon.png
similarity index 100%
rename from graphics/pokemon/poliwag/icon.png
rename to graphics/pokemon/gen_1/poliwag/icon.png
diff --git a/graphics/pokemon/poliwag/normal.pal b/graphics/pokemon/gen_1/poliwag/normal.pal
similarity index 100%
rename from graphics/pokemon/poliwag/normal.pal
rename to graphics/pokemon/gen_1/poliwag/normal.pal
diff --git a/graphics/pokemon/poliwag/shiny.pal b/graphics/pokemon/gen_1/poliwag/shiny.pal
similarity index 100%
rename from graphics/pokemon/poliwag/shiny.pal
rename to graphics/pokemon/gen_1/poliwag/shiny.pal
diff --git a/graphics/pokemon/poliwhirl/anim_front.png b/graphics/pokemon/gen_1/poliwhirl/anim_front.png
similarity index 100%
rename from graphics/pokemon/poliwhirl/anim_front.png
rename to graphics/pokemon/gen_1/poliwhirl/anim_front.png
diff --git a/graphics/pokemon/poliwhirl/back.png b/graphics/pokemon/gen_1/poliwhirl/back.png
similarity index 100%
rename from graphics/pokemon/poliwhirl/back.png
rename to graphics/pokemon/gen_1/poliwhirl/back.png
diff --git a/graphics/pokemon/poliwhirl/footprint.png b/graphics/pokemon/gen_1/poliwhirl/footprint.png
similarity index 100%
rename from graphics/pokemon/poliwhirl/footprint.png
rename to graphics/pokemon/gen_1/poliwhirl/footprint.png
diff --git a/graphics/pokemon/poliwhirl/icon.png b/graphics/pokemon/gen_1/poliwhirl/icon.png
similarity index 100%
rename from graphics/pokemon/poliwhirl/icon.png
rename to graphics/pokemon/gen_1/poliwhirl/icon.png
diff --git a/graphics/pokemon/poliwhirl/normal.pal b/graphics/pokemon/gen_1/poliwhirl/normal.pal
similarity index 100%
rename from graphics/pokemon/poliwhirl/normal.pal
rename to graphics/pokemon/gen_1/poliwhirl/normal.pal
diff --git a/graphics/pokemon/poliwhirl/shiny.pal b/graphics/pokemon/gen_1/poliwhirl/shiny.pal
similarity index 100%
rename from graphics/pokemon/poliwhirl/shiny.pal
rename to graphics/pokemon/gen_1/poliwhirl/shiny.pal
diff --git a/graphics/pokemon/poliwrath/anim_front.png b/graphics/pokemon/gen_1/poliwrath/anim_front.png
similarity index 100%
rename from graphics/pokemon/poliwrath/anim_front.png
rename to graphics/pokemon/gen_1/poliwrath/anim_front.png
diff --git a/graphics/pokemon/poliwrath/back.png b/graphics/pokemon/gen_1/poliwrath/back.png
similarity index 100%
rename from graphics/pokemon/poliwrath/back.png
rename to graphics/pokemon/gen_1/poliwrath/back.png
diff --git a/graphics/pokemon/poliwrath/footprint.png b/graphics/pokemon/gen_1/poliwrath/footprint.png
similarity index 100%
rename from graphics/pokemon/poliwrath/footprint.png
rename to graphics/pokemon/gen_1/poliwrath/footprint.png
diff --git a/graphics/pokemon/poliwrath/icon.png b/graphics/pokemon/gen_1/poliwrath/icon.png
similarity index 100%
rename from graphics/pokemon/poliwrath/icon.png
rename to graphics/pokemon/gen_1/poliwrath/icon.png
diff --git a/graphics/pokemon/poliwrath/normal.pal b/graphics/pokemon/gen_1/poliwrath/normal.pal
similarity index 100%
rename from graphics/pokemon/poliwrath/normal.pal
rename to graphics/pokemon/gen_1/poliwrath/normal.pal
diff --git a/graphics/pokemon/poliwrath/shiny.pal b/graphics/pokemon/gen_1/poliwrath/shiny.pal
similarity index 100%
rename from graphics/pokemon/poliwrath/shiny.pal
rename to graphics/pokemon/gen_1/poliwrath/shiny.pal
diff --git a/graphics/pokemon/ponyta/anim_front.png b/graphics/pokemon/gen_1/ponyta/anim_front.png
similarity index 100%
rename from graphics/pokemon/ponyta/anim_front.png
rename to graphics/pokemon/gen_1/ponyta/anim_front.png
diff --git a/graphics/pokemon/ponyta/back.png b/graphics/pokemon/gen_1/ponyta/back.png
similarity index 100%
rename from graphics/pokemon/ponyta/back.png
rename to graphics/pokemon/gen_1/ponyta/back.png
diff --git a/graphics/pokemon/ponyta/footprint.png b/graphics/pokemon/gen_1/ponyta/footprint.png
similarity index 100%
rename from graphics/pokemon/ponyta/footprint.png
rename to graphics/pokemon/gen_1/ponyta/footprint.png
diff --git a/graphics/pokemon/ponyta/galarian/back.png b/graphics/pokemon/gen_1/ponyta/galarian/back.png
similarity index 100%
rename from graphics/pokemon/ponyta/galarian/back.png
rename to graphics/pokemon/gen_1/ponyta/galarian/back.png
diff --git a/graphics/pokemon/ponyta/galarian/front.png b/graphics/pokemon/gen_1/ponyta/galarian/front.png
similarity index 100%
rename from graphics/pokemon/ponyta/galarian/front.png
rename to graphics/pokemon/gen_1/ponyta/galarian/front.png
diff --git a/graphics/pokemon/ponyta/galarian/icon.png b/graphics/pokemon/gen_1/ponyta/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/ponyta/galarian/icon.png
rename to graphics/pokemon/gen_1/ponyta/galarian/icon.png
diff --git a/graphics/pokemon/ponyta/galarian/normal.pal b/graphics/pokemon/gen_1/ponyta/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/ponyta/galarian/normal.pal
rename to graphics/pokemon/gen_1/ponyta/galarian/normal.pal
diff --git a/graphics/pokemon/ponyta/galarian/shiny.pal b/graphics/pokemon/gen_1/ponyta/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/ponyta/galarian/shiny.pal
rename to graphics/pokemon/gen_1/ponyta/galarian/shiny.pal
diff --git a/graphics/pokemon/ponyta/icon.png b/graphics/pokemon/gen_1/ponyta/icon.png
similarity index 100%
rename from graphics/pokemon/ponyta/icon.png
rename to graphics/pokemon/gen_1/ponyta/icon.png
diff --git a/graphics/pokemon/ponyta/normal.pal b/graphics/pokemon/gen_1/ponyta/normal.pal
similarity index 100%
rename from graphics/pokemon/ponyta/normal.pal
rename to graphics/pokemon/gen_1/ponyta/normal.pal
diff --git a/graphics/pokemon/ponyta/shiny.pal b/graphics/pokemon/gen_1/ponyta/shiny.pal
similarity index 100%
rename from graphics/pokemon/ponyta/shiny.pal
rename to graphics/pokemon/gen_1/ponyta/shiny.pal
diff --git a/graphics/pokemon/porygon/anim_front.png b/graphics/pokemon/gen_1/porygon/anim_front.png
similarity index 100%
rename from graphics/pokemon/porygon/anim_front.png
rename to graphics/pokemon/gen_1/porygon/anim_front.png
diff --git a/graphics/pokemon/porygon/back.png b/graphics/pokemon/gen_1/porygon/back.png
similarity index 100%
rename from graphics/pokemon/porygon/back.png
rename to graphics/pokemon/gen_1/porygon/back.png
diff --git a/graphics/pokemon/porygon/footprint.png b/graphics/pokemon/gen_1/porygon/footprint.png
similarity index 100%
rename from graphics/pokemon/porygon/footprint.png
rename to graphics/pokemon/gen_1/porygon/footprint.png
diff --git a/graphics/pokemon/porygon/icon.png b/graphics/pokemon/gen_1/porygon/icon.png
similarity index 100%
rename from graphics/pokemon/porygon/icon.png
rename to graphics/pokemon/gen_1/porygon/icon.png
diff --git a/graphics/pokemon/porygon/normal.pal b/graphics/pokemon/gen_1/porygon/normal.pal
similarity index 100%
rename from graphics/pokemon/porygon/normal.pal
rename to graphics/pokemon/gen_1/porygon/normal.pal
diff --git a/graphics/pokemon/porygon/shiny.pal b/graphics/pokemon/gen_1/porygon/shiny.pal
similarity index 100%
rename from graphics/pokemon/porygon/shiny.pal
rename to graphics/pokemon/gen_1/porygon/shiny.pal
diff --git a/graphics/pokemon/primeape/anim_front.png b/graphics/pokemon/gen_1/primeape/anim_front.png
similarity index 100%
rename from graphics/pokemon/primeape/anim_front.png
rename to graphics/pokemon/gen_1/primeape/anim_front.png
diff --git a/graphics/pokemon/primeape/back.png b/graphics/pokemon/gen_1/primeape/back.png
similarity index 100%
rename from graphics/pokemon/primeape/back.png
rename to graphics/pokemon/gen_1/primeape/back.png
diff --git a/graphics/pokemon/primeape/footprint.png b/graphics/pokemon/gen_1/primeape/footprint.png
similarity index 100%
rename from graphics/pokemon/primeape/footprint.png
rename to graphics/pokemon/gen_1/primeape/footprint.png
diff --git a/graphics/pokemon/primeape/icon.png b/graphics/pokemon/gen_1/primeape/icon.png
similarity index 100%
rename from graphics/pokemon/primeape/icon.png
rename to graphics/pokemon/gen_1/primeape/icon.png
diff --git a/graphics/pokemon/primeape/normal.pal b/graphics/pokemon/gen_1/primeape/normal.pal
similarity index 100%
rename from graphics/pokemon/primeape/normal.pal
rename to graphics/pokemon/gen_1/primeape/normal.pal
diff --git a/graphics/pokemon/primeape/shiny.pal b/graphics/pokemon/gen_1/primeape/shiny.pal
similarity index 100%
rename from graphics/pokemon/primeape/shiny.pal
rename to graphics/pokemon/gen_1/primeape/shiny.pal
diff --git a/graphics/pokemon/psyduck/anim_front.png b/graphics/pokemon/gen_1/psyduck/anim_front.png
similarity index 100%
rename from graphics/pokemon/psyduck/anim_front.png
rename to graphics/pokemon/gen_1/psyduck/anim_front.png
diff --git a/graphics/pokemon/psyduck/back.png b/graphics/pokemon/gen_1/psyduck/back.png
similarity index 100%
rename from graphics/pokemon/psyduck/back.png
rename to graphics/pokemon/gen_1/psyduck/back.png
diff --git a/graphics/pokemon/cramorant/footprint.png b/graphics/pokemon/gen_1/psyduck/footprint.png
similarity index 100%
rename from graphics/pokemon/cramorant/footprint.png
rename to graphics/pokemon/gen_1/psyduck/footprint.png
diff --git a/graphics/pokemon/psyduck/icon.png b/graphics/pokemon/gen_1/psyduck/icon.png
similarity index 100%
rename from graphics/pokemon/psyduck/icon.png
rename to graphics/pokemon/gen_1/psyduck/icon.png
diff --git a/graphics/pokemon/psyduck/normal.pal b/graphics/pokemon/gen_1/psyduck/normal.pal
similarity index 100%
rename from graphics/pokemon/psyduck/normal.pal
rename to graphics/pokemon/gen_1/psyduck/normal.pal
diff --git a/graphics/pokemon/psyduck/shiny.pal b/graphics/pokemon/gen_1/psyduck/shiny.pal
similarity index 100%
rename from graphics/pokemon/psyduck/shiny.pal
rename to graphics/pokemon/gen_1/psyduck/shiny.pal
diff --git a/graphics/pokemon/raichu/alolan/back.png b/graphics/pokemon/gen_1/raichu/alolan/back.png
similarity index 100%
rename from graphics/pokemon/raichu/alolan/back.png
rename to graphics/pokemon/gen_1/raichu/alolan/back.png
diff --git a/graphics/pokemon/raichu/alolan/front.png b/graphics/pokemon/gen_1/raichu/alolan/front.png
similarity index 100%
rename from graphics/pokemon/raichu/alolan/front.png
rename to graphics/pokemon/gen_1/raichu/alolan/front.png
diff --git a/graphics/pokemon/raichu/alolan/icon.png b/graphics/pokemon/gen_1/raichu/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/raichu/alolan/icon.png
rename to graphics/pokemon/gen_1/raichu/alolan/icon.png
diff --git a/graphics/pokemon/raichu/alolan/normal.pal b/graphics/pokemon/gen_1/raichu/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/raichu/alolan/normal.pal
rename to graphics/pokemon/gen_1/raichu/alolan/normal.pal
diff --git a/graphics/pokemon/raichu/alolan/shiny.pal b/graphics/pokemon/gen_1/raichu/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/raichu/alolan/shiny.pal
rename to graphics/pokemon/gen_1/raichu/alolan/shiny.pal
diff --git a/graphics/pokemon/raichu/anim_front.png b/graphics/pokemon/gen_1/raichu/anim_front.png
similarity index 100%
rename from graphics/pokemon/raichu/anim_front.png
rename to graphics/pokemon/gen_1/raichu/anim_front.png
diff --git a/graphics/pokemon/raichu/anim_frontf.png b/graphics/pokemon/gen_1/raichu/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/raichu/anim_frontf.png
rename to graphics/pokemon/gen_1/raichu/anim_frontf.png
diff --git a/graphics/pokemon/raichu/back.png b/graphics/pokemon/gen_1/raichu/back.png
similarity index 100%
rename from graphics/pokemon/raichu/back.png
rename to graphics/pokemon/gen_1/raichu/back.png
diff --git a/graphics/pokemon/raichu/footprint.png b/graphics/pokemon/gen_1/raichu/footprint.png
similarity index 100%
rename from graphics/pokemon/raichu/footprint.png
rename to graphics/pokemon/gen_1/raichu/footprint.png
diff --git a/graphics/pokemon/raichu/icon.png b/graphics/pokemon/gen_1/raichu/icon.png
similarity index 100%
rename from graphics/pokemon/raichu/icon.png
rename to graphics/pokemon/gen_1/raichu/icon.png
diff --git a/graphics/pokemon/raichu/normal.pal b/graphics/pokemon/gen_1/raichu/normal.pal
similarity index 100%
rename from graphics/pokemon/raichu/normal.pal
rename to graphics/pokemon/gen_1/raichu/normal.pal
diff --git a/graphics/pokemon/raichu/shiny.pal b/graphics/pokemon/gen_1/raichu/shiny.pal
similarity index 100%
rename from graphics/pokemon/raichu/shiny.pal
rename to graphics/pokemon/gen_1/raichu/shiny.pal
diff --git a/graphics/pokemon/rapidash/anim_front.png b/graphics/pokemon/gen_1/rapidash/anim_front.png
similarity index 100%
rename from graphics/pokemon/rapidash/anim_front.png
rename to graphics/pokemon/gen_1/rapidash/anim_front.png
diff --git a/graphics/pokemon/rapidash/back.png b/graphics/pokemon/gen_1/rapidash/back.png
similarity index 100%
rename from graphics/pokemon/rapidash/back.png
rename to graphics/pokemon/gen_1/rapidash/back.png
diff --git a/graphics/pokemon/rapidash/footprint.png b/graphics/pokemon/gen_1/rapidash/footprint.png
similarity index 100%
rename from graphics/pokemon/rapidash/footprint.png
rename to graphics/pokemon/gen_1/rapidash/footprint.png
diff --git a/graphics/pokemon/rapidash/galarian/back.png b/graphics/pokemon/gen_1/rapidash/galarian/back.png
similarity index 100%
rename from graphics/pokemon/rapidash/galarian/back.png
rename to graphics/pokemon/gen_1/rapidash/galarian/back.png
diff --git a/graphics/pokemon/rapidash/galarian/front.png b/graphics/pokemon/gen_1/rapidash/galarian/front.png
similarity index 100%
rename from graphics/pokemon/rapidash/galarian/front.png
rename to graphics/pokemon/gen_1/rapidash/galarian/front.png
diff --git a/graphics/pokemon/rapidash/galarian/icon.png b/graphics/pokemon/gen_1/rapidash/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/rapidash/galarian/icon.png
rename to graphics/pokemon/gen_1/rapidash/galarian/icon.png
diff --git a/graphics/pokemon/rapidash/galarian/normal.pal b/graphics/pokemon/gen_1/rapidash/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/rapidash/galarian/normal.pal
rename to graphics/pokemon/gen_1/rapidash/galarian/normal.pal
diff --git a/graphics/pokemon/rapidash/galarian/shiny.pal b/graphics/pokemon/gen_1/rapidash/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/rapidash/galarian/shiny.pal
rename to graphics/pokemon/gen_1/rapidash/galarian/shiny.pal
diff --git a/graphics/pokemon/rapidash/icon.png b/graphics/pokemon/gen_1/rapidash/icon.png
similarity index 100%
rename from graphics/pokemon/rapidash/icon.png
rename to graphics/pokemon/gen_1/rapidash/icon.png
diff --git a/graphics/pokemon/rapidash/normal.pal b/graphics/pokemon/gen_1/rapidash/normal.pal
similarity index 100%
rename from graphics/pokemon/rapidash/normal.pal
rename to graphics/pokemon/gen_1/rapidash/normal.pal
diff --git a/graphics/pokemon/rapidash/shiny.pal b/graphics/pokemon/gen_1/rapidash/shiny.pal
similarity index 100%
rename from graphics/pokemon/rapidash/shiny.pal
rename to graphics/pokemon/gen_1/rapidash/shiny.pal
diff --git a/graphics/pokemon/raticate/alolan/back.png b/graphics/pokemon/gen_1/raticate/alolan/back.png
similarity index 100%
rename from graphics/pokemon/raticate/alolan/back.png
rename to graphics/pokemon/gen_1/raticate/alolan/back.png
diff --git a/graphics/pokemon/raticate/alolan/front.png b/graphics/pokemon/gen_1/raticate/alolan/front.png
similarity index 100%
rename from graphics/pokemon/raticate/alolan/front.png
rename to graphics/pokemon/gen_1/raticate/alolan/front.png
diff --git a/graphics/pokemon/raticate/alolan/icon.png b/graphics/pokemon/gen_1/raticate/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/raticate/alolan/icon.png
rename to graphics/pokemon/gen_1/raticate/alolan/icon.png
diff --git a/graphics/pokemon/raticate/alolan/normal.pal b/graphics/pokemon/gen_1/raticate/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/raticate/alolan/normal.pal
rename to graphics/pokemon/gen_1/raticate/alolan/normal.pal
diff --git a/graphics/pokemon/raticate/alolan/shiny.pal b/graphics/pokemon/gen_1/raticate/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/raticate/alolan/shiny.pal
rename to graphics/pokemon/gen_1/raticate/alolan/shiny.pal
diff --git a/graphics/pokemon/raticate/anim_front.png b/graphics/pokemon/gen_1/raticate/anim_front.png
similarity index 100%
rename from graphics/pokemon/raticate/anim_front.png
rename to graphics/pokemon/gen_1/raticate/anim_front.png
diff --git a/graphics/pokemon/raticate/anim_frontf.png b/graphics/pokemon/gen_1/raticate/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/raticate/anim_frontf.png
rename to graphics/pokemon/gen_1/raticate/anim_frontf.png
diff --git a/graphics/pokemon/raticate/back.png b/graphics/pokemon/gen_1/raticate/back.png
similarity index 100%
rename from graphics/pokemon/raticate/back.png
rename to graphics/pokemon/gen_1/raticate/back.png
diff --git a/graphics/pokemon/raticate/backf.png b/graphics/pokemon/gen_1/raticate/backf.png
similarity index 100%
rename from graphics/pokemon/raticate/backf.png
rename to graphics/pokemon/gen_1/raticate/backf.png
diff --git a/graphics/pokemon/gumshoos/footprint.png b/graphics/pokemon/gen_1/raticate/footprint.png
similarity index 100%
rename from graphics/pokemon/gumshoos/footprint.png
rename to graphics/pokemon/gen_1/raticate/footprint.png
diff --git a/graphics/pokemon/raticate/icon.png b/graphics/pokemon/gen_1/raticate/icon.png
similarity index 100%
rename from graphics/pokemon/raticate/icon.png
rename to graphics/pokemon/gen_1/raticate/icon.png
diff --git a/graphics/pokemon/raticate/normal.pal b/graphics/pokemon/gen_1/raticate/normal.pal
similarity index 100%
rename from graphics/pokemon/raticate/normal.pal
rename to graphics/pokemon/gen_1/raticate/normal.pal
diff --git a/graphics/pokemon/raticate/shiny.pal b/graphics/pokemon/gen_1/raticate/shiny.pal
similarity index 100%
rename from graphics/pokemon/raticate/shiny.pal
rename to graphics/pokemon/gen_1/raticate/shiny.pal
diff --git a/graphics/pokemon/rattata/alolan/back.png b/graphics/pokemon/gen_1/rattata/alolan/back.png
similarity index 100%
rename from graphics/pokemon/rattata/alolan/back.png
rename to graphics/pokemon/gen_1/rattata/alolan/back.png
diff --git a/graphics/pokemon/rattata/alolan/front.png b/graphics/pokemon/gen_1/rattata/alolan/front.png
similarity index 100%
rename from graphics/pokemon/rattata/alolan/front.png
rename to graphics/pokemon/gen_1/rattata/alolan/front.png
diff --git a/graphics/pokemon/rattata/alolan/icon.png b/graphics/pokemon/gen_1/rattata/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/rattata/alolan/icon.png
rename to graphics/pokemon/gen_1/rattata/alolan/icon.png
diff --git a/graphics/pokemon/rattata/alolan/normal.pal b/graphics/pokemon/gen_1/rattata/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/rattata/alolan/normal.pal
rename to graphics/pokemon/gen_1/rattata/alolan/normal.pal
diff --git a/graphics/pokemon/rattata/alolan/shiny.pal b/graphics/pokemon/gen_1/rattata/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/rattata/alolan/shiny.pal
rename to graphics/pokemon/gen_1/rattata/alolan/shiny.pal
diff --git a/graphics/pokemon/rattata/anim_front.png b/graphics/pokemon/gen_1/rattata/anim_front.png
similarity index 100%
rename from graphics/pokemon/rattata/anim_front.png
rename to graphics/pokemon/gen_1/rattata/anim_front.png
diff --git a/graphics/pokemon/rattata/anim_frontf.png b/graphics/pokemon/gen_1/rattata/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/rattata/anim_frontf.png
rename to graphics/pokemon/gen_1/rattata/anim_frontf.png
diff --git a/graphics/pokemon/rattata/back.png b/graphics/pokemon/gen_1/rattata/back.png
similarity index 100%
rename from graphics/pokemon/rattata/back.png
rename to graphics/pokemon/gen_1/rattata/back.png
diff --git a/graphics/pokemon/rattata/backf.png b/graphics/pokemon/gen_1/rattata/backf.png
similarity index 100%
rename from graphics/pokemon/rattata/backf.png
rename to graphics/pokemon/gen_1/rattata/backf.png
diff --git a/graphics/pokemon/rattata/footprint.png b/graphics/pokemon/gen_1/rattata/footprint.png
similarity index 100%
rename from graphics/pokemon/rattata/footprint.png
rename to graphics/pokemon/gen_1/rattata/footprint.png
diff --git a/graphics/pokemon/rattata/icon.png b/graphics/pokemon/gen_1/rattata/icon.png
similarity index 100%
rename from graphics/pokemon/rattata/icon.png
rename to graphics/pokemon/gen_1/rattata/icon.png
diff --git a/graphics/pokemon/rattata/normal.pal b/graphics/pokemon/gen_1/rattata/normal.pal
similarity index 100%
rename from graphics/pokemon/rattata/normal.pal
rename to graphics/pokemon/gen_1/rattata/normal.pal
diff --git a/graphics/pokemon/rattata/shiny.pal b/graphics/pokemon/gen_1/rattata/shiny.pal
similarity index 100%
rename from graphics/pokemon/rattata/shiny.pal
rename to graphics/pokemon/gen_1/rattata/shiny.pal
diff --git a/graphics/pokemon/rhydon/anim_front.png b/graphics/pokemon/gen_1/rhydon/anim_front.png
similarity index 100%
rename from graphics/pokemon/rhydon/anim_front.png
rename to graphics/pokemon/gen_1/rhydon/anim_front.png
diff --git a/graphics/pokemon/rhydon/anim_frontf.png b/graphics/pokemon/gen_1/rhydon/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/rhydon/anim_frontf.png
rename to graphics/pokemon/gen_1/rhydon/anim_frontf.png
diff --git a/graphics/pokemon/rhydon/back.png b/graphics/pokemon/gen_1/rhydon/back.png
similarity index 100%
rename from graphics/pokemon/rhydon/back.png
rename to graphics/pokemon/gen_1/rhydon/back.png
diff --git a/graphics/pokemon/rhydon/backf.png b/graphics/pokemon/gen_1/rhydon/backf.png
similarity index 100%
rename from graphics/pokemon/rhydon/backf.png
rename to graphics/pokemon/gen_1/rhydon/backf.png
diff --git a/graphics/pokemon/rhydon/footprint.png b/graphics/pokemon/gen_1/rhydon/footprint.png
similarity index 100%
rename from graphics/pokemon/rhydon/footprint.png
rename to graphics/pokemon/gen_1/rhydon/footprint.png
diff --git a/graphics/pokemon/rhydon/icon.png b/graphics/pokemon/gen_1/rhydon/icon.png
similarity index 100%
rename from graphics/pokemon/rhydon/icon.png
rename to graphics/pokemon/gen_1/rhydon/icon.png
diff --git a/graphics/pokemon/rhydon/normal.pal b/graphics/pokemon/gen_1/rhydon/normal.pal
similarity index 100%
rename from graphics/pokemon/rhydon/normal.pal
rename to graphics/pokemon/gen_1/rhydon/normal.pal
diff --git a/graphics/pokemon/rhydon/shiny.pal b/graphics/pokemon/gen_1/rhydon/shiny.pal
similarity index 100%
rename from graphics/pokemon/rhydon/shiny.pal
rename to graphics/pokemon/gen_1/rhydon/shiny.pal
diff --git a/graphics/pokemon/rhyhorn/anim_front.png b/graphics/pokemon/gen_1/rhyhorn/anim_front.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/anim_front.png
rename to graphics/pokemon/gen_1/rhyhorn/anim_front.png
diff --git a/graphics/pokemon/rhyhorn/anim_frontf.png b/graphics/pokemon/gen_1/rhyhorn/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/anim_frontf.png
rename to graphics/pokemon/gen_1/rhyhorn/anim_frontf.png
diff --git a/graphics/pokemon/rhyhorn/back.png b/graphics/pokemon/gen_1/rhyhorn/back.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/back.png
rename to graphics/pokemon/gen_1/rhyhorn/back.png
diff --git a/graphics/pokemon/rhyhorn/backf.png b/graphics/pokemon/gen_1/rhyhorn/backf.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/backf.png
rename to graphics/pokemon/gen_1/rhyhorn/backf.png
diff --git a/graphics/pokemon/rhyhorn/footprint.png b/graphics/pokemon/gen_1/rhyhorn/footprint.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/footprint.png
rename to graphics/pokemon/gen_1/rhyhorn/footprint.png
diff --git a/graphics/pokemon/rhyhorn/icon.png b/graphics/pokemon/gen_1/rhyhorn/icon.png
similarity index 100%
rename from graphics/pokemon/rhyhorn/icon.png
rename to graphics/pokemon/gen_1/rhyhorn/icon.png
diff --git a/graphics/pokemon/rhyhorn/normal.pal b/graphics/pokemon/gen_1/rhyhorn/normal.pal
similarity index 100%
rename from graphics/pokemon/rhyhorn/normal.pal
rename to graphics/pokemon/gen_1/rhyhorn/normal.pal
diff --git a/graphics/pokemon/rhyhorn/shiny.pal b/graphics/pokemon/gen_1/rhyhorn/shiny.pal
similarity index 100%
rename from graphics/pokemon/rhyhorn/shiny.pal
rename to graphics/pokemon/gen_1/rhyhorn/shiny.pal
diff --git a/graphics/pokemon/sandshrew/alolan/back.png b/graphics/pokemon/gen_1/sandshrew/alolan/back.png
similarity index 100%
rename from graphics/pokemon/sandshrew/alolan/back.png
rename to graphics/pokemon/gen_1/sandshrew/alolan/back.png
diff --git a/graphics/pokemon/sandshrew/alolan/front.png b/graphics/pokemon/gen_1/sandshrew/alolan/front.png
similarity index 100%
rename from graphics/pokemon/sandshrew/alolan/front.png
rename to graphics/pokemon/gen_1/sandshrew/alolan/front.png
diff --git a/graphics/pokemon/sandshrew/alolan/icon.png b/graphics/pokemon/gen_1/sandshrew/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/sandshrew/alolan/icon.png
rename to graphics/pokemon/gen_1/sandshrew/alolan/icon.png
diff --git a/graphics/pokemon/sandshrew/alolan/normal.pal b/graphics/pokemon/gen_1/sandshrew/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/sandshrew/alolan/normal.pal
rename to graphics/pokemon/gen_1/sandshrew/alolan/normal.pal
diff --git a/graphics/pokemon/sandshrew/alolan/shiny.pal b/graphics/pokemon/gen_1/sandshrew/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandshrew/alolan/shiny.pal
rename to graphics/pokemon/gen_1/sandshrew/alolan/shiny.pal
diff --git a/graphics/pokemon/sandshrew/anim_front.png b/graphics/pokemon/gen_1/sandshrew/anim_front.png
similarity index 100%
rename from graphics/pokemon/sandshrew/anim_front.png
rename to graphics/pokemon/gen_1/sandshrew/anim_front.png
diff --git a/graphics/pokemon/sandshrew/back.png b/graphics/pokemon/gen_1/sandshrew/back.png
similarity index 100%
rename from graphics/pokemon/sandshrew/back.png
rename to graphics/pokemon/gen_1/sandshrew/back.png
diff --git a/graphics/pokemon/sandshrew/footprint.png b/graphics/pokemon/gen_1/sandshrew/footprint.png
similarity index 100%
rename from graphics/pokemon/sandshrew/footprint.png
rename to graphics/pokemon/gen_1/sandshrew/footprint.png
diff --git a/graphics/pokemon/sandshrew/icon.png b/graphics/pokemon/gen_1/sandshrew/icon.png
similarity index 100%
rename from graphics/pokemon/sandshrew/icon.png
rename to graphics/pokemon/gen_1/sandshrew/icon.png
diff --git a/graphics/pokemon/sandshrew/normal.pal b/graphics/pokemon/gen_1/sandshrew/normal.pal
similarity index 100%
rename from graphics/pokemon/sandshrew/normal.pal
rename to graphics/pokemon/gen_1/sandshrew/normal.pal
diff --git a/graphics/pokemon/sandshrew/shiny.pal b/graphics/pokemon/gen_1/sandshrew/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandshrew/shiny.pal
rename to graphics/pokemon/gen_1/sandshrew/shiny.pal
diff --git a/graphics/pokemon/sandslash/alolan/back.png b/graphics/pokemon/gen_1/sandslash/alolan/back.png
similarity index 100%
rename from graphics/pokemon/sandslash/alolan/back.png
rename to graphics/pokemon/gen_1/sandslash/alolan/back.png
diff --git a/graphics/pokemon/sandslash/alolan/front.png b/graphics/pokemon/gen_1/sandslash/alolan/front.png
similarity index 100%
rename from graphics/pokemon/sandslash/alolan/front.png
rename to graphics/pokemon/gen_1/sandslash/alolan/front.png
diff --git a/graphics/pokemon/sandslash/alolan/icon.png b/graphics/pokemon/gen_1/sandslash/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/sandslash/alolan/icon.png
rename to graphics/pokemon/gen_1/sandslash/alolan/icon.png
diff --git a/graphics/pokemon/sandslash/alolan/normal.pal b/graphics/pokemon/gen_1/sandslash/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/sandslash/alolan/normal.pal
rename to graphics/pokemon/gen_1/sandslash/alolan/normal.pal
diff --git a/graphics/pokemon/sandslash/alolan/shiny.pal b/graphics/pokemon/gen_1/sandslash/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandslash/alolan/shiny.pal
rename to graphics/pokemon/gen_1/sandslash/alolan/shiny.pal
diff --git a/graphics/pokemon/sandslash/anim_front.png b/graphics/pokemon/gen_1/sandslash/anim_front.png
similarity index 100%
rename from graphics/pokemon/sandslash/anim_front.png
rename to graphics/pokemon/gen_1/sandslash/anim_front.png
diff --git a/graphics/pokemon/sandslash/back.png b/graphics/pokemon/gen_1/sandslash/back.png
similarity index 100%
rename from graphics/pokemon/sandslash/back.png
rename to graphics/pokemon/gen_1/sandslash/back.png
diff --git a/graphics/pokemon/sandslash/footprint.png b/graphics/pokemon/gen_1/sandslash/footprint.png
similarity index 100%
rename from graphics/pokemon/sandslash/footprint.png
rename to graphics/pokemon/gen_1/sandslash/footprint.png
diff --git a/graphics/pokemon/sandslash/icon.png b/graphics/pokemon/gen_1/sandslash/icon.png
similarity index 100%
rename from graphics/pokemon/sandslash/icon.png
rename to graphics/pokemon/gen_1/sandslash/icon.png
diff --git a/graphics/pokemon/sandslash/normal.pal b/graphics/pokemon/gen_1/sandslash/normal.pal
similarity index 100%
rename from graphics/pokemon/sandslash/normal.pal
rename to graphics/pokemon/gen_1/sandslash/normal.pal
diff --git a/graphics/pokemon/sandslash/shiny.pal b/graphics/pokemon/gen_1/sandslash/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandslash/shiny.pal
rename to graphics/pokemon/gen_1/sandslash/shiny.pal
diff --git a/graphics/pokemon/scyther/anim_front.png b/graphics/pokemon/gen_1/scyther/anim_front.png
similarity index 100%
rename from graphics/pokemon/scyther/anim_front.png
rename to graphics/pokemon/gen_1/scyther/anim_front.png
diff --git a/graphics/pokemon/scyther/anim_frontf.png b/graphics/pokemon/gen_1/scyther/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/scyther/anim_frontf.png
rename to graphics/pokemon/gen_1/scyther/anim_frontf.png
diff --git a/graphics/pokemon/scyther/back.png b/graphics/pokemon/gen_1/scyther/back.png
similarity index 100%
rename from graphics/pokemon/scyther/back.png
rename to graphics/pokemon/gen_1/scyther/back.png
diff --git a/graphics/pokemon/scyther/footprint.png b/graphics/pokemon/gen_1/scyther/footprint.png
similarity index 100%
rename from graphics/pokemon/scyther/footprint.png
rename to graphics/pokemon/gen_1/scyther/footprint.png
diff --git a/graphics/pokemon/scyther/icon.png b/graphics/pokemon/gen_1/scyther/icon.png
similarity index 100%
rename from graphics/pokemon/scyther/icon.png
rename to graphics/pokemon/gen_1/scyther/icon.png
diff --git a/graphics/pokemon/scyther/normal.pal b/graphics/pokemon/gen_1/scyther/normal.pal
similarity index 100%
rename from graphics/pokemon/scyther/normal.pal
rename to graphics/pokemon/gen_1/scyther/normal.pal
diff --git a/graphics/pokemon/scyther/shiny.pal b/graphics/pokemon/gen_1/scyther/shiny.pal
similarity index 100%
rename from graphics/pokemon/scyther/shiny.pal
rename to graphics/pokemon/gen_1/scyther/shiny.pal
diff --git a/graphics/pokemon/seadra/anim_front.png b/graphics/pokemon/gen_1/seadra/anim_front.png
similarity index 100%
rename from graphics/pokemon/seadra/anim_front.png
rename to graphics/pokemon/gen_1/seadra/anim_front.png
diff --git a/graphics/pokemon/seadra/back.png b/graphics/pokemon/gen_1/seadra/back.png
similarity index 100%
rename from graphics/pokemon/seadra/back.png
rename to graphics/pokemon/gen_1/seadra/back.png
diff --git a/graphics/pokemon/chimecho/footprint.png b/graphics/pokemon/gen_1/seadra/footprint.png
similarity index 100%
rename from graphics/pokemon/chimecho/footprint.png
rename to graphics/pokemon/gen_1/seadra/footprint.png
diff --git a/graphics/pokemon/seadra/icon.png b/graphics/pokemon/gen_1/seadra/icon.png
similarity index 100%
rename from graphics/pokemon/seadra/icon.png
rename to graphics/pokemon/gen_1/seadra/icon.png
diff --git a/graphics/pokemon/seadra/normal.pal b/graphics/pokemon/gen_1/seadra/normal.pal
similarity index 100%
rename from graphics/pokemon/seadra/normal.pal
rename to graphics/pokemon/gen_1/seadra/normal.pal
diff --git a/graphics/pokemon/seadra/shiny.pal b/graphics/pokemon/gen_1/seadra/shiny.pal
similarity index 100%
rename from graphics/pokemon/seadra/shiny.pal
rename to graphics/pokemon/gen_1/seadra/shiny.pal
diff --git a/graphics/pokemon/seaking/anim_front.png b/graphics/pokemon/gen_1/seaking/anim_front.png
similarity index 100%
rename from graphics/pokemon/seaking/anim_front.png
rename to graphics/pokemon/gen_1/seaking/anim_front.png
diff --git a/graphics/pokemon/seaking/anim_frontf.png b/graphics/pokemon/gen_1/seaking/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/seaking/anim_frontf.png
rename to graphics/pokemon/gen_1/seaking/anim_frontf.png
diff --git a/graphics/pokemon/seaking/back.png b/graphics/pokemon/gen_1/seaking/back.png
similarity index 100%
rename from graphics/pokemon/seaking/back.png
rename to graphics/pokemon/gen_1/seaking/back.png
diff --git a/graphics/pokemon/seaking/backf.png b/graphics/pokemon/gen_1/seaking/backf.png
similarity index 100%
rename from graphics/pokemon/seaking/backf.png
rename to graphics/pokemon/gen_1/seaking/backf.png
diff --git a/graphics/pokemon/chinchou/footprint.png b/graphics/pokemon/gen_1/seaking/footprint.png
similarity index 100%
rename from graphics/pokemon/chinchou/footprint.png
rename to graphics/pokemon/gen_1/seaking/footprint.png
diff --git a/graphics/pokemon/seaking/icon.png b/graphics/pokemon/gen_1/seaking/icon.png
similarity index 100%
rename from graphics/pokemon/seaking/icon.png
rename to graphics/pokemon/gen_1/seaking/icon.png
diff --git a/graphics/pokemon/seaking/normal.pal b/graphics/pokemon/gen_1/seaking/normal.pal
similarity index 100%
rename from graphics/pokemon/seaking/normal.pal
rename to graphics/pokemon/gen_1/seaking/normal.pal
diff --git a/graphics/pokemon/seaking/shiny.pal b/graphics/pokemon/gen_1/seaking/shiny.pal
similarity index 100%
rename from graphics/pokemon/seaking/shiny.pal
rename to graphics/pokemon/gen_1/seaking/shiny.pal
diff --git a/graphics/pokemon/seel/anim_front.png b/graphics/pokemon/gen_1/seel/anim_front.png
similarity index 100%
rename from graphics/pokemon/seel/anim_front.png
rename to graphics/pokemon/gen_1/seel/anim_front.png
diff --git a/graphics/pokemon/seel/back.png b/graphics/pokemon/gen_1/seel/back.png
similarity index 100%
rename from graphics/pokemon/seel/back.png
rename to graphics/pokemon/gen_1/seel/back.png
diff --git a/graphics/pokemon/clamperl/footprint.png b/graphics/pokemon/gen_1/seel/footprint.png
similarity index 100%
rename from graphics/pokemon/clamperl/footprint.png
rename to graphics/pokemon/gen_1/seel/footprint.png
diff --git a/graphics/pokemon/seel/icon.png b/graphics/pokemon/gen_1/seel/icon.png
similarity index 100%
rename from graphics/pokemon/seel/icon.png
rename to graphics/pokemon/gen_1/seel/icon.png
diff --git a/graphics/pokemon/seel/normal.pal b/graphics/pokemon/gen_1/seel/normal.pal
similarity index 100%
rename from graphics/pokemon/seel/normal.pal
rename to graphics/pokemon/gen_1/seel/normal.pal
diff --git a/graphics/pokemon/seel/shiny.pal b/graphics/pokemon/gen_1/seel/shiny.pal
similarity index 100%
rename from graphics/pokemon/seel/shiny.pal
rename to graphics/pokemon/gen_1/seel/shiny.pal
diff --git a/graphics/pokemon/shellder/anim_front.png b/graphics/pokemon/gen_1/shellder/anim_front.png
similarity index 100%
rename from graphics/pokemon/shellder/anim_front.png
rename to graphics/pokemon/gen_1/shellder/anim_front.png
diff --git a/graphics/pokemon/shellder/back.png b/graphics/pokemon/gen_1/shellder/back.png
similarity index 100%
rename from graphics/pokemon/shellder/back.png
rename to graphics/pokemon/gen_1/shellder/back.png
diff --git a/graphics/pokemon/clawitzer/footprint.png b/graphics/pokemon/gen_1/shellder/footprint.png
similarity index 100%
rename from graphics/pokemon/clawitzer/footprint.png
rename to graphics/pokemon/gen_1/shellder/footprint.png
diff --git a/graphics/pokemon/shellder/icon.png b/graphics/pokemon/gen_1/shellder/icon.png
similarity index 100%
rename from graphics/pokemon/shellder/icon.png
rename to graphics/pokemon/gen_1/shellder/icon.png
diff --git a/graphics/pokemon/shellder/normal.pal b/graphics/pokemon/gen_1/shellder/normal.pal
similarity index 100%
rename from graphics/pokemon/shellder/normal.pal
rename to graphics/pokemon/gen_1/shellder/normal.pal
diff --git a/graphics/pokemon/shellder/shiny.pal b/graphics/pokemon/gen_1/shellder/shiny.pal
similarity index 100%
rename from graphics/pokemon/shellder/shiny.pal
rename to graphics/pokemon/gen_1/shellder/shiny.pal
diff --git a/graphics/pokemon/slowbro/anim_front.png b/graphics/pokemon/gen_1/slowbro/anim_front.png
similarity index 100%
rename from graphics/pokemon/slowbro/anim_front.png
rename to graphics/pokemon/gen_1/slowbro/anim_front.png
diff --git a/graphics/pokemon/slowbro/back.png b/graphics/pokemon/gen_1/slowbro/back.png
similarity index 100%
rename from graphics/pokemon/slowbro/back.png
rename to graphics/pokemon/gen_1/slowbro/back.png
diff --git a/graphics/pokemon/slowbro/footprint.png b/graphics/pokemon/gen_1/slowbro/footprint.png
similarity index 100%
rename from graphics/pokemon/slowbro/footprint.png
rename to graphics/pokemon/gen_1/slowbro/footprint.png
diff --git a/graphics/pokemon/slowbro/galarian/back.png b/graphics/pokemon/gen_1/slowbro/galarian/back.png
similarity index 100%
rename from graphics/pokemon/slowbro/galarian/back.png
rename to graphics/pokemon/gen_1/slowbro/galarian/back.png
diff --git a/graphics/pokemon/slowbro/galarian/front.png b/graphics/pokemon/gen_1/slowbro/galarian/front.png
similarity index 100%
rename from graphics/pokemon/slowbro/galarian/front.png
rename to graphics/pokemon/gen_1/slowbro/galarian/front.png
diff --git a/graphics/pokemon/slowbro/galarian/icon.png b/graphics/pokemon/gen_1/slowbro/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/slowbro/galarian/icon.png
rename to graphics/pokemon/gen_1/slowbro/galarian/icon.png
diff --git a/graphics/pokemon/slowbro/galarian/normal.pal b/graphics/pokemon/gen_1/slowbro/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/slowbro/galarian/normal.pal
rename to graphics/pokemon/gen_1/slowbro/galarian/normal.pal
diff --git a/graphics/pokemon/slowbro/galarian/shiny.pal b/graphics/pokemon/gen_1/slowbro/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowbro/galarian/shiny.pal
rename to graphics/pokemon/gen_1/slowbro/galarian/shiny.pal
diff --git a/graphics/pokemon/slowbro/icon.png b/graphics/pokemon/gen_1/slowbro/icon.png
similarity index 100%
rename from graphics/pokemon/slowbro/icon.png
rename to graphics/pokemon/gen_1/slowbro/icon.png
diff --git a/graphics/pokemon/slowbro/mega/back.png b/graphics/pokemon/gen_1/slowbro/mega/back.png
similarity index 100%
rename from graphics/pokemon/slowbro/mega/back.png
rename to graphics/pokemon/gen_1/slowbro/mega/back.png
diff --git a/graphics/pokemon/slowbro/mega/front.png b/graphics/pokemon/gen_1/slowbro/mega/front.png
similarity index 100%
rename from graphics/pokemon/slowbro/mega/front.png
rename to graphics/pokemon/gen_1/slowbro/mega/front.png
diff --git a/graphics/pokemon/slowbro/mega/icon.png b/graphics/pokemon/gen_1/slowbro/mega/icon.png
similarity index 100%
rename from graphics/pokemon/slowbro/mega/icon.png
rename to graphics/pokemon/gen_1/slowbro/mega/icon.png
diff --git a/graphics/pokemon/slowbro/mega/normal.pal b/graphics/pokemon/gen_1/slowbro/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/slowbro/mega/normal.pal
rename to graphics/pokemon/gen_1/slowbro/mega/normal.pal
diff --git a/graphics/pokemon/slowbro/mega/shiny.pal b/graphics/pokemon/gen_1/slowbro/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowbro/mega/shiny.pal
rename to graphics/pokemon/gen_1/slowbro/mega/shiny.pal
diff --git a/graphics/pokemon/slowbro/normal.pal b/graphics/pokemon/gen_1/slowbro/normal.pal
similarity index 100%
rename from graphics/pokemon/slowbro/normal.pal
rename to graphics/pokemon/gen_1/slowbro/normal.pal
diff --git a/graphics/pokemon/slowbro/shiny.pal b/graphics/pokemon/gen_1/slowbro/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowbro/shiny.pal
rename to graphics/pokemon/gen_1/slowbro/shiny.pal
diff --git a/graphics/pokemon/slowpoke/anim_front.png b/graphics/pokemon/gen_1/slowpoke/anim_front.png
similarity index 100%
rename from graphics/pokemon/slowpoke/anim_front.png
rename to graphics/pokemon/gen_1/slowpoke/anim_front.png
diff --git a/graphics/pokemon/slowpoke/back.png b/graphics/pokemon/gen_1/slowpoke/back.png
similarity index 100%
rename from graphics/pokemon/slowpoke/back.png
rename to graphics/pokemon/gen_1/slowpoke/back.png
diff --git a/graphics/pokemon/slowpoke/footprint.png b/graphics/pokemon/gen_1/slowpoke/footprint.png
similarity index 100%
rename from graphics/pokemon/slowpoke/footprint.png
rename to graphics/pokemon/gen_1/slowpoke/footprint.png
diff --git a/graphics/pokemon/slowpoke/galarian/back.png b/graphics/pokemon/gen_1/slowpoke/galarian/back.png
similarity index 100%
rename from graphics/pokemon/slowpoke/galarian/back.png
rename to graphics/pokemon/gen_1/slowpoke/galarian/back.png
diff --git a/graphics/pokemon/slowpoke/galarian/front.png b/graphics/pokemon/gen_1/slowpoke/galarian/front.png
similarity index 100%
rename from graphics/pokemon/slowpoke/galarian/front.png
rename to graphics/pokemon/gen_1/slowpoke/galarian/front.png
diff --git a/graphics/pokemon/slowpoke/galarian/icon.png b/graphics/pokemon/gen_1/slowpoke/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/slowpoke/galarian/icon.png
rename to graphics/pokemon/gen_1/slowpoke/galarian/icon.png
diff --git a/graphics/pokemon/slowpoke/galarian/normal.pal b/graphics/pokemon/gen_1/slowpoke/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/slowpoke/galarian/normal.pal
rename to graphics/pokemon/gen_1/slowpoke/galarian/normal.pal
diff --git a/graphics/pokemon/slowpoke/galarian/shiny.pal b/graphics/pokemon/gen_1/slowpoke/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowpoke/galarian/shiny.pal
rename to graphics/pokemon/gen_1/slowpoke/galarian/shiny.pal
diff --git a/graphics/pokemon/slowpoke/icon.png b/graphics/pokemon/gen_1/slowpoke/icon.png
similarity index 100%
rename from graphics/pokemon/slowpoke/icon.png
rename to graphics/pokemon/gen_1/slowpoke/icon.png
diff --git a/graphics/pokemon/slowpoke/normal.pal b/graphics/pokemon/gen_1/slowpoke/normal.pal
similarity index 100%
rename from graphics/pokemon/slowpoke/normal.pal
rename to graphics/pokemon/gen_1/slowpoke/normal.pal
diff --git a/graphics/pokemon/slowpoke/shiny.pal b/graphics/pokemon/gen_1/slowpoke/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowpoke/shiny.pal
rename to graphics/pokemon/gen_1/slowpoke/shiny.pal
diff --git a/graphics/pokemon/snorlax/anim_front.png b/graphics/pokemon/gen_1/snorlax/anim_front.png
similarity index 100%
rename from graphics/pokemon/snorlax/anim_front.png
rename to graphics/pokemon/gen_1/snorlax/anim_front.png
diff --git a/graphics/pokemon/snorlax/back.png b/graphics/pokemon/gen_1/snorlax/back.png
similarity index 100%
rename from graphics/pokemon/snorlax/back.png
rename to graphics/pokemon/gen_1/snorlax/back.png
diff --git a/graphics/pokemon/snorlax/footprint.png b/graphics/pokemon/gen_1/snorlax/footprint.png
similarity index 100%
rename from graphics/pokemon/snorlax/footprint.png
rename to graphics/pokemon/gen_1/snorlax/footprint.png
diff --git a/graphics/pokemon/snorlax/gigantamax/back.png b/graphics/pokemon/gen_1/snorlax/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/snorlax/gigantamax/back.png
rename to graphics/pokemon/gen_1/snorlax/gigantamax/back.png
diff --git a/graphics/pokemon/snorlax/gigantamax/front.png b/graphics/pokemon/gen_1/snorlax/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/snorlax/gigantamax/front.png
rename to graphics/pokemon/gen_1/snorlax/gigantamax/front.png
diff --git a/graphics/pokemon/snorlax/gigantamax/icon.png b/graphics/pokemon/gen_1/snorlax/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/snorlax/gigantamax/icon.png
rename to graphics/pokemon/gen_1/snorlax/gigantamax/icon.png
diff --git a/graphics/pokemon/snorlax/gigantamax/normal.pal b/graphics/pokemon/gen_1/snorlax/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/snorlax/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/snorlax/gigantamax/normal.pal
diff --git a/graphics/pokemon/snorlax/gigantamax/shiny.pal b/graphics/pokemon/gen_1/snorlax/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/snorlax/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/snorlax/gigantamax/shiny.pal
diff --git a/graphics/pokemon/snorlax/icon.png b/graphics/pokemon/gen_1/snorlax/icon.png
similarity index 100%
rename from graphics/pokemon/snorlax/icon.png
rename to graphics/pokemon/gen_1/snorlax/icon.png
diff --git a/graphics/pokemon/snorlax/normal.pal b/graphics/pokemon/gen_1/snorlax/normal.pal
similarity index 100%
rename from graphics/pokemon/snorlax/normal.pal
rename to graphics/pokemon/gen_1/snorlax/normal.pal
diff --git a/graphics/pokemon/snorlax/shiny.pal b/graphics/pokemon/gen_1/snorlax/shiny.pal
similarity index 100%
rename from graphics/pokemon/snorlax/shiny.pal
rename to graphics/pokemon/gen_1/snorlax/shiny.pal
diff --git a/graphics/pokemon/spearow/anim_front.png b/graphics/pokemon/gen_1/spearow/anim_front.png
similarity index 100%
rename from graphics/pokemon/spearow/anim_front.png
rename to graphics/pokemon/gen_1/spearow/anim_front.png
diff --git a/graphics/pokemon/spearow/back.png b/graphics/pokemon/gen_1/spearow/back.png
similarity index 100%
rename from graphics/pokemon/spearow/back.png
rename to graphics/pokemon/gen_1/spearow/back.png
diff --git a/graphics/pokemon/rookidee/footprint.png b/graphics/pokemon/gen_1/spearow/footprint.png
similarity index 100%
rename from graphics/pokemon/rookidee/footprint.png
rename to graphics/pokemon/gen_1/spearow/footprint.png
diff --git a/graphics/pokemon/spearow/icon.png b/graphics/pokemon/gen_1/spearow/icon.png
similarity index 100%
rename from graphics/pokemon/spearow/icon.png
rename to graphics/pokemon/gen_1/spearow/icon.png
diff --git a/graphics/pokemon/spearow/normal.pal b/graphics/pokemon/gen_1/spearow/normal.pal
similarity index 100%
rename from graphics/pokemon/spearow/normal.pal
rename to graphics/pokemon/gen_1/spearow/normal.pal
diff --git a/graphics/pokemon/spearow/shiny.pal b/graphics/pokemon/gen_1/spearow/shiny.pal
similarity index 100%
rename from graphics/pokemon/spearow/shiny.pal
rename to graphics/pokemon/gen_1/spearow/shiny.pal
diff --git a/graphics/pokemon/squirtle/anim_front.png b/graphics/pokemon/gen_1/squirtle/anim_front.png
similarity index 100%
rename from graphics/pokemon/squirtle/anim_front.png
rename to graphics/pokemon/gen_1/squirtle/anim_front.png
diff --git a/graphics/pokemon/squirtle/back.png b/graphics/pokemon/gen_1/squirtle/back.png
similarity index 100%
rename from graphics/pokemon/squirtle/back.png
rename to graphics/pokemon/gen_1/squirtle/back.png
diff --git a/graphics/pokemon/squirtle/footprint.png b/graphics/pokemon/gen_1/squirtle/footprint.png
similarity index 100%
rename from graphics/pokemon/squirtle/footprint.png
rename to graphics/pokemon/gen_1/squirtle/footprint.png
diff --git a/graphics/pokemon/squirtle/icon.png b/graphics/pokemon/gen_1/squirtle/icon.png
similarity index 100%
rename from graphics/pokemon/squirtle/icon.png
rename to graphics/pokemon/gen_1/squirtle/icon.png
diff --git a/graphics/pokemon/squirtle/normal.pal b/graphics/pokemon/gen_1/squirtle/normal.pal
similarity index 100%
rename from graphics/pokemon/squirtle/normal.pal
rename to graphics/pokemon/gen_1/squirtle/normal.pal
diff --git a/graphics/pokemon/squirtle/shiny.pal b/graphics/pokemon/gen_1/squirtle/shiny.pal
similarity index 100%
rename from graphics/pokemon/squirtle/shiny.pal
rename to graphics/pokemon/gen_1/squirtle/shiny.pal
diff --git a/graphics/pokemon/starmie/anim_front.png b/graphics/pokemon/gen_1/starmie/anim_front.png
similarity index 100%
rename from graphics/pokemon/starmie/anim_front.png
rename to graphics/pokemon/gen_1/starmie/anim_front.png
diff --git a/graphics/pokemon/starmie/back.png b/graphics/pokemon/gen_1/starmie/back.png
similarity index 100%
rename from graphics/pokemon/starmie/back.png
rename to graphics/pokemon/gen_1/starmie/back.png
diff --git a/graphics/pokemon/aromatisse/footprint.png b/graphics/pokemon/gen_1/starmie/footprint.png
similarity index 100%
rename from graphics/pokemon/aromatisse/footprint.png
rename to graphics/pokemon/gen_1/starmie/footprint.png
diff --git a/graphics/pokemon/starmie/icon.png b/graphics/pokemon/gen_1/starmie/icon.png
similarity index 100%
rename from graphics/pokemon/starmie/icon.png
rename to graphics/pokemon/gen_1/starmie/icon.png
diff --git a/graphics/pokemon/starmie/normal.pal b/graphics/pokemon/gen_1/starmie/normal.pal
similarity index 100%
rename from graphics/pokemon/starmie/normal.pal
rename to graphics/pokemon/gen_1/starmie/normal.pal
diff --git a/graphics/pokemon/starmie/shiny.pal b/graphics/pokemon/gen_1/starmie/shiny.pal
similarity index 100%
rename from graphics/pokemon/starmie/shiny.pal
rename to graphics/pokemon/gen_1/starmie/shiny.pal
diff --git a/graphics/pokemon/staryu/anim_front.png b/graphics/pokemon/gen_1/staryu/anim_front.png
similarity index 100%
rename from graphics/pokemon/staryu/anim_front.png
rename to graphics/pokemon/gen_1/staryu/anim_front.png
diff --git a/graphics/pokemon/staryu/back.png b/graphics/pokemon/gen_1/staryu/back.png
similarity index 100%
rename from graphics/pokemon/staryu/back.png
rename to graphics/pokemon/gen_1/staryu/back.png
diff --git a/graphics/pokemon/blipbug/footprint.png b/graphics/pokemon/gen_1/staryu/footprint.png
similarity index 100%
rename from graphics/pokemon/blipbug/footprint.png
rename to graphics/pokemon/gen_1/staryu/footprint.png
diff --git a/graphics/pokemon/staryu/icon.png b/graphics/pokemon/gen_1/staryu/icon.png
similarity index 100%
rename from graphics/pokemon/staryu/icon.png
rename to graphics/pokemon/gen_1/staryu/icon.png
diff --git a/graphics/pokemon/staryu/normal.pal b/graphics/pokemon/gen_1/staryu/normal.pal
similarity index 100%
rename from graphics/pokemon/staryu/normal.pal
rename to graphics/pokemon/gen_1/staryu/normal.pal
diff --git a/graphics/pokemon/staryu/shiny.pal b/graphics/pokemon/gen_1/staryu/shiny.pal
similarity index 100%
rename from graphics/pokemon/staryu/shiny.pal
rename to graphics/pokemon/gen_1/staryu/shiny.pal
diff --git a/graphics/pokemon/tangela/anim_front.png b/graphics/pokemon/gen_1/tangela/anim_front.png
similarity index 100%
rename from graphics/pokemon/tangela/anim_front.png
rename to graphics/pokemon/gen_1/tangela/anim_front.png
diff --git a/graphics/pokemon/tangela/back.png b/graphics/pokemon/gen_1/tangela/back.png
similarity index 100%
rename from graphics/pokemon/tangela/back.png
rename to graphics/pokemon/gen_1/tangela/back.png
diff --git a/graphics/pokemon/tangela/footprint.png b/graphics/pokemon/gen_1/tangela/footprint.png
similarity index 100%
rename from graphics/pokemon/tangela/footprint.png
rename to graphics/pokemon/gen_1/tangela/footprint.png
diff --git a/graphics/pokemon/tangela/icon.png b/graphics/pokemon/gen_1/tangela/icon.png
similarity index 100%
rename from graphics/pokemon/tangela/icon.png
rename to graphics/pokemon/gen_1/tangela/icon.png
diff --git a/graphics/pokemon/tangela/normal.pal b/graphics/pokemon/gen_1/tangela/normal.pal
similarity index 100%
rename from graphics/pokemon/tangela/normal.pal
rename to graphics/pokemon/gen_1/tangela/normal.pal
diff --git a/graphics/pokemon/tangela/shiny.pal b/graphics/pokemon/gen_1/tangela/shiny.pal
similarity index 100%
rename from graphics/pokemon/tangela/shiny.pal
rename to graphics/pokemon/gen_1/tangela/shiny.pal
diff --git a/graphics/pokemon/tauros/anim_front.png b/graphics/pokemon/gen_1/tauros/anim_front.png
similarity index 100%
rename from graphics/pokemon/tauros/anim_front.png
rename to graphics/pokemon/gen_1/tauros/anim_front.png
diff --git a/graphics/pokemon/tauros/back.png b/graphics/pokemon/gen_1/tauros/back.png
similarity index 100%
rename from graphics/pokemon/tauros/back.png
rename to graphics/pokemon/gen_1/tauros/back.png
diff --git a/graphics/pokemon/tauros/footprint.png b/graphics/pokemon/gen_1/tauros/footprint.png
similarity index 100%
rename from graphics/pokemon/tauros/footprint.png
rename to graphics/pokemon/gen_1/tauros/footprint.png
diff --git a/graphics/pokemon/tauros/icon.png b/graphics/pokemon/gen_1/tauros/icon.png
similarity index 100%
rename from graphics/pokemon/tauros/icon.png
rename to graphics/pokemon/gen_1/tauros/icon.png
diff --git a/graphics/pokemon/tauros/normal.pal b/graphics/pokemon/gen_1/tauros/normal.pal
similarity index 100%
rename from graphics/pokemon/tauros/normal.pal
rename to graphics/pokemon/gen_1/tauros/normal.pal
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_aqua_breed/back.png
rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.png
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_aqua_breed/front.png
rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.png
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_aqua_breed/icon.png
rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.png
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_aqua_breed/normal.pal
rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.pal
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal
rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.pal
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/back.png
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.png
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/front.ase b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.ase
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/front.ase
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.ase
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/front.png
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.png
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/icon.png
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.png
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/normal.pal
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.pal
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal
rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.pal
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_combat_breed/back.png
rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.png
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_combat_breed/front.png
rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.png
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.png
similarity index 100%
rename from graphics/pokemon/tauros/paldean_combat_breed/icon.png
rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.png
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_combat_breed/normal.pal
rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.pal
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.pal
similarity index 100%
rename from graphics/pokemon/tauros/paldean_combat_breed/shiny.pal
rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.pal
diff --git a/graphics/pokemon/tauros/shiny.pal b/graphics/pokemon/gen_1/tauros/shiny.pal
similarity index 100%
rename from graphics/pokemon/tauros/shiny.pal
rename to graphics/pokemon/gen_1/tauros/shiny.pal
diff --git a/graphics/pokemon/tentacool/anim_front.png b/graphics/pokemon/gen_1/tentacool/anim_front.png
similarity index 100%
rename from graphics/pokemon/tentacool/anim_front.png
rename to graphics/pokemon/gen_1/tentacool/anim_front.png
diff --git a/graphics/pokemon/tentacool/back.png b/graphics/pokemon/gen_1/tentacool/back.png
similarity index 100%
rename from graphics/pokemon/tentacool/back.png
rename to graphics/pokemon/gen_1/tentacool/back.png
diff --git a/graphics/pokemon/cloyster/footprint.png b/graphics/pokemon/gen_1/tentacool/footprint.png
similarity index 100%
rename from graphics/pokemon/cloyster/footprint.png
rename to graphics/pokemon/gen_1/tentacool/footprint.png
diff --git a/graphics/pokemon/tentacool/icon.png b/graphics/pokemon/gen_1/tentacool/icon.png
similarity index 100%
rename from graphics/pokemon/tentacool/icon.png
rename to graphics/pokemon/gen_1/tentacool/icon.png
diff --git a/graphics/pokemon/tentacool/normal.pal b/graphics/pokemon/gen_1/tentacool/normal.pal
similarity index 100%
rename from graphics/pokemon/tentacool/normal.pal
rename to graphics/pokemon/gen_1/tentacool/normal.pal
diff --git a/graphics/pokemon/tentacool/shiny.pal b/graphics/pokemon/gen_1/tentacool/shiny.pal
similarity index 100%
rename from graphics/pokemon/tentacool/shiny.pal
rename to graphics/pokemon/gen_1/tentacool/shiny.pal
diff --git a/graphics/pokemon/tentacruel/anim_front.png b/graphics/pokemon/gen_1/tentacruel/anim_front.png
similarity index 100%
rename from graphics/pokemon/tentacruel/anim_front.png
rename to graphics/pokemon/gen_1/tentacruel/anim_front.png
diff --git a/graphics/pokemon/tentacruel/back.png b/graphics/pokemon/gen_1/tentacruel/back.png
similarity index 100%
rename from graphics/pokemon/tentacruel/back.png
rename to graphics/pokemon/gen_1/tentacruel/back.png
diff --git a/graphics/pokemon/cofagrigus/footprint.png b/graphics/pokemon/gen_1/tentacruel/footprint.png
similarity index 100%
rename from graphics/pokemon/cofagrigus/footprint.png
rename to graphics/pokemon/gen_1/tentacruel/footprint.png
diff --git a/graphics/pokemon/tentacruel/icon.png b/graphics/pokemon/gen_1/tentacruel/icon.png
similarity index 100%
rename from graphics/pokemon/tentacruel/icon.png
rename to graphics/pokemon/gen_1/tentacruel/icon.png
diff --git a/graphics/pokemon/tentacruel/normal.pal b/graphics/pokemon/gen_1/tentacruel/normal.pal
similarity index 100%
rename from graphics/pokemon/tentacruel/normal.pal
rename to graphics/pokemon/gen_1/tentacruel/normal.pal
diff --git a/graphics/pokemon/tentacruel/shiny.pal b/graphics/pokemon/gen_1/tentacruel/shiny.pal
similarity index 100%
rename from graphics/pokemon/tentacruel/shiny.pal
rename to graphics/pokemon/gen_1/tentacruel/shiny.pal
diff --git a/graphics/pokemon/vaporeon/anim_front.png b/graphics/pokemon/gen_1/vaporeon/anim_front.png
similarity index 100%
rename from graphics/pokemon/vaporeon/anim_front.png
rename to graphics/pokemon/gen_1/vaporeon/anim_front.png
diff --git a/graphics/pokemon/vaporeon/back.png b/graphics/pokemon/gen_1/vaporeon/back.png
similarity index 100%
rename from graphics/pokemon/vaporeon/back.png
rename to graphics/pokemon/gen_1/vaporeon/back.png
diff --git a/graphics/pokemon/incineroar/footprint.png b/graphics/pokemon/gen_1/vaporeon/footprint.png
similarity index 100%
rename from graphics/pokemon/incineroar/footprint.png
rename to graphics/pokemon/gen_1/vaporeon/footprint.png
diff --git a/graphics/pokemon/vaporeon/icon.png b/graphics/pokemon/gen_1/vaporeon/icon.png
similarity index 100%
rename from graphics/pokemon/vaporeon/icon.png
rename to graphics/pokemon/gen_1/vaporeon/icon.png
diff --git a/graphics/pokemon/vaporeon/normal.pal b/graphics/pokemon/gen_1/vaporeon/normal.pal
similarity index 100%
rename from graphics/pokemon/vaporeon/normal.pal
rename to graphics/pokemon/gen_1/vaporeon/normal.pal
diff --git a/graphics/pokemon/vaporeon/shiny.pal b/graphics/pokemon/gen_1/vaporeon/shiny.pal
similarity index 100%
rename from graphics/pokemon/vaporeon/shiny.pal
rename to graphics/pokemon/gen_1/vaporeon/shiny.pal
diff --git a/graphics/pokemon/venomoth/anim_front.png b/graphics/pokemon/gen_1/venomoth/anim_front.png
similarity index 100%
rename from graphics/pokemon/venomoth/anim_front.png
rename to graphics/pokemon/gen_1/venomoth/anim_front.png
diff --git a/graphics/pokemon/venomoth/back.png b/graphics/pokemon/gen_1/venomoth/back.png
similarity index 100%
rename from graphics/pokemon/venomoth/back.png
rename to graphics/pokemon/gen_1/venomoth/back.png
diff --git a/graphics/pokemon/bergmite/footprint.png b/graphics/pokemon/gen_1/venomoth/footprint.png
similarity index 100%
rename from graphics/pokemon/bergmite/footprint.png
rename to graphics/pokemon/gen_1/venomoth/footprint.png
diff --git a/graphics/pokemon/venomoth/icon.png b/graphics/pokemon/gen_1/venomoth/icon.png
similarity index 100%
rename from graphics/pokemon/venomoth/icon.png
rename to graphics/pokemon/gen_1/venomoth/icon.png
diff --git a/graphics/pokemon/venomoth/normal.pal b/graphics/pokemon/gen_1/venomoth/normal.pal
similarity index 100%
rename from graphics/pokemon/venomoth/normal.pal
rename to graphics/pokemon/gen_1/venomoth/normal.pal
diff --git a/graphics/pokemon/venomoth/shiny.pal b/graphics/pokemon/gen_1/venomoth/shiny.pal
similarity index 100%
rename from graphics/pokemon/venomoth/shiny.pal
rename to graphics/pokemon/gen_1/venomoth/shiny.pal
diff --git a/graphics/pokemon/venonat/anim_front.png b/graphics/pokemon/gen_1/venonat/anim_front.png
similarity index 100%
rename from graphics/pokemon/venonat/anim_front.png
rename to graphics/pokemon/gen_1/venonat/anim_front.png
diff --git a/graphics/pokemon/venonat/back.png b/graphics/pokemon/gen_1/venonat/back.png
similarity index 100%
rename from graphics/pokemon/venonat/back.png
rename to graphics/pokemon/gen_1/venonat/back.png
diff --git a/graphics/pokemon/venonat/footprint.png b/graphics/pokemon/gen_1/venonat/footprint.png
similarity index 100%
rename from graphics/pokemon/venonat/footprint.png
rename to graphics/pokemon/gen_1/venonat/footprint.png
diff --git a/graphics/pokemon/venonat/icon.png b/graphics/pokemon/gen_1/venonat/icon.png
similarity index 100%
rename from graphics/pokemon/venonat/icon.png
rename to graphics/pokemon/gen_1/venonat/icon.png
diff --git a/graphics/pokemon/venonat/normal.pal b/graphics/pokemon/gen_1/venonat/normal.pal
similarity index 100%
rename from graphics/pokemon/venonat/normal.pal
rename to graphics/pokemon/gen_1/venonat/normal.pal
diff --git a/graphics/pokemon/venonat/shiny.pal b/graphics/pokemon/gen_1/venonat/shiny.pal
similarity index 100%
rename from graphics/pokemon/venonat/shiny.pal
rename to graphics/pokemon/gen_1/venonat/shiny.pal
diff --git a/graphics/pokemon/venusaur/anim_front.png b/graphics/pokemon/gen_1/venusaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/venusaur/anim_front.png
rename to graphics/pokemon/gen_1/venusaur/anim_front.png
diff --git a/graphics/pokemon/venusaur/anim_frontf.png b/graphics/pokemon/gen_1/venusaur/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/venusaur/anim_frontf.png
rename to graphics/pokemon/gen_1/venusaur/anim_frontf.png
diff --git a/graphics/pokemon/venusaur/back.png b/graphics/pokemon/gen_1/venusaur/back.png
similarity index 100%
rename from graphics/pokemon/venusaur/back.png
rename to graphics/pokemon/gen_1/venusaur/back.png
diff --git a/graphics/pokemon/venusaur/backf.png b/graphics/pokemon/gen_1/venusaur/backf.png
similarity index 100%
rename from graphics/pokemon/venusaur/backf.png
rename to graphics/pokemon/gen_1/venusaur/backf.png
diff --git a/graphics/pokemon/venusaur/footprint.png b/graphics/pokemon/gen_1/venusaur/footprint.png
similarity index 100%
rename from graphics/pokemon/venusaur/footprint.png
rename to graphics/pokemon/gen_1/venusaur/footprint.png
diff --git a/graphics/pokemon/venusaur/gigantamax/back.png b/graphics/pokemon/gen_1/venusaur/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/venusaur/gigantamax/back.png
rename to graphics/pokemon/gen_1/venusaur/gigantamax/back.png
diff --git a/graphics/pokemon/venusaur/gigantamax/front.png b/graphics/pokemon/gen_1/venusaur/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/venusaur/gigantamax/front.png
rename to graphics/pokemon/gen_1/venusaur/gigantamax/front.png
diff --git a/graphics/pokemon/venusaur/gigantamax/icon.png b/graphics/pokemon/gen_1/venusaur/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/venusaur/gigantamax/icon.png
rename to graphics/pokemon/gen_1/venusaur/gigantamax/icon.png
diff --git a/graphics/pokemon/venusaur/gigantamax/normal.pal b/graphics/pokemon/gen_1/venusaur/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/venusaur/gigantamax/normal.pal
rename to graphics/pokemon/gen_1/venusaur/gigantamax/normal.pal
diff --git a/graphics/pokemon/venusaur/gigantamax/shiny.pal b/graphics/pokemon/gen_1/venusaur/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/venusaur/gigantamax/shiny.pal
rename to graphics/pokemon/gen_1/venusaur/gigantamax/shiny.pal
diff --git a/graphics/pokemon/venusaur/icon.png b/graphics/pokemon/gen_1/venusaur/icon.png
similarity index 100%
rename from graphics/pokemon/venusaur/icon.png
rename to graphics/pokemon/gen_1/venusaur/icon.png
diff --git a/graphics/pokemon/venusaur/mega/back.png b/graphics/pokemon/gen_1/venusaur/mega/back.png
similarity index 100%
rename from graphics/pokemon/venusaur/mega/back.png
rename to graphics/pokemon/gen_1/venusaur/mega/back.png
diff --git a/graphics/pokemon/venusaur/mega/front.png b/graphics/pokemon/gen_1/venusaur/mega/front.png
similarity index 100%
rename from graphics/pokemon/venusaur/mega/front.png
rename to graphics/pokemon/gen_1/venusaur/mega/front.png
diff --git a/graphics/pokemon/venusaur/mega/icon.png b/graphics/pokemon/gen_1/venusaur/mega/icon.png
similarity index 100%
rename from graphics/pokemon/venusaur/mega/icon.png
rename to graphics/pokemon/gen_1/venusaur/mega/icon.png
diff --git a/graphics/pokemon/venusaur/mega/normal.pal b/graphics/pokemon/gen_1/venusaur/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/venusaur/mega/normal.pal
rename to graphics/pokemon/gen_1/venusaur/mega/normal.pal
diff --git a/graphics/pokemon/venusaur/mega/shiny.pal b/graphics/pokemon/gen_1/venusaur/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/venusaur/mega/shiny.pal
rename to graphics/pokemon/gen_1/venusaur/mega/shiny.pal
diff --git a/graphics/pokemon/venusaur/normal.pal b/graphics/pokemon/gen_1/venusaur/normal.pal
similarity index 100%
rename from graphics/pokemon/venusaur/normal.pal
rename to graphics/pokemon/gen_1/venusaur/normal.pal
diff --git a/graphics/pokemon/venusaur/shiny.pal b/graphics/pokemon/gen_1/venusaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/venusaur/shiny.pal
rename to graphics/pokemon/gen_1/venusaur/shiny.pal
diff --git a/graphics/pokemon/victreebel/anim_front.png b/graphics/pokemon/gen_1/victreebel/anim_front.png
similarity index 100%
rename from graphics/pokemon/victreebel/anim_front.png
rename to graphics/pokemon/gen_1/victreebel/anim_front.png
diff --git a/graphics/pokemon/victreebel/back.png b/graphics/pokemon/gen_1/victreebel/back.png
similarity index 100%
rename from graphics/pokemon/victreebel/back.png
rename to graphics/pokemon/gen_1/victreebel/back.png
diff --git a/graphics/pokemon/combee/footprint.png b/graphics/pokemon/gen_1/victreebel/footprint.png
similarity index 100%
rename from graphics/pokemon/combee/footprint.png
rename to graphics/pokemon/gen_1/victreebel/footprint.png
diff --git a/graphics/pokemon/victreebel/icon.png b/graphics/pokemon/gen_1/victreebel/icon.png
similarity index 100%
rename from graphics/pokemon/victreebel/icon.png
rename to graphics/pokemon/gen_1/victreebel/icon.png
diff --git a/graphics/pokemon/victreebel/normal.pal b/graphics/pokemon/gen_1/victreebel/normal.pal
similarity index 100%
rename from graphics/pokemon/victreebel/normal.pal
rename to graphics/pokemon/gen_1/victreebel/normal.pal
diff --git a/graphics/pokemon/victreebel/shiny.pal b/graphics/pokemon/gen_1/victreebel/shiny.pal
similarity index 100%
rename from graphics/pokemon/victreebel/shiny.pal
rename to graphics/pokemon/gen_1/victreebel/shiny.pal
diff --git a/graphics/pokemon/vileplume/anim_front.png b/graphics/pokemon/gen_1/vileplume/anim_front.png
similarity index 100%
rename from graphics/pokemon/vileplume/anim_front.png
rename to graphics/pokemon/gen_1/vileplume/anim_front.png
diff --git a/graphics/pokemon/vileplume/anim_frontf.png b/graphics/pokemon/gen_1/vileplume/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/vileplume/anim_frontf.png
rename to graphics/pokemon/gen_1/vileplume/anim_frontf.png
diff --git a/graphics/pokemon/vileplume/back.png b/graphics/pokemon/gen_1/vileplume/back.png
similarity index 100%
rename from graphics/pokemon/vileplume/back.png
rename to graphics/pokemon/gen_1/vileplume/back.png
diff --git a/graphics/pokemon/vileplume/backf.png b/graphics/pokemon/gen_1/vileplume/backf.png
similarity index 100%
rename from graphics/pokemon/vileplume/backf.png
rename to graphics/pokemon/gen_1/vileplume/backf.png
diff --git a/graphics/pokemon/vileplume/footprint.png b/graphics/pokemon/gen_1/vileplume/footprint.png
similarity index 100%
rename from graphics/pokemon/vileplume/footprint.png
rename to graphics/pokemon/gen_1/vileplume/footprint.png
diff --git a/graphics/pokemon/vileplume/icon.png b/graphics/pokemon/gen_1/vileplume/icon.png
similarity index 100%
rename from graphics/pokemon/vileplume/icon.png
rename to graphics/pokemon/gen_1/vileplume/icon.png
diff --git a/graphics/pokemon/vileplume/normal.pal b/graphics/pokemon/gen_1/vileplume/normal.pal
similarity index 100%
rename from graphics/pokemon/vileplume/normal.pal
rename to graphics/pokemon/gen_1/vileplume/normal.pal
diff --git a/graphics/pokemon/vileplume/shiny.pal b/graphics/pokemon/gen_1/vileplume/shiny.pal
similarity index 100%
rename from graphics/pokemon/vileplume/shiny.pal
rename to graphics/pokemon/gen_1/vileplume/shiny.pal
diff --git a/graphics/pokemon/voltorb/anim_front.png b/graphics/pokemon/gen_1/voltorb/anim_front.png
similarity index 100%
rename from graphics/pokemon/voltorb/anim_front.png
rename to graphics/pokemon/gen_1/voltorb/anim_front.png
diff --git a/graphics/pokemon/voltorb/back.png b/graphics/pokemon/gen_1/voltorb/back.png
similarity index 100%
rename from graphics/pokemon/voltorb/back.png
rename to graphics/pokemon/gen_1/voltorb/back.png
diff --git a/graphics/pokemon/comfey/footprint.png b/graphics/pokemon/gen_1/voltorb/footprint.png
similarity index 100%
rename from graphics/pokemon/comfey/footprint.png
rename to graphics/pokemon/gen_1/voltorb/footprint.png
diff --git a/graphics/pokemon/voltorb/hisuian/back.png b/graphics/pokemon/gen_1/voltorb/hisuian/back.png
similarity index 100%
rename from graphics/pokemon/voltorb/hisuian/back.png
rename to graphics/pokemon/gen_1/voltorb/hisuian/back.png
diff --git a/graphics/pokemon/voltorb/hisuian/front.png b/graphics/pokemon/gen_1/voltorb/hisuian/front.png
similarity index 100%
rename from graphics/pokemon/voltorb/hisuian/front.png
rename to graphics/pokemon/gen_1/voltorb/hisuian/front.png
diff --git a/graphics/pokemon/voltorb/hisuian/icon.png b/graphics/pokemon/gen_1/voltorb/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/voltorb/hisuian/icon.png
rename to graphics/pokemon/gen_1/voltorb/hisuian/icon.png
diff --git a/graphics/pokemon/voltorb/hisuian/normal.pal b/graphics/pokemon/gen_1/voltorb/hisuian/normal.pal
similarity index 100%
rename from graphics/pokemon/voltorb/hisuian/normal.pal
rename to graphics/pokemon/gen_1/voltorb/hisuian/normal.pal
diff --git a/graphics/pokemon/voltorb/hisuian/shiny.pal b/graphics/pokemon/gen_1/voltorb/hisuian/shiny.pal
similarity index 100%
rename from graphics/pokemon/voltorb/hisuian/shiny.pal
rename to graphics/pokemon/gen_1/voltorb/hisuian/shiny.pal
diff --git a/graphics/pokemon/voltorb/icon.png b/graphics/pokemon/gen_1/voltorb/icon.png
similarity index 100%
rename from graphics/pokemon/voltorb/icon.png
rename to graphics/pokemon/gen_1/voltorb/icon.png
diff --git a/graphics/pokemon/voltorb/normal.pal b/graphics/pokemon/gen_1/voltorb/normal.pal
similarity index 100%
rename from graphics/pokemon/voltorb/normal.pal
rename to graphics/pokemon/gen_1/voltorb/normal.pal
diff --git a/graphics/pokemon/voltorb/shiny.pal b/graphics/pokemon/gen_1/voltorb/shiny.pal
similarity index 100%
rename from graphics/pokemon/voltorb/shiny.pal
rename to graphics/pokemon/gen_1/voltorb/shiny.pal
diff --git a/graphics/pokemon/vulpix/alolan/back.png b/graphics/pokemon/gen_1/vulpix/alolan/back.png
similarity index 100%
rename from graphics/pokemon/vulpix/alolan/back.png
rename to graphics/pokemon/gen_1/vulpix/alolan/back.png
diff --git a/graphics/pokemon/vulpix/alolan/front.png b/graphics/pokemon/gen_1/vulpix/alolan/front.png
similarity index 100%
rename from graphics/pokemon/vulpix/alolan/front.png
rename to graphics/pokemon/gen_1/vulpix/alolan/front.png
diff --git a/graphics/pokemon/vulpix/alolan/icon.png b/graphics/pokemon/gen_1/vulpix/alolan/icon.png
similarity index 100%
rename from graphics/pokemon/vulpix/alolan/icon.png
rename to graphics/pokemon/gen_1/vulpix/alolan/icon.png
diff --git a/graphics/pokemon/vulpix/alolan/normal.pal b/graphics/pokemon/gen_1/vulpix/alolan/normal.pal
similarity index 100%
rename from graphics/pokemon/vulpix/alolan/normal.pal
rename to graphics/pokemon/gen_1/vulpix/alolan/normal.pal
diff --git a/graphics/pokemon/vulpix/alolan/shiny.pal b/graphics/pokemon/gen_1/vulpix/alolan/shiny.pal
similarity index 100%
rename from graphics/pokemon/vulpix/alolan/shiny.pal
rename to graphics/pokemon/gen_1/vulpix/alolan/shiny.pal
diff --git a/graphics/pokemon/vulpix/anim_front.png b/graphics/pokemon/gen_1/vulpix/anim_front.png
similarity index 100%
rename from graphics/pokemon/vulpix/anim_front.png
rename to graphics/pokemon/gen_1/vulpix/anim_front.png
diff --git a/graphics/pokemon/vulpix/back.png b/graphics/pokemon/gen_1/vulpix/back.png
similarity index 100%
rename from graphics/pokemon/vulpix/back.png
rename to graphics/pokemon/gen_1/vulpix/back.png
diff --git a/graphics/pokemon/vulpix/footprint.png b/graphics/pokemon/gen_1/vulpix/footprint.png
similarity index 100%
rename from graphics/pokemon/vulpix/footprint.png
rename to graphics/pokemon/gen_1/vulpix/footprint.png
diff --git a/graphics/pokemon/vulpix/icon.png b/graphics/pokemon/gen_1/vulpix/icon.png
similarity index 100%
rename from graphics/pokemon/vulpix/icon.png
rename to graphics/pokemon/gen_1/vulpix/icon.png
diff --git a/graphics/pokemon/vulpix/normal.pal b/graphics/pokemon/gen_1/vulpix/normal.pal
similarity index 100%
rename from graphics/pokemon/vulpix/normal.pal
rename to graphics/pokemon/gen_1/vulpix/normal.pal
diff --git a/graphics/pokemon/vulpix/shiny.pal b/graphics/pokemon/gen_1/vulpix/shiny.pal
similarity index 100%
rename from graphics/pokemon/vulpix/shiny.pal
rename to graphics/pokemon/gen_1/vulpix/shiny.pal
diff --git a/graphics/pokemon/wartortle/anim_front.png b/graphics/pokemon/gen_1/wartortle/anim_front.png
similarity index 100%
rename from graphics/pokemon/wartortle/anim_front.png
rename to graphics/pokemon/gen_1/wartortle/anim_front.png
diff --git a/graphics/pokemon/wartortle/back.png b/graphics/pokemon/gen_1/wartortle/back.png
similarity index 100%
rename from graphics/pokemon/wartortle/back.png
rename to graphics/pokemon/gen_1/wartortle/back.png
diff --git a/graphics/pokemon/wartortle/footprint.png b/graphics/pokemon/gen_1/wartortle/footprint.png
similarity index 100%
rename from graphics/pokemon/wartortle/footprint.png
rename to graphics/pokemon/gen_1/wartortle/footprint.png
diff --git a/graphics/pokemon/wartortle/icon.png b/graphics/pokemon/gen_1/wartortle/icon.png
similarity index 100%
rename from graphics/pokemon/wartortle/icon.png
rename to graphics/pokemon/gen_1/wartortle/icon.png
diff --git a/graphics/pokemon/wartortle/normal.pal b/graphics/pokemon/gen_1/wartortle/normal.pal
similarity index 100%
rename from graphics/pokemon/wartortle/normal.pal
rename to graphics/pokemon/gen_1/wartortle/normal.pal
diff --git a/graphics/pokemon/wartortle/shiny.pal b/graphics/pokemon/gen_1/wartortle/shiny.pal
similarity index 100%
rename from graphics/pokemon/wartortle/shiny.pal
rename to graphics/pokemon/gen_1/wartortle/shiny.pal
diff --git a/graphics/pokemon/weedle/anim_front.png b/graphics/pokemon/gen_1/weedle/anim_front.png
similarity index 100%
rename from graphics/pokemon/weedle/anim_front.png
rename to graphics/pokemon/gen_1/weedle/anim_front.png
diff --git a/graphics/pokemon/weedle/back.png b/graphics/pokemon/gen_1/weedle/back.png
similarity index 100%
rename from graphics/pokemon/weedle/back.png
rename to graphics/pokemon/gen_1/weedle/back.png
diff --git a/graphics/pokemon/bounsweet/footprint.png b/graphics/pokemon/gen_1/weedle/footprint.png
similarity index 100%
rename from graphics/pokemon/bounsweet/footprint.png
rename to graphics/pokemon/gen_1/weedle/footprint.png
diff --git a/graphics/pokemon/weedle/icon.png b/graphics/pokemon/gen_1/weedle/icon.png
similarity index 100%
rename from graphics/pokemon/weedle/icon.png
rename to graphics/pokemon/gen_1/weedle/icon.png
diff --git a/graphics/pokemon/weedle/normal.pal b/graphics/pokemon/gen_1/weedle/normal.pal
similarity index 100%
rename from graphics/pokemon/weedle/normal.pal
rename to graphics/pokemon/gen_1/weedle/normal.pal
diff --git a/graphics/pokemon/weedle/shiny.pal b/graphics/pokemon/gen_1/weedle/shiny.pal
similarity index 100%
rename from graphics/pokemon/weedle/shiny.pal
rename to graphics/pokemon/gen_1/weedle/shiny.pal
diff --git a/graphics/pokemon/weepinbell/anim_front.png b/graphics/pokemon/gen_1/weepinbell/anim_front.png
similarity index 100%
rename from graphics/pokemon/weepinbell/anim_front.png
rename to graphics/pokemon/gen_1/weepinbell/anim_front.png
diff --git a/graphics/pokemon/weepinbell/back.png b/graphics/pokemon/gen_1/weepinbell/back.png
similarity index 100%
rename from graphics/pokemon/weepinbell/back.png
rename to graphics/pokemon/gen_1/weepinbell/back.png
diff --git a/graphics/pokemon/cosmoem/footprint.png b/graphics/pokemon/gen_1/weepinbell/footprint.png
similarity index 100%
rename from graphics/pokemon/cosmoem/footprint.png
rename to graphics/pokemon/gen_1/weepinbell/footprint.png
diff --git a/graphics/pokemon/weepinbell/icon.png b/graphics/pokemon/gen_1/weepinbell/icon.png
similarity index 100%
rename from graphics/pokemon/weepinbell/icon.png
rename to graphics/pokemon/gen_1/weepinbell/icon.png
diff --git a/graphics/pokemon/weepinbell/normal.pal b/graphics/pokemon/gen_1/weepinbell/normal.pal
similarity index 100%
rename from graphics/pokemon/weepinbell/normal.pal
rename to graphics/pokemon/gen_1/weepinbell/normal.pal
diff --git a/graphics/pokemon/weepinbell/shiny.pal b/graphics/pokemon/gen_1/weepinbell/shiny.pal
similarity index 100%
rename from graphics/pokemon/weepinbell/shiny.pal
rename to graphics/pokemon/gen_1/weepinbell/shiny.pal
diff --git a/graphics/pokemon/weezing/anim_front.png b/graphics/pokemon/gen_1/weezing/anim_front.png
similarity index 100%
rename from graphics/pokemon/weezing/anim_front.png
rename to graphics/pokemon/gen_1/weezing/anim_front.png
diff --git a/graphics/pokemon/weezing/back.png b/graphics/pokemon/gen_1/weezing/back.png
similarity index 100%
rename from graphics/pokemon/weezing/back.png
rename to graphics/pokemon/gen_1/weezing/back.png
diff --git a/graphics/pokemon/cosmog/footprint.png b/graphics/pokemon/gen_1/weezing/footprint.png
similarity index 100%
rename from graphics/pokemon/cosmog/footprint.png
rename to graphics/pokemon/gen_1/weezing/footprint.png
diff --git a/graphics/pokemon/weezing/galarian/back.png b/graphics/pokemon/gen_1/weezing/galarian/back.png
similarity index 100%
rename from graphics/pokemon/weezing/galarian/back.png
rename to graphics/pokemon/gen_1/weezing/galarian/back.png
diff --git a/graphics/pokemon/weezing/galarian/front.png b/graphics/pokemon/gen_1/weezing/galarian/front.png
similarity index 100%
rename from graphics/pokemon/weezing/galarian/front.png
rename to graphics/pokemon/gen_1/weezing/galarian/front.png
diff --git a/graphics/pokemon/weezing/galarian/icon.png b/graphics/pokemon/gen_1/weezing/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/weezing/galarian/icon.png
rename to graphics/pokemon/gen_1/weezing/galarian/icon.png
diff --git a/graphics/pokemon/weezing/galarian/normal.pal b/graphics/pokemon/gen_1/weezing/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/weezing/galarian/normal.pal
rename to graphics/pokemon/gen_1/weezing/galarian/normal.pal
diff --git a/graphics/pokemon/weezing/galarian/shiny.pal b/graphics/pokemon/gen_1/weezing/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/weezing/galarian/shiny.pal
rename to graphics/pokemon/gen_1/weezing/galarian/shiny.pal
diff --git a/graphics/pokemon/weezing/icon.png b/graphics/pokemon/gen_1/weezing/icon.png
similarity index 100%
rename from graphics/pokemon/weezing/icon.png
rename to graphics/pokemon/gen_1/weezing/icon.png
diff --git a/graphics/pokemon/weezing/normal.pal b/graphics/pokemon/gen_1/weezing/normal.pal
similarity index 100%
rename from graphics/pokemon/weezing/normal.pal
rename to graphics/pokemon/gen_1/weezing/normal.pal
diff --git a/graphics/pokemon/weezing/shiny.pal b/graphics/pokemon/gen_1/weezing/shiny.pal
similarity index 100%
rename from graphics/pokemon/weezing/shiny.pal
rename to graphics/pokemon/gen_1/weezing/shiny.pal
diff --git a/graphics/pokemon/wigglytuff/anim_front.png b/graphics/pokemon/gen_1/wigglytuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/wigglytuff/anim_front.png
rename to graphics/pokemon/gen_1/wigglytuff/anim_front.png
diff --git a/graphics/pokemon/wigglytuff/back.png b/graphics/pokemon/gen_1/wigglytuff/back.png
similarity index 100%
rename from graphics/pokemon/wigglytuff/back.png
rename to graphics/pokemon/gen_1/wigglytuff/back.png
diff --git a/graphics/pokemon/wigglytuff/footprint.png b/graphics/pokemon/gen_1/wigglytuff/footprint.png
similarity index 100%
rename from graphics/pokemon/wigglytuff/footprint.png
rename to graphics/pokemon/gen_1/wigglytuff/footprint.png
diff --git a/graphics/pokemon/wigglytuff/icon.png b/graphics/pokemon/gen_1/wigglytuff/icon.png
similarity index 100%
rename from graphics/pokemon/wigglytuff/icon.png
rename to graphics/pokemon/gen_1/wigglytuff/icon.png
diff --git a/graphics/pokemon/wigglytuff/normal.pal b/graphics/pokemon/gen_1/wigglytuff/normal.pal
similarity index 100%
rename from graphics/pokemon/wigglytuff/normal.pal
rename to graphics/pokemon/gen_1/wigglytuff/normal.pal
diff --git a/graphics/pokemon/wigglytuff/shiny.pal b/graphics/pokemon/gen_1/wigglytuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/wigglytuff/shiny.pal
rename to graphics/pokemon/gen_1/wigglytuff/shiny.pal
diff --git a/graphics/pokemon/zapdos/anim_front.png b/graphics/pokemon/gen_1/zapdos/anim_front.png
similarity index 100%
rename from graphics/pokemon/zapdos/anim_front.png
rename to graphics/pokemon/gen_1/zapdos/anim_front.png
diff --git a/graphics/pokemon/zapdos/back.png b/graphics/pokemon/gen_1/zapdos/back.png
similarity index 100%
rename from graphics/pokemon/zapdos/back.png
rename to graphics/pokemon/gen_1/zapdos/back.png
diff --git a/graphics/pokemon/zapdos/footprint.png b/graphics/pokemon/gen_1/zapdos/footprint.png
similarity index 100%
rename from graphics/pokemon/zapdos/footprint.png
rename to graphics/pokemon/gen_1/zapdos/footprint.png
diff --git a/graphics/pokemon/zapdos/galarian/back.png b/graphics/pokemon/gen_1/zapdos/galarian/back.png
similarity index 100%
rename from graphics/pokemon/zapdos/galarian/back.png
rename to graphics/pokemon/gen_1/zapdos/galarian/back.png
diff --git a/graphics/pokemon/zapdos/galarian/front.png b/graphics/pokemon/gen_1/zapdos/galarian/front.png
similarity index 100%
rename from graphics/pokemon/zapdos/galarian/front.png
rename to graphics/pokemon/gen_1/zapdos/galarian/front.png
diff --git a/graphics/pokemon/zapdos/galarian/icon.png b/graphics/pokemon/gen_1/zapdos/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/zapdos/galarian/icon.png
rename to graphics/pokemon/gen_1/zapdos/galarian/icon.png
diff --git a/graphics/pokemon/zapdos/galarian/normal.pal b/graphics/pokemon/gen_1/zapdos/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/zapdos/galarian/normal.pal
rename to graphics/pokemon/gen_1/zapdos/galarian/normal.pal
diff --git a/graphics/pokemon/zapdos/galarian/shiny.pal b/graphics/pokemon/gen_1/zapdos/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/zapdos/galarian/shiny.pal
rename to graphics/pokemon/gen_1/zapdos/galarian/shiny.pal
diff --git a/graphics/pokemon/zapdos/icon.png b/graphics/pokemon/gen_1/zapdos/icon.png
similarity index 100%
rename from graphics/pokemon/zapdos/icon.png
rename to graphics/pokemon/gen_1/zapdos/icon.png
diff --git a/graphics/pokemon/zapdos/normal.pal b/graphics/pokemon/gen_1/zapdos/normal.pal
similarity index 100%
rename from graphics/pokemon/zapdos/normal.pal
rename to graphics/pokemon/gen_1/zapdos/normal.pal
diff --git a/graphics/pokemon/zapdos/shiny.pal b/graphics/pokemon/gen_1/zapdos/shiny.pal
similarity index 100%
rename from graphics/pokemon/zapdos/shiny.pal
rename to graphics/pokemon/gen_1/zapdos/shiny.pal
diff --git a/graphics/pokemon/zubat/anim_front.png b/graphics/pokemon/gen_1/zubat/anim_front.png
similarity index 100%
rename from graphics/pokemon/zubat/anim_front.png
rename to graphics/pokemon/gen_1/zubat/anim_front.png
diff --git a/graphics/pokemon/zubat/anim_frontf.png b/graphics/pokemon/gen_1/zubat/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/zubat/anim_frontf.png
rename to graphics/pokemon/gen_1/zubat/anim_frontf.png
diff --git a/graphics/pokemon/zubat/back.png b/graphics/pokemon/gen_1/zubat/back.png
similarity index 100%
rename from graphics/pokemon/zubat/back.png
rename to graphics/pokemon/gen_1/zubat/back.png
diff --git a/graphics/pokemon/zubat/backf.png b/graphics/pokemon/gen_1/zubat/backf.png
similarity index 100%
rename from graphics/pokemon/zubat/backf.png
rename to graphics/pokemon/gen_1/zubat/backf.png
diff --git a/graphics/pokemon/cottonee/footprint.png b/graphics/pokemon/gen_1/zubat/footprint.png
similarity index 100%
rename from graphics/pokemon/cottonee/footprint.png
rename to graphics/pokemon/gen_1/zubat/footprint.png
diff --git a/graphics/pokemon/zubat/icon.png b/graphics/pokemon/gen_1/zubat/icon.png
similarity index 100%
rename from graphics/pokemon/zubat/icon.png
rename to graphics/pokemon/gen_1/zubat/icon.png
diff --git a/graphics/pokemon/zubat/normal.pal b/graphics/pokemon/gen_1/zubat/normal.pal
similarity index 100%
rename from graphics/pokemon/zubat/normal.pal
rename to graphics/pokemon/gen_1/zubat/normal.pal
diff --git a/graphics/pokemon/zubat/shiny.pal b/graphics/pokemon/gen_1/zubat/shiny.pal
similarity index 100%
rename from graphics/pokemon/zubat/shiny.pal
rename to graphics/pokemon/gen_1/zubat/shiny.pal
diff --git a/graphics/pokemon/aipom/anim_front.png b/graphics/pokemon/gen_2/aipom/anim_front.png
similarity index 100%
rename from graphics/pokemon/aipom/anim_front.png
rename to graphics/pokemon/gen_2/aipom/anim_front.png
diff --git a/graphics/pokemon/aipom/anim_frontf.png b/graphics/pokemon/gen_2/aipom/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/aipom/anim_frontf.png
rename to graphics/pokemon/gen_2/aipom/anim_frontf.png
diff --git a/graphics/pokemon/aipom/back.png b/graphics/pokemon/gen_2/aipom/back.png
similarity index 100%
rename from graphics/pokemon/aipom/back.png
rename to graphics/pokemon/gen_2/aipom/back.png
diff --git a/graphics/pokemon/aipom/backf.png b/graphics/pokemon/gen_2/aipom/backf.png
similarity index 100%
rename from graphics/pokemon/aipom/backf.png
rename to graphics/pokemon/gen_2/aipom/backf.png
diff --git a/graphics/pokemon/aipom/footprint.png b/graphics/pokemon/gen_2/aipom/footprint.png
similarity index 100%
rename from graphics/pokemon/aipom/footprint.png
rename to graphics/pokemon/gen_2/aipom/footprint.png
diff --git a/graphics/pokemon/aipom/icon.png b/graphics/pokemon/gen_2/aipom/icon.png
similarity index 100%
rename from graphics/pokemon/aipom/icon.png
rename to graphics/pokemon/gen_2/aipom/icon.png
diff --git a/graphics/pokemon/aipom/normal.pal b/graphics/pokemon/gen_2/aipom/normal.pal
similarity index 100%
rename from graphics/pokemon/aipom/normal.pal
rename to graphics/pokemon/gen_2/aipom/normal.pal
diff --git a/graphics/pokemon/aipom/shiny.pal b/graphics/pokemon/gen_2/aipom/shiny.pal
similarity index 100%
rename from graphics/pokemon/aipom/shiny.pal
rename to graphics/pokemon/gen_2/aipom/shiny.pal
diff --git a/graphics/pokemon/ampharos/anim_front.png b/graphics/pokemon/gen_2/ampharos/anim_front.png
similarity index 100%
rename from graphics/pokemon/ampharos/anim_front.png
rename to graphics/pokemon/gen_2/ampharos/anim_front.png
diff --git a/graphics/pokemon/ampharos/back.png b/graphics/pokemon/gen_2/ampharos/back.png
similarity index 100%
rename from graphics/pokemon/ampharos/back.png
rename to graphics/pokemon/gen_2/ampharos/back.png
diff --git a/graphics/pokemon/ampharos/footprint.png b/graphics/pokemon/gen_2/ampharos/footprint.png
similarity index 100%
rename from graphics/pokemon/ampharos/footprint.png
rename to graphics/pokemon/gen_2/ampharos/footprint.png
diff --git a/graphics/pokemon/ampharos/icon.png b/graphics/pokemon/gen_2/ampharos/icon.png
similarity index 100%
rename from graphics/pokemon/ampharos/icon.png
rename to graphics/pokemon/gen_2/ampharos/icon.png
diff --git a/graphics/pokemon/ampharos/mega/back.png b/graphics/pokemon/gen_2/ampharos/mega/back.png
similarity index 100%
rename from graphics/pokemon/ampharos/mega/back.png
rename to graphics/pokemon/gen_2/ampharos/mega/back.png
diff --git a/graphics/pokemon/ampharos/mega/front.png b/graphics/pokemon/gen_2/ampharos/mega/front.png
similarity index 100%
rename from graphics/pokemon/ampharos/mega/front.png
rename to graphics/pokemon/gen_2/ampharos/mega/front.png
diff --git a/graphics/pokemon/ampharos/mega/icon.png b/graphics/pokemon/gen_2/ampharos/mega/icon.png
similarity index 100%
rename from graphics/pokemon/ampharos/mega/icon.png
rename to graphics/pokemon/gen_2/ampharos/mega/icon.png
diff --git a/graphics/pokemon/ampharos/mega/normal.pal b/graphics/pokemon/gen_2/ampharos/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/ampharos/mega/normal.pal
rename to graphics/pokemon/gen_2/ampharos/mega/normal.pal
diff --git a/graphics/pokemon/ampharos/mega/shiny.pal b/graphics/pokemon/gen_2/ampharos/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/ampharos/mega/shiny.pal
rename to graphics/pokemon/gen_2/ampharos/mega/shiny.pal
diff --git a/graphics/pokemon/ampharos/normal.pal b/graphics/pokemon/gen_2/ampharos/normal.pal
similarity index 100%
rename from graphics/pokemon/ampharos/normal.pal
rename to graphics/pokemon/gen_2/ampharos/normal.pal
diff --git a/graphics/pokemon/ampharos/shiny.pal b/graphics/pokemon/gen_2/ampharos/shiny.pal
similarity index 100%
rename from graphics/pokemon/ampharos/shiny.pal
rename to graphics/pokemon/gen_2/ampharos/shiny.pal
diff --git a/graphics/pokemon/ariados/anim_front.png b/graphics/pokemon/gen_2/ariados/anim_front.png
similarity index 100%
rename from graphics/pokemon/ariados/anim_front.png
rename to graphics/pokemon/gen_2/ariados/anim_front.png
diff --git a/graphics/pokemon/ariados/back.png b/graphics/pokemon/gen_2/ariados/back.png
similarity index 100%
rename from graphics/pokemon/ariados/back.png
rename to graphics/pokemon/gen_2/ariados/back.png
diff --git a/graphics/pokemon/ariados/footprint.png b/graphics/pokemon/gen_2/ariados/footprint.png
similarity index 100%
rename from graphics/pokemon/ariados/footprint.png
rename to graphics/pokemon/gen_2/ariados/footprint.png
diff --git a/graphics/pokemon/ariados/icon.png b/graphics/pokemon/gen_2/ariados/icon.png
similarity index 100%
rename from graphics/pokemon/ariados/icon.png
rename to graphics/pokemon/gen_2/ariados/icon.png
diff --git a/graphics/pokemon/ariados/normal.pal b/graphics/pokemon/gen_2/ariados/normal.pal
similarity index 100%
rename from graphics/pokemon/ariados/normal.pal
rename to graphics/pokemon/gen_2/ariados/normal.pal
diff --git a/graphics/pokemon/ariados/shiny.pal b/graphics/pokemon/gen_2/ariados/shiny.pal
similarity index 100%
rename from graphics/pokemon/ariados/shiny.pal
rename to graphics/pokemon/gen_2/ariados/shiny.pal
diff --git a/graphics/pokemon/azumarill/anim_front.png b/graphics/pokemon/gen_2/azumarill/anim_front.png
similarity index 100%
rename from graphics/pokemon/azumarill/anim_front.png
rename to graphics/pokemon/gen_2/azumarill/anim_front.png
diff --git a/graphics/pokemon/azumarill/back.png b/graphics/pokemon/gen_2/azumarill/back.png
similarity index 100%
rename from graphics/pokemon/azumarill/back.png
rename to graphics/pokemon/gen_2/azumarill/back.png
diff --git a/graphics/pokemon/azumarill/footprint.png b/graphics/pokemon/gen_2/azumarill/footprint.png
similarity index 100%
rename from graphics/pokemon/azumarill/footprint.png
rename to graphics/pokemon/gen_2/azumarill/footprint.png
diff --git a/graphics/pokemon/azumarill/icon.png b/graphics/pokemon/gen_2/azumarill/icon.png
similarity index 100%
rename from graphics/pokemon/azumarill/icon.png
rename to graphics/pokemon/gen_2/azumarill/icon.png
diff --git a/graphics/pokemon/azumarill/normal.pal b/graphics/pokemon/gen_2/azumarill/normal.pal
similarity index 100%
rename from graphics/pokemon/azumarill/normal.pal
rename to graphics/pokemon/gen_2/azumarill/normal.pal
diff --git a/graphics/pokemon/azumarill/shiny.pal b/graphics/pokemon/gen_2/azumarill/shiny.pal
similarity index 100%
rename from graphics/pokemon/azumarill/shiny.pal
rename to graphics/pokemon/gen_2/azumarill/shiny.pal
diff --git a/graphics/pokemon/bayleef/anim_front.png b/graphics/pokemon/gen_2/bayleef/anim_front.png
similarity index 100%
rename from graphics/pokemon/bayleef/anim_front.png
rename to graphics/pokemon/gen_2/bayleef/anim_front.png
diff --git a/graphics/pokemon/bayleef/back.png b/graphics/pokemon/gen_2/bayleef/back.png
similarity index 100%
rename from graphics/pokemon/bayleef/back.png
rename to graphics/pokemon/gen_2/bayleef/back.png
diff --git a/graphics/pokemon/bayleef/footprint.png b/graphics/pokemon/gen_2/bayleef/footprint.png
similarity index 100%
rename from graphics/pokemon/bayleef/footprint.png
rename to graphics/pokemon/gen_2/bayleef/footprint.png
diff --git a/graphics/pokemon/bayleef/icon.png b/graphics/pokemon/gen_2/bayleef/icon.png
similarity index 100%
rename from graphics/pokemon/bayleef/icon.png
rename to graphics/pokemon/gen_2/bayleef/icon.png
diff --git a/graphics/pokemon/bayleef/normal.pal b/graphics/pokemon/gen_2/bayleef/normal.pal
similarity index 100%
rename from graphics/pokemon/bayleef/normal.pal
rename to graphics/pokemon/gen_2/bayleef/normal.pal
diff --git a/graphics/pokemon/bayleef/shiny.pal b/graphics/pokemon/gen_2/bayleef/shiny.pal
similarity index 100%
rename from graphics/pokemon/bayleef/shiny.pal
rename to graphics/pokemon/gen_2/bayleef/shiny.pal
diff --git a/graphics/pokemon/bellossom/anim_front.png b/graphics/pokemon/gen_2/bellossom/anim_front.png
similarity index 100%
rename from graphics/pokemon/bellossom/anim_front.png
rename to graphics/pokemon/gen_2/bellossom/anim_front.png
diff --git a/graphics/pokemon/bellossom/back.png b/graphics/pokemon/gen_2/bellossom/back.png
similarity index 100%
rename from graphics/pokemon/bellossom/back.png
rename to graphics/pokemon/gen_2/bellossom/back.png
diff --git a/graphics/pokemon/cresselia/footprint.png b/graphics/pokemon/gen_2/bellossom/footprint.png
similarity index 100%
rename from graphics/pokemon/cresselia/footprint.png
rename to graphics/pokemon/gen_2/bellossom/footprint.png
diff --git a/graphics/pokemon/bellossom/icon.png b/graphics/pokemon/gen_2/bellossom/icon.png
similarity index 100%
rename from graphics/pokemon/bellossom/icon.png
rename to graphics/pokemon/gen_2/bellossom/icon.png
diff --git a/graphics/pokemon/bellossom/normal.pal b/graphics/pokemon/gen_2/bellossom/normal.pal
similarity index 100%
rename from graphics/pokemon/bellossom/normal.pal
rename to graphics/pokemon/gen_2/bellossom/normal.pal
diff --git a/graphics/pokemon/bellossom/shiny.pal b/graphics/pokemon/gen_2/bellossom/shiny.pal
similarity index 100%
rename from graphics/pokemon/bellossom/shiny.pal
rename to graphics/pokemon/gen_2/bellossom/shiny.pal
diff --git a/graphics/pokemon/blissey/anim_front.png b/graphics/pokemon/gen_2/blissey/anim_front.png
similarity index 100%
rename from graphics/pokemon/blissey/anim_front.png
rename to graphics/pokemon/gen_2/blissey/anim_front.png
diff --git a/graphics/pokemon/blissey/back.png b/graphics/pokemon/gen_2/blissey/back.png
similarity index 100%
rename from graphics/pokemon/blissey/back.png
rename to graphics/pokemon/gen_2/blissey/back.png
diff --git a/graphics/pokemon/blissey/footprint.png b/graphics/pokemon/gen_2/blissey/footprint.png
similarity index 100%
rename from graphics/pokemon/blissey/footprint.png
rename to graphics/pokemon/gen_2/blissey/footprint.png
diff --git a/graphics/pokemon/blissey/icon.png b/graphics/pokemon/gen_2/blissey/icon.png
similarity index 100%
rename from graphics/pokemon/blissey/icon.png
rename to graphics/pokemon/gen_2/blissey/icon.png
diff --git a/graphics/pokemon/blissey/normal.pal b/graphics/pokemon/gen_2/blissey/normal.pal
similarity index 100%
rename from graphics/pokemon/blissey/normal.pal
rename to graphics/pokemon/gen_2/blissey/normal.pal
diff --git a/graphics/pokemon/blissey/shiny.pal b/graphics/pokemon/gen_2/blissey/shiny.pal
similarity index 100%
rename from graphics/pokemon/blissey/shiny.pal
rename to graphics/pokemon/gen_2/blissey/shiny.pal
diff --git a/graphics/pokemon/celebi/anim_front.png b/graphics/pokemon/gen_2/celebi/anim_front.png
similarity index 100%
rename from graphics/pokemon/celebi/anim_front.png
rename to graphics/pokemon/gen_2/celebi/anim_front.png
diff --git a/graphics/pokemon/celebi/back.png b/graphics/pokemon/gen_2/celebi/back.png
similarity index 100%
rename from graphics/pokemon/celebi/back.png
rename to graphics/pokemon/gen_2/celebi/back.png
diff --git a/graphics/pokemon/celebi/footprint.png b/graphics/pokemon/gen_2/celebi/footprint.png
similarity index 100%
rename from graphics/pokemon/celebi/footprint.png
rename to graphics/pokemon/gen_2/celebi/footprint.png
diff --git a/graphics/pokemon/celebi/icon.png b/graphics/pokemon/gen_2/celebi/icon.png
similarity index 100%
rename from graphics/pokemon/celebi/icon.png
rename to graphics/pokemon/gen_2/celebi/icon.png
diff --git a/graphics/pokemon/celebi/normal.pal b/graphics/pokemon/gen_2/celebi/normal.pal
similarity index 100%
rename from graphics/pokemon/celebi/normal.pal
rename to graphics/pokemon/gen_2/celebi/normal.pal
diff --git a/graphics/pokemon/celebi/shiny.pal b/graphics/pokemon/gen_2/celebi/shiny.pal
similarity index 100%
rename from graphics/pokemon/celebi/shiny.pal
rename to graphics/pokemon/gen_2/celebi/shiny.pal
diff --git a/graphics/pokemon/chikorita/anim_front.png b/graphics/pokemon/gen_2/chikorita/anim_front.png
similarity index 100%
rename from graphics/pokemon/chikorita/anim_front.png
rename to graphics/pokemon/gen_2/chikorita/anim_front.png
diff --git a/graphics/pokemon/chikorita/back.png b/graphics/pokemon/gen_2/chikorita/back.png
similarity index 100%
rename from graphics/pokemon/chikorita/back.png
rename to graphics/pokemon/gen_2/chikorita/back.png
diff --git a/graphics/pokemon/chikorita/footprint.png b/graphics/pokemon/gen_2/chikorita/footprint.png
similarity index 100%
rename from graphics/pokemon/chikorita/footprint.png
rename to graphics/pokemon/gen_2/chikorita/footprint.png
diff --git a/graphics/pokemon/chikorita/icon.png b/graphics/pokemon/gen_2/chikorita/icon.png
similarity index 100%
rename from graphics/pokemon/chikorita/icon.png
rename to graphics/pokemon/gen_2/chikorita/icon.png
diff --git a/graphics/pokemon/chikorita/normal.pal b/graphics/pokemon/gen_2/chikorita/normal.pal
similarity index 100%
rename from graphics/pokemon/chikorita/normal.pal
rename to graphics/pokemon/gen_2/chikorita/normal.pal
diff --git a/graphics/pokemon/chikorita/shiny.pal b/graphics/pokemon/gen_2/chikorita/shiny.pal
similarity index 100%
rename from graphics/pokemon/chikorita/shiny.pal
rename to graphics/pokemon/gen_2/chikorita/shiny.pal
diff --git a/graphics/pokemon/chinchou/anim_front.png b/graphics/pokemon/gen_2/chinchou/anim_front.png
similarity index 100%
rename from graphics/pokemon/chinchou/anim_front.png
rename to graphics/pokemon/gen_2/chinchou/anim_front.png
diff --git a/graphics/pokemon/chinchou/back.png b/graphics/pokemon/gen_2/chinchou/back.png
similarity index 100%
rename from graphics/pokemon/chinchou/back.png
rename to graphics/pokemon/gen_2/chinchou/back.png
diff --git a/graphics/pokemon/crobat/footprint.png b/graphics/pokemon/gen_2/chinchou/footprint.png
similarity index 100%
rename from graphics/pokemon/crobat/footprint.png
rename to graphics/pokemon/gen_2/chinchou/footprint.png
diff --git a/graphics/pokemon/chinchou/icon.png b/graphics/pokemon/gen_2/chinchou/icon.png
similarity index 100%
rename from graphics/pokemon/chinchou/icon.png
rename to graphics/pokemon/gen_2/chinchou/icon.png
diff --git a/graphics/pokemon/chinchou/normal.pal b/graphics/pokemon/gen_2/chinchou/normal.pal
similarity index 100%
rename from graphics/pokemon/chinchou/normal.pal
rename to graphics/pokemon/gen_2/chinchou/normal.pal
diff --git a/graphics/pokemon/chinchou/shiny.pal b/graphics/pokemon/gen_2/chinchou/shiny.pal
similarity index 100%
rename from graphics/pokemon/chinchou/shiny.pal
rename to graphics/pokemon/gen_2/chinchou/shiny.pal
diff --git a/graphics/pokemon/cleffa/anim_front.png b/graphics/pokemon/gen_2/cleffa/anim_front.png
similarity index 100%
rename from graphics/pokemon/cleffa/anim_front.png
rename to graphics/pokemon/gen_2/cleffa/anim_front.png
diff --git a/graphics/pokemon/cleffa/back.png b/graphics/pokemon/gen_2/cleffa/back.png
similarity index 100%
rename from graphics/pokemon/cleffa/back.png
rename to graphics/pokemon/gen_2/cleffa/back.png
diff --git a/graphics/pokemon/cleffa/footprint.png b/graphics/pokemon/gen_2/cleffa/footprint.png
similarity index 100%
rename from graphics/pokemon/cleffa/footprint.png
rename to graphics/pokemon/gen_2/cleffa/footprint.png
diff --git a/graphics/pokemon/cleffa/icon.png b/graphics/pokemon/gen_2/cleffa/icon.png
similarity index 100%
rename from graphics/pokemon/cleffa/icon.png
rename to graphics/pokemon/gen_2/cleffa/icon.png
diff --git a/graphics/pokemon/cleffa/normal.pal b/graphics/pokemon/gen_2/cleffa/normal.pal
similarity index 100%
rename from graphics/pokemon/cleffa/normal.pal
rename to graphics/pokemon/gen_2/cleffa/normal.pal
diff --git a/graphics/pokemon/cleffa/shiny.pal b/graphics/pokemon/gen_2/cleffa/shiny.pal
similarity index 100%
rename from graphics/pokemon/cleffa/shiny.pal
rename to graphics/pokemon/gen_2/cleffa/shiny.pal
diff --git a/graphics/pokemon/corsola/anim_front.png b/graphics/pokemon/gen_2/corsola/anim_front.png
similarity index 100%
rename from graphics/pokemon/corsola/anim_front.png
rename to graphics/pokemon/gen_2/corsola/anim_front.png
diff --git a/graphics/pokemon/corsola/back.png b/graphics/pokemon/gen_2/corsola/back.png
similarity index 100%
rename from graphics/pokemon/corsola/back.png
rename to graphics/pokemon/gen_2/corsola/back.png
diff --git a/graphics/pokemon/corsola/footprint.png b/graphics/pokemon/gen_2/corsola/footprint.png
similarity index 100%
rename from graphics/pokemon/corsola/footprint.png
rename to graphics/pokemon/gen_2/corsola/footprint.png
diff --git a/graphics/pokemon/corsola/galarian/back.png b/graphics/pokemon/gen_2/corsola/galarian/back.png
similarity index 100%
rename from graphics/pokemon/corsola/galarian/back.png
rename to graphics/pokemon/gen_2/corsola/galarian/back.png
diff --git a/graphics/pokemon/corsola/galarian/front.png b/graphics/pokemon/gen_2/corsola/galarian/front.png
similarity index 100%
rename from graphics/pokemon/corsola/galarian/front.png
rename to graphics/pokemon/gen_2/corsola/galarian/front.png
diff --git a/graphics/pokemon/corsola/galarian/icon.png b/graphics/pokemon/gen_2/corsola/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/corsola/galarian/icon.png
rename to graphics/pokemon/gen_2/corsola/galarian/icon.png
diff --git a/graphics/pokemon/corsola/galarian/normal.pal b/graphics/pokemon/gen_2/corsola/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/corsola/galarian/normal.pal
rename to graphics/pokemon/gen_2/corsola/galarian/normal.pal
diff --git a/graphics/pokemon/corsola/galarian/shiny.pal b/graphics/pokemon/gen_2/corsola/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/corsola/galarian/shiny.pal
rename to graphics/pokemon/gen_2/corsola/galarian/shiny.pal
diff --git a/graphics/pokemon/corsola/icon.png b/graphics/pokemon/gen_2/corsola/icon.png
similarity index 100%
rename from graphics/pokemon/corsola/icon.png
rename to graphics/pokemon/gen_2/corsola/icon.png
diff --git a/graphics/pokemon/corsola/normal.pal b/graphics/pokemon/gen_2/corsola/normal.pal
similarity index 100%
rename from graphics/pokemon/corsola/normal.pal
rename to graphics/pokemon/gen_2/corsola/normal.pal
diff --git a/graphics/pokemon/corsola/shiny.pal b/graphics/pokemon/gen_2/corsola/shiny.pal
similarity index 100%
rename from graphics/pokemon/corsola/shiny.pal
rename to graphics/pokemon/gen_2/corsola/shiny.pal
diff --git a/graphics/pokemon/crobat/anim_front.png b/graphics/pokemon/gen_2/crobat/anim_front.png
similarity index 100%
rename from graphics/pokemon/crobat/anim_front.png
rename to graphics/pokemon/gen_2/crobat/anim_front.png
diff --git a/graphics/pokemon/crobat/back.png b/graphics/pokemon/gen_2/crobat/back.png
similarity index 100%
rename from graphics/pokemon/crobat/back.png
rename to graphics/pokemon/gen_2/crobat/back.png
diff --git a/graphics/pokemon/cryogonal/footprint.png b/graphics/pokemon/gen_2/crobat/footprint.png
similarity index 100%
rename from graphics/pokemon/cryogonal/footprint.png
rename to graphics/pokemon/gen_2/crobat/footprint.png
diff --git a/graphics/pokemon/crobat/icon.png b/graphics/pokemon/gen_2/crobat/icon.png
similarity index 100%
rename from graphics/pokemon/crobat/icon.png
rename to graphics/pokemon/gen_2/crobat/icon.png
diff --git a/graphics/pokemon/crobat/normal.pal b/graphics/pokemon/gen_2/crobat/normal.pal
similarity index 100%
rename from graphics/pokemon/crobat/normal.pal
rename to graphics/pokemon/gen_2/crobat/normal.pal
diff --git a/graphics/pokemon/crobat/shiny.pal b/graphics/pokemon/gen_2/crobat/shiny.pal
similarity index 100%
rename from graphics/pokemon/crobat/shiny.pal
rename to graphics/pokemon/gen_2/crobat/shiny.pal
diff --git a/graphics/pokemon/croconaw/anim_front.png b/graphics/pokemon/gen_2/croconaw/anim_front.png
similarity index 100%
rename from graphics/pokemon/croconaw/anim_front.png
rename to graphics/pokemon/gen_2/croconaw/anim_front.png
diff --git a/graphics/pokemon/croconaw/back.png b/graphics/pokemon/gen_2/croconaw/back.png
similarity index 100%
rename from graphics/pokemon/croconaw/back.png
rename to graphics/pokemon/gen_2/croconaw/back.png
diff --git a/graphics/pokemon/croconaw/footprint.png b/graphics/pokemon/gen_2/croconaw/footprint.png
similarity index 100%
rename from graphics/pokemon/croconaw/footprint.png
rename to graphics/pokemon/gen_2/croconaw/footprint.png
diff --git a/graphics/pokemon/croconaw/icon.png b/graphics/pokemon/gen_2/croconaw/icon.png
similarity index 100%
rename from graphics/pokemon/croconaw/icon.png
rename to graphics/pokemon/gen_2/croconaw/icon.png
diff --git a/graphics/pokemon/croconaw/normal.pal b/graphics/pokemon/gen_2/croconaw/normal.pal
similarity index 100%
rename from graphics/pokemon/croconaw/normal.pal
rename to graphics/pokemon/gen_2/croconaw/normal.pal
diff --git a/graphics/pokemon/croconaw/shiny.pal b/graphics/pokemon/gen_2/croconaw/shiny.pal
similarity index 100%
rename from graphics/pokemon/croconaw/shiny.pal
rename to graphics/pokemon/gen_2/croconaw/shiny.pal
diff --git a/graphics/pokemon/cyndaquil/anim_front.png b/graphics/pokemon/gen_2/cyndaquil/anim_front.png
similarity index 100%
rename from graphics/pokemon/cyndaquil/anim_front.png
rename to graphics/pokemon/gen_2/cyndaquil/anim_front.png
diff --git a/graphics/pokemon/cyndaquil/back.png b/graphics/pokemon/gen_2/cyndaquil/back.png
similarity index 100%
rename from graphics/pokemon/cyndaquil/back.png
rename to graphics/pokemon/gen_2/cyndaquil/back.png
diff --git a/graphics/pokemon/cufant/footprint.png b/graphics/pokemon/gen_2/cyndaquil/footprint.png
similarity index 100%
rename from graphics/pokemon/cufant/footprint.png
rename to graphics/pokemon/gen_2/cyndaquil/footprint.png
diff --git a/graphics/pokemon/cyndaquil/icon.png b/graphics/pokemon/gen_2/cyndaquil/icon.png
similarity index 100%
rename from graphics/pokemon/cyndaquil/icon.png
rename to graphics/pokemon/gen_2/cyndaquil/icon.png
diff --git a/graphics/pokemon/cyndaquil/normal.pal b/graphics/pokemon/gen_2/cyndaquil/normal.pal
similarity index 100%
rename from graphics/pokemon/cyndaquil/normal.pal
rename to graphics/pokemon/gen_2/cyndaquil/normal.pal
diff --git a/graphics/pokemon/cyndaquil/shiny.pal b/graphics/pokemon/gen_2/cyndaquil/shiny.pal
similarity index 100%
rename from graphics/pokemon/cyndaquil/shiny.pal
rename to graphics/pokemon/gen_2/cyndaquil/shiny.pal
diff --git a/graphics/pokemon/delibird/anim_front.png b/graphics/pokemon/gen_2/delibird/anim_front.png
similarity index 100%
rename from graphics/pokemon/delibird/anim_front.png
rename to graphics/pokemon/gen_2/delibird/anim_front.png
diff --git a/graphics/pokemon/delibird/back.png b/graphics/pokemon/gen_2/delibird/back.png
similarity index 100%
rename from graphics/pokemon/delibird/back.png
rename to graphics/pokemon/gen_2/delibird/back.png
diff --git a/graphics/pokemon/delibird/footprint.png b/graphics/pokemon/gen_2/delibird/footprint.png
similarity index 100%
rename from graphics/pokemon/delibird/footprint.png
rename to graphics/pokemon/gen_2/delibird/footprint.png
diff --git a/graphics/pokemon/delibird/icon.png b/graphics/pokemon/gen_2/delibird/icon.png
similarity index 100%
rename from graphics/pokemon/delibird/icon.png
rename to graphics/pokemon/gen_2/delibird/icon.png
diff --git a/graphics/pokemon/delibird/normal.pal b/graphics/pokemon/gen_2/delibird/normal.pal
similarity index 100%
rename from graphics/pokemon/delibird/normal.pal
rename to graphics/pokemon/gen_2/delibird/normal.pal
diff --git a/graphics/pokemon/delibird/shiny.pal b/graphics/pokemon/gen_2/delibird/shiny.pal
similarity index 100%
rename from graphics/pokemon/delibird/shiny.pal
rename to graphics/pokemon/gen_2/delibird/shiny.pal
diff --git a/graphics/pokemon/donphan/anim_front.png b/graphics/pokemon/gen_2/donphan/anim_front.png
similarity index 100%
rename from graphics/pokemon/donphan/anim_front.png
rename to graphics/pokemon/gen_2/donphan/anim_front.png
diff --git a/graphics/pokemon/donphan/anim_frontf.png b/graphics/pokemon/gen_2/donphan/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/donphan/anim_frontf.png
rename to graphics/pokemon/gen_2/donphan/anim_frontf.png
diff --git a/graphics/pokemon/donphan/back.png b/graphics/pokemon/gen_2/donphan/back.png
similarity index 100%
rename from graphics/pokemon/donphan/back.png
rename to graphics/pokemon/gen_2/donphan/back.png
diff --git a/graphics/pokemon/donphan/backf.png b/graphics/pokemon/gen_2/donphan/backf.png
similarity index 100%
rename from graphics/pokemon/donphan/backf.png
rename to graphics/pokemon/gen_2/donphan/backf.png
diff --git a/graphics/pokemon/donphan/footprint.png b/graphics/pokemon/gen_2/donphan/footprint.png
similarity index 100%
rename from graphics/pokemon/donphan/footprint.png
rename to graphics/pokemon/gen_2/donphan/footprint.png
diff --git a/graphics/pokemon/donphan/icon.png b/graphics/pokemon/gen_2/donphan/icon.png
similarity index 100%
rename from graphics/pokemon/donphan/icon.png
rename to graphics/pokemon/gen_2/donphan/icon.png
diff --git a/graphics/pokemon/donphan/normal.pal b/graphics/pokemon/gen_2/donphan/normal.pal
similarity index 100%
rename from graphics/pokemon/donphan/normal.pal
rename to graphics/pokemon/gen_2/donphan/normal.pal
diff --git a/graphics/pokemon/donphan/shiny.pal b/graphics/pokemon/gen_2/donphan/shiny.pal
similarity index 100%
rename from graphics/pokemon/donphan/shiny.pal
rename to graphics/pokemon/gen_2/donphan/shiny.pal
diff --git a/graphics/pokemon/dunsparce/anim_front.png b/graphics/pokemon/gen_2/dunsparce/anim_front.png
similarity index 100%
rename from graphics/pokemon/dunsparce/anim_front.png
rename to graphics/pokemon/gen_2/dunsparce/anim_front.png
diff --git a/graphics/pokemon/dunsparce/back.png b/graphics/pokemon/gen_2/dunsparce/back.png
similarity index 100%
rename from graphics/pokemon/dunsparce/back.png
rename to graphics/pokemon/gen_2/dunsparce/back.png
diff --git a/graphics/pokemon/dewgong/footprint.png b/graphics/pokemon/gen_2/dunsparce/footprint.png
similarity index 100%
rename from graphics/pokemon/dewgong/footprint.png
rename to graphics/pokemon/gen_2/dunsparce/footprint.png
diff --git a/graphics/pokemon/dunsparce/icon.png b/graphics/pokemon/gen_2/dunsparce/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dunsparce/icon.png
rename to graphics/pokemon/gen_2/dunsparce/icon.png
diff --git a/graphics/pokemon/dunsparce/normal.pal b/graphics/pokemon/gen_2/dunsparce/normal.pal
similarity index 100%
rename from graphics/pokemon/dunsparce/normal.pal
rename to graphics/pokemon/gen_2/dunsparce/normal.pal
diff --git a/graphics/pokemon/dunsparce/shiny.pal b/graphics/pokemon/gen_2/dunsparce/shiny.pal
similarity index 100%
rename from graphics/pokemon/dunsparce/shiny.pal
rename to graphics/pokemon/gen_2/dunsparce/shiny.pal
diff --git a/graphics/pokemon/elekid/anim_front.png b/graphics/pokemon/gen_2/elekid/anim_front.png
similarity index 100%
rename from graphics/pokemon/elekid/anim_front.png
rename to graphics/pokemon/gen_2/elekid/anim_front.png
diff --git a/graphics/pokemon/elekid/back.png b/graphics/pokemon/gen_2/elekid/back.png
similarity index 100%
rename from graphics/pokemon/elekid/back.png
rename to graphics/pokemon/gen_2/elekid/back.png
diff --git a/graphics/pokemon/elekid/footprint.png b/graphics/pokemon/gen_2/elekid/footprint.png
similarity index 100%
rename from graphics/pokemon/elekid/footprint.png
rename to graphics/pokemon/gen_2/elekid/footprint.png
diff --git a/graphics/pokemon/elekid/icon.png b/graphics/pokemon/gen_2/elekid/icon.png
similarity index 100%
rename from graphics/pokemon/elekid/icon.png
rename to graphics/pokemon/gen_2/elekid/icon.png
diff --git a/graphics/pokemon/elekid/normal.pal b/graphics/pokemon/gen_2/elekid/normal.pal
similarity index 100%
rename from graphics/pokemon/elekid/normal.pal
rename to graphics/pokemon/gen_2/elekid/normal.pal
diff --git a/graphics/pokemon/elekid/shiny.pal b/graphics/pokemon/gen_2/elekid/shiny.pal
similarity index 100%
rename from graphics/pokemon/elekid/shiny.pal
rename to graphics/pokemon/gen_2/elekid/shiny.pal
diff --git a/graphics/pokemon/entei/anim_front.png b/graphics/pokemon/gen_2/entei/anim_front.png
similarity index 100%
rename from graphics/pokemon/entei/anim_front.png
rename to graphics/pokemon/gen_2/entei/anim_front.png
diff --git a/graphics/pokemon/entei/back.png b/graphics/pokemon/gen_2/entei/back.png
similarity index 100%
rename from graphics/pokemon/entei/back.png
rename to graphics/pokemon/gen_2/entei/back.png
diff --git a/graphics/pokemon/entei/footprint.png b/graphics/pokemon/gen_2/entei/footprint.png
similarity index 100%
rename from graphics/pokemon/entei/footprint.png
rename to graphics/pokemon/gen_2/entei/footprint.png
diff --git a/graphics/pokemon/entei/icon.png b/graphics/pokemon/gen_2/entei/icon.png
similarity index 100%
rename from graphics/pokemon/entei/icon.png
rename to graphics/pokemon/gen_2/entei/icon.png
diff --git a/graphics/pokemon/entei/normal.pal b/graphics/pokemon/gen_2/entei/normal.pal
similarity index 100%
rename from graphics/pokemon/entei/normal.pal
rename to graphics/pokemon/gen_2/entei/normal.pal
diff --git a/graphics/pokemon/entei/shiny.pal b/graphics/pokemon/gen_2/entei/shiny.pal
similarity index 100%
rename from graphics/pokemon/entei/shiny.pal
rename to graphics/pokemon/gen_2/entei/shiny.pal
diff --git a/graphics/pokemon/espeon/anim_front.png b/graphics/pokemon/gen_2/espeon/anim_front.png
similarity index 100%
rename from graphics/pokemon/espeon/anim_front.png
rename to graphics/pokemon/gen_2/espeon/anim_front.png
diff --git a/graphics/pokemon/espeon/back.png b/graphics/pokemon/gen_2/espeon/back.png
similarity index 100%
rename from graphics/pokemon/espeon/back.png
rename to graphics/pokemon/gen_2/espeon/back.png
diff --git a/graphics/pokemon/espeon/footprint.png b/graphics/pokemon/gen_2/espeon/footprint.png
similarity index 100%
rename from graphics/pokemon/espeon/footprint.png
rename to graphics/pokemon/gen_2/espeon/footprint.png
diff --git a/graphics/pokemon/espeon/icon.png b/graphics/pokemon/gen_2/espeon/icon.png
similarity index 100%
rename from graphics/pokemon/espeon/icon.png
rename to graphics/pokemon/gen_2/espeon/icon.png
diff --git a/graphics/pokemon/espeon/normal.pal b/graphics/pokemon/gen_2/espeon/normal.pal
similarity index 100%
rename from graphics/pokemon/espeon/normal.pal
rename to graphics/pokemon/gen_2/espeon/normal.pal
diff --git a/graphics/pokemon/espeon/shiny.pal b/graphics/pokemon/gen_2/espeon/shiny.pal
similarity index 100%
rename from graphics/pokemon/espeon/shiny.pal
rename to graphics/pokemon/gen_2/espeon/shiny.pal
diff --git a/graphics/pokemon/feraligatr/anim_front.png b/graphics/pokemon/gen_2/feraligatr/anim_front.png
similarity index 100%
rename from graphics/pokemon/feraligatr/anim_front.png
rename to graphics/pokemon/gen_2/feraligatr/anim_front.png
diff --git a/graphics/pokemon/feraligatr/back.png b/graphics/pokemon/gen_2/feraligatr/back.png
similarity index 100%
rename from graphics/pokemon/feraligatr/back.png
rename to graphics/pokemon/gen_2/feraligatr/back.png
diff --git a/graphics/pokemon/feraligatr/footprint.png b/graphics/pokemon/gen_2/feraligatr/footprint.png
similarity index 100%
rename from graphics/pokemon/feraligatr/footprint.png
rename to graphics/pokemon/gen_2/feraligatr/footprint.png
diff --git a/graphics/pokemon/feraligatr/icon.png b/graphics/pokemon/gen_2/feraligatr/icon.png
similarity index 100%
rename from graphics/pokemon/feraligatr/icon.png
rename to graphics/pokemon/gen_2/feraligatr/icon.png
diff --git a/graphics/pokemon/feraligatr/normal.pal b/graphics/pokemon/gen_2/feraligatr/normal.pal
similarity index 100%
rename from graphics/pokemon/feraligatr/normal.pal
rename to graphics/pokemon/gen_2/feraligatr/normal.pal
diff --git a/graphics/pokemon/feraligatr/shiny.pal b/graphics/pokemon/gen_2/feraligatr/shiny.pal
similarity index 100%
rename from graphics/pokemon/feraligatr/shiny.pal
rename to graphics/pokemon/gen_2/feraligatr/shiny.pal
diff --git a/graphics/pokemon/flaaffy/anim_front.png b/graphics/pokemon/gen_2/flaaffy/anim_front.png
similarity index 100%
rename from graphics/pokemon/flaaffy/anim_front.png
rename to graphics/pokemon/gen_2/flaaffy/anim_front.png
diff --git a/graphics/pokemon/flaaffy/back.png b/graphics/pokemon/gen_2/flaaffy/back.png
similarity index 100%
rename from graphics/pokemon/flaaffy/back.png
rename to graphics/pokemon/gen_2/flaaffy/back.png
diff --git a/graphics/pokemon/flaaffy/footprint.png b/graphics/pokemon/gen_2/flaaffy/footprint.png
similarity index 100%
rename from graphics/pokemon/flaaffy/footprint.png
rename to graphics/pokemon/gen_2/flaaffy/footprint.png
diff --git a/graphics/pokemon/flaaffy/icon.png b/graphics/pokemon/gen_2/flaaffy/icon.png
similarity index 100%
rename from graphics/pokemon/flaaffy/icon.png
rename to graphics/pokemon/gen_2/flaaffy/icon.png
diff --git a/graphics/pokemon/flaaffy/normal.pal b/graphics/pokemon/gen_2/flaaffy/normal.pal
similarity index 100%
rename from graphics/pokemon/flaaffy/normal.pal
rename to graphics/pokemon/gen_2/flaaffy/normal.pal
diff --git a/graphics/pokemon/flaaffy/shiny.pal b/graphics/pokemon/gen_2/flaaffy/shiny.pal
similarity index 100%
rename from graphics/pokemon/flaaffy/shiny.pal
rename to graphics/pokemon/gen_2/flaaffy/shiny.pal
diff --git a/graphics/pokemon/forretress/anim_front.png b/graphics/pokemon/gen_2/forretress/anim_front.png
similarity index 100%
rename from graphics/pokemon/forretress/anim_front.png
rename to graphics/pokemon/gen_2/forretress/anim_front.png
diff --git a/graphics/pokemon/forretress/back.png b/graphics/pokemon/gen_2/forretress/back.png
similarity index 100%
rename from graphics/pokemon/forretress/back.png
rename to graphics/pokemon/gen_2/forretress/back.png
diff --git a/graphics/pokemon/dhelmise/footprint.png b/graphics/pokemon/gen_2/forretress/footprint.png
similarity index 100%
rename from graphics/pokemon/dhelmise/footprint.png
rename to graphics/pokemon/gen_2/forretress/footprint.png
diff --git a/graphics/pokemon/forretress/icon.png b/graphics/pokemon/gen_2/forretress/icon.png
similarity index 100%
rename from graphics/pokemon/forretress/icon.png
rename to graphics/pokemon/gen_2/forretress/icon.png
diff --git a/graphics/pokemon/forretress/normal.pal b/graphics/pokemon/gen_2/forretress/normal.pal
similarity index 100%
rename from graphics/pokemon/forretress/normal.pal
rename to graphics/pokemon/gen_2/forretress/normal.pal
diff --git a/graphics/pokemon/forretress/shiny.pal b/graphics/pokemon/gen_2/forretress/shiny.pal
similarity index 100%
rename from graphics/pokemon/forretress/shiny.pal
rename to graphics/pokemon/gen_2/forretress/shiny.pal
diff --git a/graphics/pokemon/furret/anim_front.png b/graphics/pokemon/gen_2/furret/anim_front.png
similarity index 100%
rename from graphics/pokemon/furret/anim_front.png
rename to graphics/pokemon/gen_2/furret/anim_front.png
diff --git a/graphics/pokemon/furret/back.png b/graphics/pokemon/gen_2/furret/back.png
similarity index 100%
rename from graphics/pokemon/furret/back.png
rename to graphics/pokemon/gen_2/furret/back.png
diff --git a/graphics/pokemon/furret/footprint.png b/graphics/pokemon/gen_2/furret/footprint.png
similarity index 100%
rename from graphics/pokemon/furret/footprint.png
rename to graphics/pokemon/gen_2/furret/footprint.png
diff --git a/graphics/pokemon/furret/icon.png b/graphics/pokemon/gen_2/furret/icon.png
similarity index 100%
rename from graphics/pokemon/furret/icon.png
rename to graphics/pokemon/gen_2/furret/icon.png
diff --git a/graphics/pokemon/furret/normal.pal b/graphics/pokemon/gen_2/furret/normal.pal
similarity index 100%
rename from graphics/pokemon/furret/normal.pal
rename to graphics/pokemon/gen_2/furret/normal.pal
diff --git a/graphics/pokemon/furret/shiny.pal b/graphics/pokemon/gen_2/furret/shiny.pal
similarity index 100%
rename from graphics/pokemon/furret/shiny.pal
rename to graphics/pokemon/gen_2/furret/shiny.pal
diff --git a/graphics/pokemon/girafarig/anim_front.png b/graphics/pokemon/gen_2/girafarig/anim_front.png
similarity index 100%
rename from graphics/pokemon/girafarig/anim_front.png
rename to graphics/pokemon/gen_2/girafarig/anim_front.png
diff --git a/graphics/pokemon/girafarig/anim_frontf.png b/graphics/pokemon/gen_2/girafarig/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/girafarig/anim_frontf.png
rename to graphics/pokemon/gen_2/girafarig/anim_frontf.png
diff --git a/graphics/pokemon/girafarig/back.png b/graphics/pokemon/gen_2/girafarig/back.png
similarity index 100%
rename from graphics/pokemon/girafarig/back.png
rename to graphics/pokemon/gen_2/girafarig/back.png
diff --git a/graphics/pokemon/girafarig/backf.png b/graphics/pokemon/gen_2/girafarig/backf.png
similarity index 100%
rename from graphics/pokemon/girafarig/backf.png
rename to graphics/pokemon/gen_2/girafarig/backf.png
diff --git a/graphics/pokemon/girafarig/footprint.png b/graphics/pokemon/gen_2/girafarig/footprint.png
similarity index 100%
rename from graphics/pokemon/girafarig/footprint.png
rename to graphics/pokemon/gen_2/girafarig/footprint.png
diff --git a/graphics/pokemon/girafarig/icon.png b/graphics/pokemon/gen_2/girafarig/icon.png
similarity index 100%
rename from graphics/pokemon/girafarig/icon.png
rename to graphics/pokemon/gen_2/girafarig/icon.png
diff --git a/graphics/pokemon/girafarig/normal.pal b/graphics/pokemon/gen_2/girafarig/normal.pal
similarity index 100%
rename from graphics/pokemon/girafarig/normal.pal
rename to graphics/pokemon/gen_2/girafarig/normal.pal
diff --git a/graphics/pokemon/girafarig/shiny.pal b/graphics/pokemon/gen_2/girafarig/shiny.pal
similarity index 100%
rename from graphics/pokemon/girafarig/shiny.pal
rename to graphics/pokemon/gen_2/girafarig/shiny.pal
diff --git a/graphics/pokemon/gligar/anim_front.png b/graphics/pokemon/gen_2/gligar/anim_front.png
similarity index 100%
rename from graphics/pokemon/gligar/anim_front.png
rename to graphics/pokemon/gen_2/gligar/anim_front.png
diff --git a/graphics/pokemon/gligar/anim_frontf.png b/graphics/pokemon/gen_2/gligar/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gligar/anim_frontf.png
rename to graphics/pokemon/gen_2/gligar/anim_frontf.png
diff --git a/graphics/pokemon/gligar/back.png b/graphics/pokemon/gen_2/gligar/back.png
similarity index 100%
rename from graphics/pokemon/gligar/back.png
rename to graphics/pokemon/gen_2/gligar/back.png
diff --git a/graphics/pokemon/gligar/backf.png b/graphics/pokemon/gen_2/gligar/backf.png
similarity index 100%
rename from graphics/pokemon/gligar/backf.png
rename to graphics/pokemon/gen_2/gligar/backf.png
diff --git a/graphics/pokemon/gligar/footprint.png b/graphics/pokemon/gen_2/gligar/footprint.png
similarity index 100%
rename from graphics/pokemon/gligar/footprint.png
rename to graphics/pokemon/gen_2/gligar/footprint.png
diff --git a/graphics/pokemon/gligar/icon.png b/graphics/pokemon/gen_2/gligar/icon.png
similarity index 100%
rename from graphics/pokemon/gligar/icon.png
rename to graphics/pokemon/gen_2/gligar/icon.png
diff --git a/graphics/pokemon/gligar/normal.pal b/graphics/pokemon/gen_2/gligar/normal.pal
similarity index 100%
rename from graphics/pokemon/gligar/normal.pal
rename to graphics/pokemon/gen_2/gligar/normal.pal
diff --git a/graphics/pokemon/gligar/shiny.pal b/graphics/pokemon/gen_2/gligar/shiny.pal
similarity index 100%
rename from graphics/pokemon/gligar/shiny.pal
rename to graphics/pokemon/gen_2/gligar/shiny.pal
diff --git a/graphics/pokemon/granbull/anim_front.png b/graphics/pokemon/gen_2/granbull/anim_front.png
similarity index 100%
rename from graphics/pokemon/granbull/anim_front.png
rename to graphics/pokemon/gen_2/granbull/anim_front.png
diff --git a/graphics/pokemon/granbull/back.png b/graphics/pokemon/gen_2/granbull/back.png
similarity index 100%
rename from graphics/pokemon/granbull/back.png
rename to graphics/pokemon/gen_2/granbull/back.png
diff --git a/graphics/pokemon/granbull/footprint.png b/graphics/pokemon/gen_2/granbull/footprint.png
similarity index 100%
rename from graphics/pokemon/granbull/footprint.png
rename to graphics/pokemon/gen_2/granbull/footprint.png
diff --git a/graphics/pokemon/granbull/icon.png b/graphics/pokemon/gen_2/granbull/icon.png
similarity index 100%
rename from graphics/pokemon/granbull/icon.png
rename to graphics/pokemon/gen_2/granbull/icon.png
diff --git a/graphics/pokemon/granbull/normal.pal b/graphics/pokemon/gen_2/granbull/normal.pal
similarity index 100%
rename from graphics/pokemon/granbull/normal.pal
rename to graphics/pokemon/gen_2/granbull/normal.pal
diff --git a/graphics/pokemon/granbull/shiny.pal b/graphics/pokemon/gen_2/granbull/shiny.pal
similarity index 100%
rename from graphics/pokemon/granbull/shiny.pal
rename to graphics/pokemon/gen_2/granbull/shiny.pal
diff --git a/graphics/pokemon/heracross/anim_front.png b/graphics/pokemon/gen_2/heracross/anim_front.png
similarity index 100%
rename from graphics/pokemon/heracross/anim_front.png
rename to graphics/pokemon/gen_2/heracross/anim_front.png
diff --git a/graphics/pokemon/heracross/anim_frontf.png b/graphics/pokemon/gen_2/heracross/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/heracross/anim_frontf.png
rename to graphics/pokemon/gen_2/heracross/anim_frontf.png
diff --git a/graphics/pokemon/heracross/back.png b/graphics/pokemon/gen_2/heracross/back.png
similarity index 100%
rename from graphics/pokemon/heracross/back.png
rename to graphics/pokemon/gen_2/heracross/back.png
diff --git a/graphics/pokemon/heracross/backf.png b/graphics/pokemon/gen_2/heracross/backf.png
similarity index 100%
rename from graphics/pokemon/heracross/backf.png
rename to graphics/pokemon/gen_2/heracross/backf.png
diff --git a/graphics/pokemon/heracross/footprint.png b/graphics/pokemon/gen_2/heracross/footprint.png
similarity index 100%
rename from graphics/pokemon/heracross/footprint.png
rename to graphics/pokemon/gen_2/heracross/footprint.png
diff --git a/graphics/pokemon/heracross/icon.png b/graphics/pokemon/gen_2/heracross/icon.png
similarity index 100%
rename from graphics/pokemon/heracross/icon.png
rename to graphics/pokemon/gen_2/heracross/icon.png
diff --git a/graphics/pokemon/heracross/mega/back.png b/graphics/pokemon/gen_2/heracross/mega/back.png
similarity index 100%
rename from graphics/pokemon/heracross/mega/back.png
rename to graphics/pokemon/gen_2/heracross/mega/back.png
diff --git a/graphics/pokemon/heracross/mega/front.png b/graphics/pokemon/gen_2/heracross/mega/front.png
similarity index 100%
rename from graphics/pokemon/heracross/mega/front.png
rename to graphics/pokemon/gen_2/heracross/mega/front.png
diff --git a/graphics/pokemon/heracross/mega/icon.png b/graphics/pokemon/gen_2/heracross/mega/icon.png
similarity index 100%
rename from graphics/pokemon/heracross/mega/icon.png
rename to graphics/pokemon/gen_2/heracross/mega/icon.png
diff --git a/graphics/pokemon/heracross/mega/normal.pal b/graphics/pokemon/gen_2/heracross/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/heracross/mega/normal.pal
rename to graphics/pokemon/gen_2/heracross/mega/normal.pal
diff --git a/graphics/pokemon/heracross/mega/shiny.pal b/graphics/pokemon/gen_2/heracross/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/heracross/mega/shiny.pal
rename to graphics/pokemon/gen_2/heracross/mega/shiny.pal
diff --git a/graphics/pokemon/heracross/normal.pal b/graphics/pokemon/gen_2/heracross/normal.pal
similarity index 100%
rename from graphics/pokemon/heracross/normal.pal
rename to graphics/pokemon/gen_2/heracross/normal.pal
diff --git a/graphics/pokemon/heracross/shiny.pal b/graphics/pokemon/gen_2/heracross/shiny.pal
similarity index 100%
rename from graphics/pokemon/heracross/shiny.pal
rename to graphics/pokemon/gen_2/heracross/shiny.pal
diff --git a/graphics/pokemon/hitmontop/anim_front.png b/graphics/pokemon/gen_2/hitmontop/anim_front.png
similarity index 100%
rename from graphics/pokemon/hitmontop/anim_front.png
rename to graphics/pokemon/gen_2/hitmontop/anim_front.png
diff --git a/graphics/pokemon/hitmontop/back.png b/graphics/pokemon/gen_2/hitmontop/back.png
similarity index 100%
rename from graphics/pokemon/hitmontop/back.png
rename to graphics/pokemon/gen_2/hitmontop/back.png
diff --git a/graphics/pokemon/hitmontop/footprint.png b/graphics/pokemon/gen_2/hitmontop/footprint.png
similarity index 100%
rename from graphics/pokemon/hitmontop/footprint.png
rename to graphics/pokemon/gen_2/hitmontop/footprint.png
diff --git a/graphics/pokemon/hitmontop/icon.png b/graphics/pokemon/gen_2/hitmontop/icon.png
similarity index 100%
rename from graphics/pokemon/hitmontop/icon.png
rename to graphics/pokemon/gen_2/hitmontop/icon.png
diff --git a/graphics/pokemon/hitmontop/normal.pal b/graphics/pokemon/gen_2/hitmontop/normal.pal
similarity index 100%
rename from graphics/pokemon/hitmontop/normal.pal
rename to graphics/pokemon/gen_2/hitmontop/normal.pal
diff --git a/graphics/pokemon/hitmontop/shiny.pal b/graphics/pokemon/gen_2/hitmontop/shiny.pal
similarity index 100%
rename from graphics/pokemon/hitmontop/shiny.pal
rename to graphics/pokemon/gen_2/hitmontop/shiny.pal
diff --git a/graphics/pokemon/ho_oh/anim_front.png b/graphics/pokemon/gen_2/ho_oh/anim_front.png
similarity index 100%
rename from graphics/pokemon/ho_oh/anim_front.png
rename to graphics/pokemon/gen_2/ho_oh/anim_front.png
diff --git a/graphics/pokemon/ho_oh/back.png b/graphics/pokemon/gen_2/ho_oh/back.png
similarity index 100%
rename from graphics/pokemon/ho_oh/back.png
rename to graphics/pokemon/gen_2/ho_oh/back.png
diff --git a/graphics/pokemon/ho_oh/footprint.png b/graphics/pokemon/gen_2/ho_oh/footprint.png
similarity index 100%
rename from graphics/pokemon/ho_oh/footprint.png
rename to graphics/pokemon/gen_2/ho_oh/footprint.png
diff --git a/graphics/pokemon/ho_oh/icon.png b/graphics/pokemon/gen_2/ho_oh/icon.png
similarity index 100%
rename from graphics/pokemon/ho_oh/icon.png
rename to graphics/pokemon/gen_2/ho_oh/icon.png
diff --git a/graphics/pokemon/ho_oh/normal.pal b/graphics/pokemon/gen_2/ho_oh/normal.pal
similarity index 100%
rename from graphics/pokemon/ho_oh/normal.pal
rename to graphics/pokemon/gen_2/ho_oh/normal.pal
diff --git a/graphics/pokemon/ho_oh/shiny.pal b/graphics/pokemon/gen_2/ho_oh/shiny.pal
similarity index 100%
rename from graphics/pokemon/ho_oh/shiny.pal
rename to graphics/pokemon/gen_2/ho_oh/shiny.pal
diff --git a/graphics/pokemon/hoothoot/anim_front.png b/graphics/pokemon/gen_2/hoothoot/anim_front.png
similarity index 100%
rename from graphics/pokemon/hoothoot/anim_front.png
rename to graphics/pokemon/gen_2/hoothoot/anim_front.png
diff --git a/graphics/pokemon/hoothoot/back.png b/graphics/pokemon/gen_2/hoothoot/back.png
similarity index 100%
rename from graphics/pokemon/hoothoot/back.png
rename to graphics/pokemon/gen_2/hoothoot/back.png
diff --git a/graphics/pokemon/hoothoot/footprint.png b/graphics/pokemon/gen_2/hoothoot/footprint.png
similarity index 100%
rename from graphics/pokemon/hoothoot/footprint.png
rename to graphics/pokemon/gen_2/hoothoot/footprint.png
diff --git a/graphics/pokemon/hoothoot/icon.png b/graphics/pokemon/gen_2/hoothoot/icon.png
similarity index 100%
rename from graphics/pokemon/hoothoot/icon.png
rename to graphics/pokemon/gen_2/hoothoot/icon.png
diff --git a/graphics/pokemon/hoothoot/normal.pal b/graphics/pokemon/gen_2/hoothoot/normal.pal
similarity index 100%
rename from graphics/pokemon/hoothoot/normal.pal
rename to graphics/pokemon/gen_2/hoothoot/normal.pal
diff --git a/graphics/pokemon/hoothoot/shiny.pal b/graphics/pokemon/gen_2/hoothoot/shiny.pal
similarity index 100%
rename from graphics/pokemon/hoothoot/shiny.pal
rename to graphics/pokemon/gen_2/hoothoot/shiny.pal
diff --git a/graphics/pokemon/hoppip/anim_front.png b/graphics/pokemon/gen_2/hoppip/anim_front.png
similarity index 100%
rename from graphics/pokemon/hoppip/anim_front.png
rename to graphics/pokemon/gen_2/hoppip/anim_front.png
diff --git a/graphics/pokemon/hoppip/back.png b/graphics/pokemon/gen_2/hoppip/back.png
similarity index 100%
rename from graphics/pokemon/hoppip/back.png
rename to graphics/pokemon/gen_2/hoppip/back.png
diff --git a/graphics/pokemon/hoppip/footprint.png b/graphics/pokemon/gen_2/hoppip/footprint.png
similarity index 100%
rename from graphics/pokemon/hoppip/footprint.png
rename to graphics/pokemon/gen_2/hoppip/footprint.png
diff --git a/graphics/pokemon/hoppip/icon.png b/graphics/pokemon/gen_2/hoppip/icon.png
similarity index 100%
rename from graphics/pokemon/hoppip/icon.png
rename to graphics/pokemon/gen_2/hoppip/icon.png
diff --git a/graphics/pokemon/hoppip/normal.pal b/graphics/pokemon/gen_2/hoppip/normal.pal
similarity index 100%
rename from graphics/pokemon/hoppip/normal.pal
rename to graphics/pokemon/gen_2/hoppip/normal.pal
diff --git a/graphics/pokemon/hoppip/shiny.pal b/graphics/pokemon/gen_2/hoppip/shiny.pal
similarity index 100%
rename from graphics/pokemon/hoppip/shiny.pal
rename to graphics/pokemon/gen_2/hoppip/shiny.pal
diff --git a/graphics/pokemon/houndoom/anim_front.png b/graphics/pokemon/gen_2/houndoom/anim_front.png
similarity index 100%
rename from graphics/pokemon/houndoom/anim_front.png
rename to graphics/pokemon/gen_2/houndoom/anim_front.png
diff --git a/graphics/pokemon/houndoom/anim_frontf.png b/graphics/pokemon/gen_2/houndoom/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/houndoom/anim_frontf.png
rename to graphics/pokemon/gen_2/houndoom/anim_frontf.png
diff --git a/graphics/pokemon/houndoom/back.png b/graphics/pokemon/gen_2/houndoom/back.png
similarity index 100%
rename from graphics/pokemon/houndoom/back.png
rename to graphics/pokemon/gen_2/houndoom/back.png
diff --git a/graphics/pokemon/houndoom/backf.png b/graphics/pokemon/gen_2/houndoom/backf.png
similarity index 100%
rename from graphics/pokemon/houndoom/backf.png
rename to graphics/pokemon/gen_2/houndoom/backf.png
diff --git a/graphics/pokemon/houndoom/footprint.png b/graphics/pokemon/gen_2/houndoom/footprint.png
similarity index 100%
rename from graphics/pokemon/houndoom/footprint.png
rename to graphics/pokemon/gen_2/houndoom/footprint.png
diff --git a/graphics/pokemon/houndoom/icon.png b/graphics/pokemon/gen_2/houndoom/icon.png
similarity index 100%
rename from graphics/pokemon/houndoom/icon.png
rename to graphics/pokemon/gen_2/houndoom/icon.png
diff --git a/graphics/pokemon/houndoom/mega/back.png b/graphics/pokemon/gen_2/houndoom/mega/back.png
similarity index 100%
rename from graphics/pokemon/houndoom/mega/back.png
rename to graphics/pokemon/gen_2/houndoom/mega/back.png
diff --git a/graphics/pokemon/houndoom/mega/front.png b/graphics/pokemon/gen_2/houndoom/mega/front.png
similarity index 100%
rename from graphics/pokemon/houndoom/mega/front.png
rename to graphics/pokemon/gen_2/houndoom/mega/front.png
diff --git a/graphics/pokemon/houndoom/mega/icon.png b/graphics/pokemon/gen_2/houndoom/mega/icon.png
similarity index 100%
rename from graphics/pokemon/houndoom/mega/icon.png
rename to graphics/pokemon/gen_2/houndoom/mega/icon.png
diff --git a/graphics/pokemon/houndoom/mega/normal.pal b/graphics/pokemon/gen_2/houndoom/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/houndoom/mega/normal.pal
rename to graphics/pokemon/gen_2/houndoom/mega/normal.pal
diff --git a/graphics/pokemon/houndoom/mega/shiny.pal b/graphics/pokemon/gen_2/houndoom/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/houndoom/mega/shiny.pal
rename to graphics/pokemon/gen_2/houndoom/mega/shiny.pal
diff --git a/graphics/pokemon/houndoom/normal.pal b/graphics/pokemon/gen_2/houndoom/normal.pal
similarity index 100%
rename from graphics/pokemon/houndoom/normal.pal
rename to graphics/pokemon/gen_2/houndoom/normal.pal
diff --git a/graphics/pokemon/houndoom/shiny.pal b/graphics/pokemon/gen_2/houndoom/shiny.pal
similarity index 100%
rename from graphics/pokemon/houndoom/shiny.pal
rename to graphics/pokemon/gen_2/houndoom/shiny.pal
diff --git a/graphics/pokemon/houndour/anim_front.png b/graphics/pokemon/gen_2/houndour/anim_front.png
similarity index 100%
rename from graphics/pokemon/houndour/anim_front.png
rename to graphics/pokemon/gen_2/houndour/anim_front.png
diff --git a/graphics/pokemon/houndour/back.png b/graphics/pokemon/gen_2/houndour/back.png
similarity index 100%
rename from graphics/pokemon/houndour/back.png
rename to graphics/pokemon/gen_2/houndour/back.png
diff --git a/graphics/pokemon/houndour/footprint.png b/graphics/pokemon/gen_2/houndour/footprint.png
similarity index 100%
rename from graphics/pokemon/houndour/footprint.png
rename to graphics/pokemon/gen_2/houndour/footprint.png
diff --git a/graphics/pokemon/houndour/icon.png b/graphics/pokemon/gen_2/houndour/icon.png
similarity index 100%
rename from graphics/pokemon/houndour/icon.png
rename to graphics/pokemon/gen_2/houndour/icon.png
diff --git a/graphics/pokemon/houndour/normal.pal b/graphics/pokemon/gen_2/houndour/normal.pal
similarity index 100%
rename from graphics/pokemon/houndour/normal.pal
rename to graphics/pokemon/gen_2/houndour/normal.pal
diff --git a/graphics/pokemon/houndour/shiny.pal b/graphics/pokemon/gen_2/houndour/shiny.pal
similarity index 100%
rename from graphics/pokemon/houndour/shiny.pal
rename to graphics/pokemon/gen_2/houndour/shiny.pal
diff --git a/graphics/pokemon/igglybuff/anim_front.png b/graphics/pokemon/gen_2/igglybuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/igglybuff/anim_front.png
rename to graphics/pokemon/gen_2/igglybuff/anim_front.png
diff --git a/graphics/pokemon/igglybuff/back.png b/graphics/pokemon/gen_2/igglybuff/back.png
similarity index 100%
rename from graphics/pokemon/igglybuff/back.png
rename to graphics/pokemon/gen_2/igglybuff/back.png
diff --git a/graphics/pokemon/igglybuff/footprint.png b/graphics/pokemon/gen_2/igglybuff/footprint.png
similarity index 100%
rename from graphics/pokemon/igglybuff/footprint.png
rename to graphics/pokemon/gen_2/igglybuff/footprint.png
diff --git a/graphics/pokemon/igglybuff/icon.png b/graphics/pokemon/gen_2/igglybuff/icon.png
similarity index 100%
rename from graphics/pokemon/igglybuff/icon.png
rename to graphics/pokemon/gen_2/igglybuff/icon.png
diff --git a/graphics/pokemon/igglybuff/normal.pal b/graphics/pokemon/gen_2/igglybuff/normal.pal
similarity index 100%
rename from graphics/pokemon/igglybuff/normal.pal
rename to graphics/pokemon/gen_2/igglybuff/normal.pal
diff --git a/graphics/pokemon/igglybuff/shiny.pal b/graphics/pokemon/gen_2/igglybuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/igglybuff/shiny.pal
rename to graphics/pokemon/gen_2/igglybuff/shiny.pal
diff --git a/graphics/pokemon/jumpluff/anim_front.png b/graphics/pokemon/gen_2/jumpluff/anim_front.png
similarity index 100%
rename from graphics/pokemon/jumpluff/anim_front.png
rename to graphics/pokemon/gen_2/jumpluff/anim_front.png
diff --git a/graphics/pokemon/jumpluff/back.png b/graphics/pokemon/gen_2/jumpluff/back.png
similarity index 100%
rename from graphics/pokemon/jumpluff/back.png
rename to graphics/pokemon/gen_2/jumpluff/back.png
diff --git a/graphics/pokemon/dottler/footprint.png b/graphics/pokemon/gen_2/jumpluff/footprint.png
similarity index 100%
rename from graphics/pokemon/dottler/footprint.png
rename to graphics/pokemon/gen_2/jumpluff/footprint.png
diff --git a/graphics/pokemon/jumpluff/icon.png b/graphics/pokemon/gen_2/jumpluff/icon.png
similarity index 100%
rename from graphics/pokemon/jumpluff/icon.png
rename to graphics/pokemon/gen_2/jumpluff/icon.png
diff --git a/graphics/pokemon/jumpluff/normal.pal b/graphics/pokemon/gen_2/jumpluff/normal.pal
similarity index 100%
rename from graphics/pokemon/jumpluff/normal.pal
rename to graphics/pokemon/gen_2/jumpluff/normal.pal
diff --git a/graphics/pokemon/jumpluff/shiny.pal b/graphics/pokemon/gen_2/jumpluff/shiny.pal
similarity index 100%
rename from graphics/pokemon/jumpluff/shiny.pal
rename to graphics/pokemon/gen_2/jumpluff/shiny.pal
diff --git a/graphics/pokemon/kingdra/anim_front.png b/graphics/pokemon/gen_2/kingdra/anim_front.png
similarity index 100%
rename from graphics/pokemon/kingdra/anim_front.png
rename to graphics/pokemon/gen_2/kingdra/anim_front.png
diff --git a/graphics/pokemon/kingdra/back.png b/graphics/pokemon/gen_2/kingdra/back.png
similarity index 100%
rename from graphics/pokemon/kingdra/back.png
rename to graphics/pokemon/gen_2/kingdra/back.png
diff --git a/graphics/pokemon/diancie/footprint.png b/graphics/pokemon/gen_2/kingdra/footprint.png
similarity index 100%
rename from graphics/pokemon/diancie/footprint.png
rename to graphics/pokemon/gen_2/kingdra/footprint.png
diff --git a/graphics/pokemon/kingdra/icon.png b/graphics/pokemon/gen_2/kingdra/icon.png
similarity index 100%
rename from graphics/pokemon/kingdra/icon.png
rename to graphics/pokemon/gen_2/kingdra/icon.png
diff --git a/graphics/pokemon/kingdra/normal.pal b/graphics/pokemon/gen_2/kingdra/normal.pal
similarity index 100%
rename from graphics/pokemon/kingdra/normal.pal
rename to graphics/pokemon/gen_2/kingdra/normal.pal
diff --git a/graphics/pokemon/kingdra/shiny.pal b/graphics/pokemon/gen_2/kingdra/shiny.pal
similarity index 100%
rename from graphics/pokemon/kingdra/shiny.pal
rename to graphics/pokemon/gen_2/kingdra/shiny.pal
diff --git a/graphics/pokemon/lanturn/anim_front.png b/graphics/pokemon/gen_2/lanturn/anim_front.png
similarity index 100%
rename from graphics/pokemon/lanturn/anim_front.png
rename to graphics/pokemon/gen_2/lanturn/anim_front.png
diff --git a/graphics/pokemon/lanturn/back.png b/graphics/pokemon/gen_2/lanturn/back.png
similarity index 100%
rename from graphics/pokemon/lanturn/back.png
rename to graphics/pokemon/gen_2/lanturn/back.png
diff --git a/graphics/pokemon/diglett/footprint.png b/graphics/pokemon/gen_2/lanturn/footprint.png
similarity index 100%
rename from graphics/pokemon/diglett/footprint.png
rename to graphics/pokemon/gen_2/lanturn/footprint.png
diff --git a/graphics/pokemon/lanturn/icon.png b/graphics/pokemon/gen_2/lanturn/icon.png
similarity index 100%
rename from graphics/pokemon/lanturn/icon.png
rename to graphics/pokemon/gen_2/lanturn/icon.png
diff --git a/graphics/pokemon/lanturn/normal.pal b/graphics/pokemon/gen_2/lanturn/normal.pal
similarity index 100%
rename from graphics/pokemon/lanturn/normal.pal
rename to graphics/pokemon/gen_2/lanturn/normal.pal
diff --git a/graphics/pokemon/lanturn/shiny.pal b/graphics/pokemon/gen_2/lanturn/shiny.pal
similarity index 100%
rename from graphics/pokemon/lanturn/shiny.pal
rename to graphics/pokemon/gen_2/lanturn/shiny.pal
diff --git a/graphics/pokemon/larvitar/anim_front.png b/graphics/pokemon/gen_2/larvitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/larvitar/anim_front.png
rename to graphics/pokemon/gen_2/larvitar/anim_front.png
diff --git a/graphics/pokemon/larvitar/back.png b/graphics/pokemon/gen_2/larvitar/back.png
similarity index 100%
rename from graphics/pokemon/larvitar/back.png
rename to graphics/pokemon/gen_2/larvitar/back.png
diff --git a/graphics/pokemon/larvitar/footprint.png b/graphics/pokemon/gen_2/larvitar/footprint.png
similarity index 100%
rename from graphics/pokemon/larvitar/footprint.png
rename to graphics/pokemon/gen_2/larvitar/footprint.png
diff --git a/graphics/pokemon/larvitar/icon.png b/graphics/pokemon/gen_2/larvitar/icon.png
similarity index 100%
rename from graphics/pokemon/larvitar/icon.png
rename to graphics/pokemon/gen_2/larvitar/icon.png
diff --git a/graphics/pokemon/larvitar/normal.pal b/graphics/pokemon/gen_2/larvitar/normal.pal
similarity index 100%
rename from graphics/pokemon/larvitar/normal.pal
rename to graphics/pokemon/gen_2/larvitar/normal.pal
diff --git a/graphics/pokemon/larvitar/shiny.pal b/graphics/pokemon/gen_2/larvitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/larvitar/shiny.pal
rename to graphics/pokemon/gen_2/larvitar/shiny.pal
diff --git a/graphics/pokemon/ledian/anim_front.png b/graphics/pokemon/gen_2/ledian/anim_front.png
similarity index 100%
rename from graphics/pokemon/ledian/anim_front.png
rename to graphics/pokemon/gen_2/ledian/anim_front.png
diff --git a/graphics/pokemon/ledian/anim_frontf.png b/graphics/pokemon/gen_2/ledian/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/ledian/anim_frontf.png
rename to graphics/pokemon/gen_2/ledian/anim_frontf.png
diff --git a/graphics/pokemon/ledian/back.png b/graphics/pokemon/gen_2/ledian/back.png
similarity index 100%
rename from graphics/pokemon/ledian/back.png
rename to graphics/pokemon/gen_2/ledian/back.png
diff --git a/graphics/pokemon/ledian/backf.png b/graphics/pokemon/gen_2/ledian/backf.png
similarity index 100%
rename from graphics/pokemon/ledian/backf.png
rename to graphics/pokemon/gen_2/ledian/backf.png
diff --git a/graphics/pokemon/ledian/footprint.png b/graphics/pokemon/gen_2/ledian/footprint.png
similarity index 100%
rename from graphics/pokemon/ledian/footprint.png
rename to graphics/pokemon/gen_2/ledian/footprint.png
diff --git a/graphics/pokemon/ledian/icon.png b/graphics/pokemon/gen_2/ledian/icon.png
similarity index 100%
rename from graphics/pokemon/ledian/icon.png
rename to graphics/pokemon/gen_2/ledian/icon.png
diff --git a/graphics/pokemon/ledian/normal.pal b/graphics/pokemon/gen_2/ledian/normal.pal
similarity index 100%
rename from graphics/pokemon/ledian/normal.pal
rename to graphics/pokemon/gen_2/ledian/normal.pal
diff --git a/graphics/pokemon/ledian/shiny.pal b/graphics/pokemon/gen_2/ledian/shiny.pal
similarity index 100%
rename from graphics/pokemon/ledian/shiny.pal
rename to graphics/pokemon/gen_2/ledian/shiny.pal
diff --git a/graphics/pokemon/ledyba/anim_front.png b/graphics/pokemon/gen_2/ledyba/anim_front.png
similarity index 100%
rename from graphics/pokemon/ledyba/anim_front.png
rename to graphics/pokemon/gen_2/ledyba/anim_front.png
diff --git a/graphics/pokemon/ledyba/anim_frontf.png b/graphics/pokemon/gen_2/ledyba/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/ledyba/anim_frontf.png
rename to graphics/pokemon/gen_2/ledyba/anim_frontf.png
diff --git a/graphics/pokemon/ledyba/back.png b/graphics/pokemon/gen_2/ledyba/back.png
similarity index 100%
rename from graphics/pokemon/ledyba/back.png
rename to graphics/pokemon/gen_2/ledyba/back.png
diff --git a/graphics/pokemon/ledyba/backf.png b/graphics/pokemon/gen_2/ledyba/backf.png
similarity index 100%
rename from graphics/pokemon/ledyba/backf.png
rename to graphics/pokemon/gen_2/ledyba/backf.png
diff --git a/graphics/pokemon/ledyba/footprint.png b/graphics/pokemon/gen_2/ledyba/footprint.png
similarity index 100%
rename from graphics/pokemon/ledyba/footprint.png
rename to graphics/pokemon/gen_2/ledyba/footprint.png
diff --git a/graphics/pokemon/ledyba/icon.png b/graphics/pokemon/gen_2/ledyba/icon.png
similarity index 100%
rename from graphics/pokemon/ledyba/icon.png
rename to graphics/pokemon/gen_2/ledyba/icon.png
diff --git a/graphics/pokemon/ledyba/normal.pal b/graphics/pokemon/gen_2/ledyba/normal.pal
similarity index 100%
rename from graphics/pokemon/ledyba/normal.pal
rename to graphics/pokemon/gen_2/ledyba/normal.pal
diff --git a/graphics/pokemon/ledyba/shiny.pal b/graphics/pokemon/gen_2/ledyba/shiny.pal
similarity index 100%
rename from graphics/pokemon/ledyba/shiny.pal
rename to graphics/pokemon/gen_2/ledyba/shiny.pal
diff --git a/graphics/pokemon/lugia/anim_front.png b/graphics/pokemon/gen_2/lugia/anim_front.png
similarity index 100%
rename from graphics/pokemon/lugia/anim_front.png
rename to graphics/pokemon/gen_2/lugia/anim_front.png
diff --git a/graphics/pokemon/lugia/back.png b/graphics/pokemon/gen_2/lugia/back.png
similarity index 100%
rename from graphics/pokemon/lugia/back.png
rename to graphics/pokemon/gen_2/lugia/back.png
diff --git a/graphics/pokemon/lugia/footprint.png b/graphics/pokemon/gen_2/lugia/footprint.png
similarity index 100%
rename from graphics/pokemon/lugia/footprint.png
rename to graphics/pokemon/gen_2/lugia/footprint.png
diff --git a/graphics/pokemon/lugia/icon.png b/graphics/pokemon/gen_2/lugia/icon.png
similarity index 100%
rename from graphics/pokemon/lugia/icon.png
rename to graphics/pokemon/gen_2/lugia/icon.png
diff --git a/graphics/pokemon/lugia/normal.pal b/graphics/pokemon/gen_2/lugia/normal.pal
similarity index 100%
rename from graphics/pokemon/lugia/normal.pal
rename to graphics/pokemon/gen_2/lugia/normal.pal
diff --git a/graphics/pokemon/lugia/shiny.pal b/graphics/pokemon/gen_2/lugia/shiny.pal
similarity index 100%
rename from graphics/pokemon/lugia/shiny.pal
rename to graphics/pokemon/gen_2/lugia/shiny.pal
diff --git a/graphics/pokemon/magby/anim_front.png b/graphics/pokemon/gen_2/magby/anim_front.png
similarity index 100%
rename from graphics/pokemon/magby/anim_front.png
rename to graphics/pokemon/gen_2/magby/anim_front.png
diff --git a/graphics/pokemon/magby/back.png b/graphics/pokemon/gen_2/magby/back.png
similarity index 100%
rename from graphics/pokemon/magby/back.png
rename to graphics/pokemon/gen_2/magby/back.png
diff --git a/graphics/pokemon/magby/footprint.png b/graphics/pokemon/gen_2/magby/footprint.png
similarity index 100%
rename from graphics/pokemon/magby/footprint.png
rename to graphics/pokemon/gen_2/magby/footprint.png
diff --git a/graphics/pokemon/magby/icon.png b/graphics/pokemon/gen_2/magby/icon.png
similarity index 100%
rename from graphics/pokemon/magby/icon.png
rename to graphics/pokemon/gen_2/magby/icon.png
diff --git a/graphics/pokemon/magby/normal.pal b/graphics/pokemon/gen_2/magby/normal.pal
similarity index 100%
rename from graphics/pokemon/magby/normal.pal
rename to graphics/pokemon/gen_2/magby/normal.pal
diff --git a/graphics/pokemon/magby/shiny.pal b/graphics/pokemon/gen_2/magby/shiny.pal
similarity index 100%
rename from graphics/pokemon/magby/shiny.pal
rename to graphics/pokemon/gen_2/magby/shiny.pal
diff --git a/graphics/pokemon/magcargo/anim_front.png b/graphics/pokemon/gen_2/magcargo/anim_front.png
similarity index 100%
rename from graphics/pokemon/magcargo/anim_front.png
rename to graphics/pokemon/gen_2/magcargo/anim_front.png
diff --git a/graphics/pokemon/magcargo/back.png b/graphics/pokemon/gen_2/magcargo/back.png
similarity index 100%
rename from graphics/pokemon/magcargo/back.png
rename to graphics/pokemon/gen_2/magcargo/back.png
diff --git a/graphics/pokemon/ditto/footprint.png b/graphics/pokemon/gen_2/magcargo/footprint.png
similarity index 100%
rename from graphics/pokemon/ditto/footprint.png
rename to graphics/pokemon/gen_2/magcargo/footprint.png
diff --git a/graphics/pokemon/magcargo/icon.png b/graphics/pokemon/gen_2/magcargo/icon.png
similarity index 100%
rename from graphics/pokemon/magcargo/icon.png
rename to graphics/pokemon/gen_2/magcargo/icon.png
diff --git a/graphics/pokemon/magcargo/normal.pal b/graphics/pokemon/gen_2/magcargo/normal.pal
similarity index 100%
rename from graphics/pokemon/magcargo/normal.pal
rename to graphics/pokemon/gen_2/magcargo/normal.pal
diff --git a/graphics/pokemon/magcargo/shiny.pal b/graphics/pokemon/gen_2/magcargo/shiny.pal
similarity index 100%
rename from graphics/pokemon/magcargo/shiny.pal
rename to graphics/pokemon/gen_2/magcargo/shiny.pal
diff --git a/graphics/pokemon/mantine/anim_front.png b/graphics/pokemon/gen_2/mantine/anim_front.png
similarity index 100%
rename from graphics/pokemon/mantine/anim_front.png
rename to graphics/pokemon/gen_2/mantine/anim_front.png
diff --git a/graphics/pokemon/mantine/back.png b/graphics/pokemon/gen_2/mantine/back.png
similarity index 100%
rename from graphics/pokemon/mantine/back.png
rename to graphics/pokemon/gen_2/mantine/back.png
diff --git a/graphics/pokemon/doublade/footprint.png b/graphics/pokemon/gen_2/mantine/footprint.png
similarity index 100%
rename from graphics/pokemon/doublade/footprint.png
rename to graphics/pokemon/gen_2/mantine/footprint.png
diff --git a/graphics/pokemon/mantine/icon.png b/graphics/pokemon/gen_2/mantine/icon.png
similarity index 100%
rename from graphics/pokemon/mantine/icon.png
rename to graphics/pokemon/gen_2/mantine/icon.png
diff --git a/graphics/pokemon/mantine/normal.pal b/graphics/pokemon/gen_2/mantine/normal.pal
similarity index 100%
rename from graphics/pokemon/mantine/normal.pal
rename to graphics/pokemon/gen_2/mantine/normal.pal
diff --git a/graphics/pokemon/mantine/shiny.pal b/graphics/pokemon/gen_2/mantine/shiny.pal
similarity index 100%
rename from graphics/pokemon/mantine/shiny.pal
rename to graphics/pokemon/gen_2/mantine/shiny.pal
diff --git a/graphics/pokemon/mareep/anim_front.png b/graphics/pokemon/gen_2/mareep/anim_front.png
similarity index 100%
rename from graphics/pokemon/mareep/anim_front.png
rename to graphics/pokemon/gen_2/mareep/anim_front.png
diff --git a/graphics/pokemon/mareep/back.png b/graphics/pokemon/gen_2/mareep/back.png
similarity index 100%
rename from graphics/pokemon/mareep/back.png
rename to graphics/pokemon/gen_2/mareep/back.png
diff --git a/graphics/pokemon/mareep/footprint.png b/graphics/pokemon/gen_2/mareep/footprint.png
similarity index 100%
rename from graphics/pokemon/mareep/footprint.png
rename to graphics/pokemon/gen_2/mareep/footprint.png
diff --git a/graphics/pokemon/mareep/icon.png b/graphics/pokemon/gen_2/mareep/icon.png
similarity index 100%
rename from graphics/pokemon/mareep/icon.png
rename to graphics/pokemon/gen_2/mareep/icon.png
diff --git a/graphics/pokemon/mareep/normal.pal b/graphics/pokemon/gen_2/mareep/normal.pal
similarity index 100%
rename from graphics/pokemon/mareep/normal.pal
rename to graphics/pokemon/gen_2/mareep/normal.pal
diff --git a/graphics/pokemon/mareep/shiny.pal b/graphics/pokemon/gen_2/mareep/shiny.pal
similarity index 100%
rename from graphics/pokemon/mareep/shiny.pal
rename to graphics/pokemon/gen_2/mareep/shiny.pal
diff --git a/graphics/pokemon/marill/anim_front.png b/graphics/pokemon/gen_2/marill/anim_front.png
similarity index 100%
rename from graphics/pokemon/marill/anim_front.png
rename to graphics/pokemon/gen_2/marill/anim_front.png
diff --git a/graphics/pokemon/marill/back.png b/graphics/pokemon/gen_2/marill/back.png
similarity index 100%
rename from graphics/pokemon/marill/back.png
rename to graphics/pokemon/gen_2/marill/back.png
diff --git a/graphics/pokemon/marill/footprint.png b/graphics/pokemon/gen_2/marill/footprint.png
similarity index 100%
rename from graphics/pokemon/marill/footprint.png
rename to graphics/pokemon/gen_2/marill/footprint.png
diff --git a/graphics/pokemon/marill/icon.png b/graphics/pokemon/gen_2/marill/icon.png
similarity index 100%
rename from graphics/pokemon/marill/icon.png
rename to graphics/pokemon/gen_2/marill/icon.png
diff --git a/graphics/pokemon/marill/normal.pal b/graphics/pokemon/gen_2/marill/normal.pal
similarity index 100%
rename from graphics/pokemon/marill/normal.pal
rename to graphics/pokemon/gen_2/marill/normal.pal
diff --git a/graphics/pokemon/marill/shiny.pal b/graphics/pokemon/gen_2/marill/shiny.pal
similarity index 100%
rename from graphics/pokemon/marill/shiny.pal
rename to graphics/pokemon/gen_2/marill/shiny.pal
diff --git a/graphics/pokemon/meganium/anim_front.png b/graphics/pokemon/gen_2/meganium/anim_front.png
similarity index 100%
rename from graphics/pokemon/meganium/anim_front.png
rename to graphics/pokemon/gen_2/meganium/anim_front.png
diff --git a/graphics/pokemon/meganium/anim_frontf.png b/graphics/pokemon/gen_2/meganium/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/meganium/anim_frontf.png
rename to graphics/pokemon/gen_2/meganium/anim_frontf.png
diff --git a/graphics/pokemon/meganium/back.png b/graphics/pokemon/gen_2/meganium/back.png
similarity index 100%
rename from graphics/pokemon/meganium/back.png
rename to graphics/pokemon/gen_2/meganium/back.png
diff --git a/graphics/pokemon/meganium/backf.png b/graphics/pokemon/gen_2/meganium/backf.png
similarity index 100%
rename from graphics/pokemon/meganium/backf.png
rename to graphics/pokemon/gen_2/meganium/backf.png
diff --git a/graphics/pokemon/meganium/footprint.png b/graphics/pokemon/gen_2/meganium/footprint.png
similarity index 100%
rename from graphics/pokemon/meganium/footprint.png
rename to graphics/pokemon/gen_2/meganium/footprint.png
diff --git a/graphics/pokemon/meganium/icon.png b/graphics/pokemon/gen_2/meganium/icon.png
similarity index 100%
rename from graphics/pokemon/meganium/icon.png
rename to graphics/pokemon/gen_2/meganium/icon.png
diff --git a/graphics/pokemon/meganium/normal.pal b/graphics/pokemon/gen_2/meganium/normal.pal
similarity index 100%
rename from graphics/pokemon/meganium/normal.pal
rename to graphics/pokemon/gen_2/meganium/normal.pal
diff --git a/graphics/pokemon/meganium/shiny.pal b/graphics/pokemon/gen_2/meganium/shiny.pal
similarity index 100%
rename from graphics/pokemon/meganium/shiny.pal
rename to graphics/pokemon/gen_2/meganium/shiny.pal
diff --git a/graphics/pokemon/miltank/anim_front.png b/graphics/pokemon/gen_2/miltank/anim_front.png
similarity index 100%
rename from graphics/pokemon/miltank/anim_front.png
rename to graphics/pokemon/gen_2/miltank/anim_front.png
diff --git a/graphics/pokemon/miltank/back.png b/graphics/pokemon/gen_2/miltank/back.png
similarity index 100%
rename from graphics/pokemon/miltank/back.png
rename to graphics/pokemon/gen_2/miltank/back.png
diff --git a/graphics/pokemon/miltank/footprint.png b/graphics/pokemon/gen_2/miltank/footprint.png
similarity index 100%
rename from graphics/pokemon/miltank/footprint.png
rename to graphics/pokemon/gen_2/miltank/footprint.png
diff --git a/graphics/pokemon/miltank/icon.png b/graphics/pokemon/gen_2/miltank/icon.png
similarity index 100%
rename from graphics/pokemon/miltank/icon.png
rename to graphics/pokemon/gen_2/miltank/icon.png
diff --git a/graphics/pokemon/miltank/normal.pal b/graphics/pokemon/gen_2/miltank/normal.pal
similarity index 100%
rename from graphics/pokemon/miltank/normal.pal
rename to graphics/pokemon/gen_2/miltank/normal.pal
diff --git a/graphics/pokemon/miltank/shiny.pal b/graphics/pokemon/gen_2/miltank/shiny.pal
similarity index 100%
rename from graphics/pokemon/miltank/shiny.pal
rename to graphics/pokemon/gen_2/miltank/shiny.pal
diff --git a/graphics/pokemon/misdreavus/anim_front.png b/graphics/pokemon/gen_2/misdreavus/anim_front.png
similarity index 100%
rename from graphics/pokemon/misdreavus/anim_front.png
rename to graphics/pokemon/gen_2/misdreavus/anim_front.png
diff --git a/graphics/pokemon/misdreavus/back.png b/graphics/pokemon/gen_2/misdreavus/back.png
similarity index 100%
rename from graphics/pokemon/misdreavus/back.png
rename to graphics/pokemon/gen_2/misdreavus/back.png
diff --git a/graphics/pokemon/dragalge/footprint.png b/graphics/pokemon/gen_2/misdreavus/footprint.png
similarity index 100%
rename from graphics/pokemon/dragalge/footprint.png
rename to graphics/pokemon/gen_2/misdreavus/footprint.png
diff --git a/graphics/pokemon/misdreavus/icon.png b/graphics/pokemon/gen_2/misdreavus/icon.png
similarity index 100%
rename from graphics/pokemon/misdreavus/icon.png
rename to graphics/pokemon/gen_2/misdreavus/icon.png
diff --git a/graphics/pokemon/misdreavus/normal.pal b/graphics/pokemon/gen_2/misdreavus/normal.pal
similarity index 100%
rename from graphics/pokemon/misdreavus/normal.pal
rename to graphics/pokemon/gen_2/misdreavus/normal.pal
diff --git a/graphics/pokemon/misdreavus/shiny.pal b/graphics/pokemon/gen_2/misdreavus/shiny.pal
similarity index 100%
rename from graphics/pokemon/misdreavus/shiny.pal
rename to graphics/pokemon/gen_2/misdreavus/shiny.pal
diff --git a/graphics/pokemon/murkrow/anim_front.png b/graphics/pokemon/gen_2/murkrow/anim_front.png
similarity index 100%
rename from graphics/pokemon/murkrow/anim_front.png
rename to graphics/pokemon/gen_2/murkrow/anim_front.png
diff --git a/graphics/pokemon/murkrow/anim_frontf.png b/graphics/pokemon/gen_2/murkrow/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/murkrow/anim_frontf.png
rename to graphics/pokemon/gen_2/murkrow/anim_frontf.png
diff --git a/graphics/pokemon/murkrow/back.png b/graphics/pokemon/gen_2/murkrow/back.png
similarity index 100%
rename from graphics/pokemon/murkrow/back.png
rename to graphics/pokemon/gen_2/murkrow/back.png
diff --git a/graphics/pokemon/murkrow/backf.png b/graphics/pokemon/gen_2/murkrow/backf.png
similarity index 100%
rename from graphics/pokemon/murkrow/backf.png
rename to graphics/pokemon/gen_2/murkrow/backf.png
diff --git a/graphics/pokemon/murkrow/footprint.png b/graphics/pokemon/gen_2/murkrow/footprint.png
similarity index 100%
rename from graphics/pokemon/murkrow/footprint.png
rename to graphics/pokemon/gen_2/murkrow/footprint.png
diff --git a/graphics/pokemon/murkrow/icon.png b/graphics/pokemon/gen_2/murkrow/icon.png
similarity index 100%
rename from graphics/pokemon/murkrow/icon.png
rename to graphics/pokemon/gen_2/murkrow/icon.png
diff --git a/graphics/pokemon/murkrow/normal.pal b/graphics/pokemon/gen_2/murkrow/normal.pal
similarity index 100%
rename from graphics/pokemon/murkrow/normal.pal
rename to graphics/pokemon/gen_2/murkrow/normal.pal
diff --git a/graphics/pokemon/murkrow/shiny.pal b/graphics/pokemon/gen_2/murkrow/shiny.pal
similarity index 100%
rename from graphics/pokemon/murkrow/shiny.pal
rename to graphics/pokemon/gen_2/murkrow/shiny.pal
diff --git a/graphics/pokemon/natu/anim_front.png b/graphics/pokemon/gen_2/natu/anim_front.png
similarity index 100%
rename from graphics/pokemon/natu/anim_front.png
rename to graphics/pokemon/gen_2/natu/anim_front.png
diff --git a/graphics/pokemon/natu/back.png b/graphics/pokemon/gen_2/natu/back.png
similarity index 100%
rename from graphics/pokemon/natu/back.png
rename to graphics/pokemon/gen_2/natu/back.png
diff --git a/graphics/pokemon/natu/footprint.png b/graphics/pokemon/gen_2/natu/footprint.png
similarity index 100%
rename from graphics/pokemon/natu/footprint.png
rename to graphics/pokemon/gen_2/natu/footprint.png
diff --git a/graphics/pokemon/natu/icon.png b/graphics/pokemon/gen_2/natu/icon.png
similarity index 100%
rename from graphics/pokemon/natu/icon.png
rename to graphics/pokemon/gen_2/natu/icon.png
diff --git a/graphics/pokemon/natu/normal.pal b/graphics/pokemon/gen_2/natu/normal.pal
similarity index 100%
rename from graphics/pokemon/natu/normal.pal
rename to graphics/pokemon/gen_2/natu/normal.pal
diff --git a/graphics/pokemon/natu/shiny.pal b/graphics/pokemon/gen_2/natu/shiny.pal
similarity index 100%
rename from graphics/pokemon/natu/shiny.pal
rename to graphics/pokemon/gen_2/natu/shiny.pal
diff --git a/graphics/pokemon/noctowl/anim_front.png b/graphics/pokemon/gen_2/noctowl/anim_front.png
similarity index 100%
rename from graphics/pokemon/noctowl/anim_front.png
rename to graphics/pokemon/gen_2/noctowl/anim_front.png
diff --git a/graphics/pokemon/noctowl/back.png b/graphics/pokemon/gen_2/noctowl/back.png
similarity index 100%
rename from graphics/pokemon/noctowl/back.png
rename to graphics/pokemon/gen_2/noctowl/back.png
diff --git a/graphics/pokemon/noctowl/footprint.png b/graphics/pokemon/gen_2/noctowl/footprint.png
similarity index 100%
rename from graphics/pokemon/noctowl/footprint.png
rename to graphics/pokemon/gen_2/noctowl/footprint.png
diff --git a/graphics/pokemon/noctowl/icon.png b/graphics/pokemon/gen_2/noctowl/icon.png
similarity index 100%
rename from graphics/pokemon/noctowl/icon.png
rename to graphics/pokemon/gen_2/noctowl/icon.png
diff --git a/graphics/pokemon/noctowl/normal.pal b/graphics/pokemon/gen_2/noctowl/normal.pal
similarity index 100%
rename from graphics/pokemon/noctowl/normal.pal
rename to graphics/pokemon/gen_2/noctowl/normal.pal
diff --git a/graphics/pokemon/noctowl/shiny.pal b/graphics/pokemon/gen_2/noctowl/shiny.pal
similarity index 100%
rename from graphics/pokemon/noctowl/shiny.pal
rename to graphics/pokemon/gen_2/noctowl/shiny.pal
diff --git a/graphics/pokemon/octillery/anim_front.png b/graphics/pokemon/gen_2/octillery/anim_front.png
similarity index 100%
rename from graphics/pokemon/octillery/anim_front.png
rename to graphics/pokemon/gen_2/octillery/anim_front.png
diff --git a/graphics/pokemon/octillery/anim_frontf.png b/graphics/pokemon/gen_2/octillery/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/octillery/anim_frontf.png
rename to graphics/pokemon/gen_2/octillery/anim_frontf.png
diff --git a/graphics/pokemon/octillery/back.png b/graphics/pokemon/gen_2/octillery/back.png
similarity index 100%
rename from graphics/pokemon/octillery/back.png
rename to graphics/pokemon/gen_2/octillery/back.png
diff --git a/graphics/pokemon/octillery/backf.png b/graphics/pokemon/gen_2/octillery/backf.png
similarity index 100%
rename from graphics/pokemon/octillery/backf.png
rename to graphics/pokemon/gen_2/octillery/backf.png
diff --git a/graphics/pokemon/grapploct/footprint.png b/graphics/pokemon/gen_2/octillery/footprint.png
similarity index 100%
rename from graphics/pokemon/grapploct/footprint.png
rename to graphics/pokemon/gen_2/octillery/footprint.png
diff --git a/graphics/pokemon/octillery/icon.png b/graphics/pokemon/gen_2/octillery/icon.png
similarity index 100%
rename from graphics/pokemon/octillery/icon.png
rename to graphics/pokemon/gen_2/octillery/icon.png
diff --git a/graphics/pokemon/octillery/normal.pal b/graphics/pokemon/gen_2/octillery/normal.pal
similarity index 100%
rename from graphics/pokemon/octillery/normal.pal
rename to graphics/pokemon/gen_2/octillery/normal.pal
diff --git a/graphics/pokemon/octillery/shiny.pal b/graphics/pokemon/gen_2/octillery/shiny.pal
similarity index 100%
rename from graphics/pokemon/octillery/shiny.pal
rename to graphics/pokemon/gen_2/octillery/shiny.pal
diff --git a/graphics/pokemon/phanpy/anim_front.png b/graphics/pokemon/gen_2/phanpy/anim_front.png
similarity index 100%
rename from graphics/pokemon/phanpy/anim_front.png
rename to graphics/pokemon/gen_2/phanpy/anim_front.png
diff --git a/graphics/pokemon/phanpy/back.png b/graphics/pokemon/gen_2/phanpy/back.png
similarity index 100%
rename from graphics/pokemon/phanpy/back.png
rename to graphics/pokemon/gen_2/phanpy/back.png
diff --git a/graphics/pokemon/phanpy/footprint.png b/graphics/pokemon/gen_2/phanpy/footprint.png
similarity index 100%
rename from graphics/pokemon/phanpy/footprint.png
rename to graphics/pokemon/gen_2/phanpy/footprint.png
diff --git a/graphics/pokemon/phanpy/icon.png b/graphics/pokemon/gen_2/phanpy/icon.png
similarity index 100%
rename from graphics/pokemon/phanpy/icon.png
rename to graphics/pokemon/gen_2/phanpy/icon.png
diff --git a/graphics/pokemon/phanpy/normal.pal b/graphics/pokemon/gen_2/phanpy/normal.pal
similarity index 100%
rename from graphics/pokemon/phanpy/normal.pal
rename to graphics/pokemon/gen_2/phanpy/normal.pal
diff --git a/graphics/pokemon/phanpy/shiny.pal b/graphics/pokemon/gen_2/phanpy/shiny.pal
similarity index 100%
rename from graphics/pokemon/phanpy/shiny.pal
rename to graphics/pokemon/gen_2/phanpy/shiny.pal
diff --git a/graphics/pokemon/pichu/anim_front.png b/graphics/pokemon/gen_2/pichu/anim_front.png
similarity index 100%
rename from graphics/pokemon/pichu/anim_front.png
rename to graphics/pokemon/gen_2/pichu/anim_front.png
diff --git a/graphics/pokemon/pichu/back.png b/graphics/pokemon/gen_2/pichu/back.png
similarity index 100%
rename from graphics/pokemon/pichu/back.png
rename to graphics/pokemon/gen_2/pichu/back.png
diff --git a/graphics/pokemon/pichu/footprint.png b/graphics/pokemon/gen_2/pichu/footprint.png
similarity index 100%
rename from graphics/pokemon/pichu/footprint.png
rename to graphics/pokemon/gen_2/pichu/footprint.png
diff --git a/graphics/pokemon/pichu/icon.png b/graphics/pokemon/gen_2/pichu/icon.png
similarity index 100%
rename from graphics/pokemon/pichu/icon.png
rename to graphics/pokemon/gen_2/pichu/icon.png
diff --git a/graphics/pokemon/pichu/normal.pal b/graphics/pokemon/gen_2/pichu/normal.pal
similarity index 100%
rename from graphics/pokemon/pichu/normal.pal
rename to graphics/pokemon/gen_2/pichu/normal.pal
diff --git a/graphics/pokemon/pichu/shiny.pal b/graphics/pokemon/gen_2/pichu/shiny.pal
similarity index 100%
rename from graphics/pokemon/pichu/shiny.pal
rename to graphics/pokemon/gen_2/pichu/shiny.pal
diff --git a/graphics/pokemon/pichu/spiky_eared/anim_front.png b/graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.png
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/anim_front.png
rename to graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.png
diff --git a/graphics/pokemon/pichu/spiky_eared/back.png b/graphics/pokemon/gen_2/pichu/spiky_eared/back.png
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/back.png
rename to graphics/pokemon/gen_2/pichu/spiky_eared/back.png
diff --git a/graphics/pokemon/pichu/spiky_eared/front.png b/graphics/pokemon/gen_2/pichu/spiky_eared/front.png
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/front.png
rename to graphics/pokemon/gen_2/pichu/spiky_eared/front.png
diff --git a/graphics/pokemon/pichu/spiky_eared/icon.png b/graphics/pokemon/gen_2/pichu/spiky_eared/icon.png
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/icon.png
rename to graphics/pokemon/gen_2/pichu/spiky_eared/icon.png
diff --git a/graphics/pokemon/pichu/spiky_eared/normal.pal b/graphics/pokemon/gen_2/pichu/spiky_eared/normal.pal
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/normal.pal
rename to graphics/pokemon/gen_2/pichu/spiky_eared/normal.pal
diff --git a/graphics/pokemon/pichu/spiky_eared/shiny.pal b/graphics/pokemon/gen_2/pichu/spiky_eared/shiny.pal
similarity index 100%
rename from graphics/pokemon/pichu/spiky_eared/shiny.pal
rename to graphics/pokemon/gen_2/pichu/spiky_eared/shiny.pal
diff --git a/graphics/pokemon/piloswine/anim_front.png b/graphics/pokemon/gen_2/piloswine/anim_front.png
similarity index 100%
rename from graphics/pokemon/piloswine/anim_front.png
rename to graphics/pokemon/gen_2/piloswine/anim_front.png
diff --git a/graphics/pokemon/piloswine/anim_frontf.png b/graphics/pokemon/gen_2/piloswine/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/piloswine/anim_frontf.png
rename to graphics/pokemon/gen_2/piloswine/anim_frontf.png
diff --git a/graphics/pokemon/piloswine/back.png b/graphics/pokemon/gen_2/piloswine/back.png
similarity index 100%
rename from graphics/pokemon/piloswine/back.png
rename to graphics/pokemon/gen_2/piloswine/back.png
diff --git a/graphics/pokemon/piloswine/backf.png b/graphics/pokemon/gen_2/piloswine/backf.png
similarity index 100%
rename from graphics/pokemon/piloswine/backf.png
rename to graphics/pokemon/gen_2/piloswine/backf.png
diff --git a/graphics/pokemon/piloswine/footprint.png b/graphics/pokemon/gen_2/piloswine/footprint.png
similarity index 100%
rename from graphics/pokemon/piloswine/footprint.png
rename to graphics/pokemon/gen_2/piloswine/footprint.png
diff --git a/graphics/pokemon/piloswine/icon.png b/graphics/pokemon/gen_2/piloswine/icon.png
similarity index 100%
rename from graphics/pokemon/piloswine/icon.png
rename to graphics/pokemon/gen_2/piloswine/icon.png
diff --git a/graphics/pokemon/piloswine/normal.pal b/graphics/pokemon/gen_2/piloswine/normal.pal
similarity index 100%
rename from graphics/pokemon/piloswine/normal.pal
rename to graphics/pokemon/gen_2/piloswine/normal.pal
diff --git a/graphics/pokemon/piloswine/shiny.pal b/graphics/pokemon/gen_2/piloswine/shiny.pal
similarity index 100%
rename from graphics/pokemon/piloswine/shiny.pal
rename to graphics/pokemon/gen_2/piloswine/shiny.pal
diff --git a/graphics/pokemon/pineco/anim_front.png b/graphics/pokemon/gen_2/pineco/anim_front.png
similarity index 100%
rename from graphics/pokemon/pineco/anim_front.png
rename to graphics/pokemon/gen_2/pineco/anim_front.png
diff --git a/graphics/pokemon/pineco/back.png b/graphics/pokemon/gen_2/pineco/back.png
similarity index 100%
rename from graphics/pokemon/pineco/back.png
rename to graphics/pokemon/gen_2/pineco/back.png
diff --git a/graphics/pokemon/dragonair/footprint.png b/graphics/pokemon/gen_2/pineco/footprint.png
similarity index 100%
rename from graphics/pokemon/dragonair/footprint.png
rename to graphics/pokemon/gen_2/pineco/footprint.png
diff --git a/graphics/pokemon/pineco/icon.png b/graphics/pokemon/gen_2/pineco/icon.png
similarity index 100%
rename from graphics/pokemon/pineco/icon.png
rename to graphics/pokemon/gen_2/pineco/icon.png
diff --git a/graphics/pokemon/pineco/normal.pal b/graphics/pokemon/gen_2/pineco/normal.pal
similarity index 100%
rename from graphics/pokemon/pineco/normal.pal
rename to graphics/pokemon/gen_2/pineco/normal.pal
diff --git a/graphics/pokemon/pineco/shiny.pal b/graphics/pokemon/gen_2/pineco/shiny.pal
similarity index 100%
rename from graphics/pokemon/pineco/shiny.pal
rename to graphics/pokemon/gen_2/pineco/shiny.pal
diff --git a/graphics/pokemon/politoed/anim_front.png b/graphics/pokemon/gen_2/politoed/anim_front.png
similarity index 100%
rename from graphics/pokemon/politoed/anim_front.png
rename to graphics/pokemon/gen_2/politoed/anim_front.png
diff --git a/graphics/pokemon/politoed/anim_frontf.png b/graphics/pokemon/gen_2/politoed/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/politoed/anim_frontf.png
rename to graphics/pokemon/gen_2/politoed/anim_frontf.png
diff --git a/graphics/pokemon/politoed/back.png b/graphics/pokemon/gen_2/politoed/back.png
similarity index 100%
rename from graphics/pokemon/politoed/back.png
rename to graphics/pokemon/gen_2/politoed/back.png
diff --git a/graphics/pokemon/politoed/backf.png b/graphics/pokemon/gen_2/politoed/backf.png
similarity index 100%
rename from graphics/pokemon/politoed/backf.png
rename to graphics/pokemon/gen_2/politoed/backf.png
diff --git a/graphics/pokemon/politoed/footprint.png b/graphics/pokemon/gen_2/politoed/footprint.png
similarity index 100%
rename from graphics/pokemon/politoed/footprint.png
rename to graphics/pokemon/gen_2/politoed/footprint.png
diff --git a/graphics/pokemon/politoed/icon.png b/graphics/pokemon/gen_2/politoed/icon.png
similarity index 100%
rename from graphics/pokemon/politoed/icon.png
rename to graphics/pokemon/gen_2/politoed/icon.png
diff --git a/graphics/pokemon/politoed/normal.pal b/graphics/pokemon/gen_2/politoed/normal.pal
similarity index 100%
rename from graphics/pokemon/politoed/normal.pal
rename to graphics/pokemon/gen_2/politoed/normal.pal
diff --git a/graphics/pokemon/politoed/shiny.pal b/graphics/pokemon/gen_2/politoed/shiny.pal
similarity index 100%
rename from graphics/pokemon/politoed/shiny.pal
rename to graphics/pokemon/gen_2/politoed/shiny.pal
diff --git a/graphics/pokemon/porygon2/anim_front.png b/graphics/pokemon/gen_2/porygon2/anim_front.png
similarity index 100%
rename from graphics/pokemon/porygon2/anim_front.png
rename to graphics/pokemon/gen_2/porygon2/anim_front.png
diff --git a/graphics/pokemon/porygon2/back.png b/graphics/pokemon/gen_2/porygon2/back.png
similarity index 100%
rename from graphics/pokemon/porygon2/back.png
rename to graphics/pokemon/gen_2/porygon2/back.png
diff --git a/graphics/pokemon/arctovish/footprint.png b/graphics/pokemon/gen_2/porygon2/footprint.png
similarity index 100%
rename from graphics/pokemon/arctovish/footprint.png
rename to graphics/pokemon/gen_2/porygon2/footprint.png
diff --git a/graphics/pokemon/porygon2/icon.png b/graphics/pokemon/gen_2/porygon2/icon.png
similarity index 100%
rename from graphics/pokemon/porygon2/icon.png
rename to graphics/pokemon/gen_2/porygon2/icon.png
diff --git a/graphics/pokemon/porygon2/normal.pal b/graphics/pokemon/gen_2/porygon2/normal.pal
similarity index 100%
rename from graphics/pokemon/porygon2/normal.pal
rename to graphics/pokemon/gen_2/porygon2/normal.pal
diff --git a/graphics/pokemon/porygon2/shiny.pal b/graphics/pokemon/gen_2/porygon2/shiny.pal
similarity index 100%
rename from graphics/pokemon/porygon2/shiny.pal
rename to graphics/pokemon/gen_2/porygon2/shiny.pal
diff --git a/graphics/pokemon/pupitar/anim_front.png b/graphics/pokemon/gen_2/pupitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/pupitar/anim_front.png
rename to graphics/pokemon/gen_2/pupitar/anim_front.png
diff --git a/graphics/pokemon/pupitar/back.png b/graphics/pokemon/gen_2/pupitar/back.png
similarity index 100%
rename from graphics/pokemon/pupitar/back.png
rename to graphics/pokemon/gen_2/pupitar/back.png
diff --git a/graphics/pokemon/drampa/footprint.png b/graphics/pokemon/gen_2/pupitar/footprint.png
similarity index 100%
rename from graphics/pokemon/drampa/footprint.png
rename to graphics/pokemon/gen_2/pupitar/footprint.png
diff --git a/graphics/pokemon/pupitar/icon.png b/graphics/pokemon/gen_2/pupitar/icon.png
similarity index 100%
rename from graphics/pokemon/pupitar/icon.png
rename to graphics/pokemon/gen_2/pupitar/icon.png
diff --git a/graphics/pokemon/pupitar/normal.pal b/graphics/pokemon/gen_2/pupitar/normal.pal
similarity index 100%
rename from graphics/pokemon/pupitar/normal.pal
rename to graphics/pokemon/gen_2/pupitar/normal.pal
diff --git a/graphics/pokemon/pupitar/shiny.pal b/graphics/pokemon/gen_2/pupitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/pupitar/shiny.pal
rename to graphics/pokemon/gen_2/pupitar/shiny.pal
diff --git a/graphics/pokemon/quagsire/anim_front.png b/graphics/pokemon/gen_2/quagsire/anim_front.png
similarity index 100%
rename from graphics/pokemon/quagsire/anim_front.png
rename to graphics/pokemon/gen_2/quagsire/anim_front.png
diff --git a/graphics/pokemon/quagsire/anim_frontf.png b/graphics/pokemon/gen_2/quagsire/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/quagsire/anim_frontf.png
rename to graphics/pokemon/gen_2/quagsire/anim_frontf.png
diff --git a/graphics/pokemon/quagsire/back.png b/graphics/pokemon/gen_2/quagsire/back.png
similarity index 100%
rename from graphics/pokemon/quagsire/back.png
rename to graphics/pokemon/gen_2/quagsire/back.png
diff --git a/graphics/pokemon/quagsire/backf.png b/graphics/pokemon/gen_2/quagsire/backf.png
similarity index 100%
rename from graphics/pokemon/quagsire/backf.png
rename to graphics/pokemon/gen_2/quagsire/backf.png
diff --git a/graphics/pokemon/quagsire/footprint.png b/graphics/pokemon/gen_2/quagsire/footprint.png
similarity index 100%
rename from graphics/pokemon/quagsire/footprint.png
rename to graphics/pokemon/gen_2/quagsire/footprint.png
diff --git a/graphics/pokemon/quagsire/icon.png b/graphics/pokemon/gen_2/quagsire/icon.png
similarity index 100%
rename from graphics/pokemon/quagsire/icon.png
rename to graphics/pokemon/gen_2/quagsire/icon.png
diff --git a/graphics/pokemon/quagsire/normal.pal b/graphics/pokemon/gen_2/quagsire/normal.pal
similarity index 100%
rename from graphics/pokemon/quagsire/normal.pal
rename to graphics/pokemon/gen_2/quagsire/normal.pal
diff --git a/graphics/pokemon/quagsire/shiny.pal b/graphics/pokemon/gen_2/quagsire/shiny.pal
similarity index 100%
rename from graphics/pokemon/quagsire/shiny.pal
rename to graphics/pokemon/gen_2/quagsire/shiny.pal
diff --git a/graphics/pokemon/quilava/anim_front.png b/graphics/pokemon/gen_2/quilava/anim_front.png
similarity index 100%
rename from graphics/pokemon/quilava/anim_front.png
rename to graphics/pokemon/gen_2/quilava/anim_front.png
diff --git a/graphics/pokemon/quilava/back.png b/graphics/pokemon/gen_2/quilava/back.png
similarity index 100%
rename from graphics/pokemon/quilava/back.png
rename to graphics/pokemon/gen_2/quilava/back.png
diff --git a/graphics/pokemon/quilava/footprint.png b/graphics/pokemon/gen_2/quilava/footprint.png
similarity index 100%
rename from graphics/pokemon/quilava/footprint.png
rename to graphics/pokemon/gen_2/quilava/footprint.png
diff --git a/graphics/pokemon/quilava/icon.png b/graphics/pokemon/gen_2/quilava/icon.png
similarity index 100%
rename from graphics/pokemon/quilava/icon.png
rename to graphics/pokemon/gen_2/quilava/icon.png
diff --git a/graphics/pokemon/quilava/normal.pal b/graphics/pokemon/gen_2/quilava/normal.pal
similarity index 100%
rename from graphics/pokemon/quilava/normal.pal
rename to graphics/pokemon/gen_2/quilava/normal.pal
diff --git a/graphics/pokemon/quilava/shiny.pal b/graphics/pokemon/gen_2/quilava/shiny.pal
similarity index 100%
rename from graphics/pokemon/quilava/shiny.pal
rename to graphics/pokemon/gen_2/quilava/shiny.pal
diff --git a/graphics/pokemon/qwilfish/anim_front.png b/graphics/pokemon/gen_2/qwilfish/anim_front.png
similarity index 100%
rename from graphics/pokemon/qwilfish/anim_front.png
rename to graphics/pokemon/gen_2/qwilfish/anim_front.png
diff --git a/graphics/pokemon/qwilfish/back.png b/graphics/pokemon/gen_2/qwilfish/back.png
similarity index 100%
rename from graphics/pokemon/qwilfish/back.png
rename to graphics/pokemon/gen_2/qwilfish/back.png
diff --git a/graphics/pokemon/dratini/footprint.png b/graphics/pokemon/gen_2/qwilfish/footprint.png
similarity index 100%
rename from graphics/pokemon/dratini/footprint.png
rename to graphics/pokemon/gen_2/qwilfish/footprint.png
diff --git a/graphics/pokemon/qwilfish/hisuian/back.png b/graphics/pokemon/gen_2/qwilfish/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/qwilfish/hisuian/back.png
rename to graphics/pokemon/gen_2/qwilfish/hisuian/back.png
diff --git a/graphics/pokemon/qwilfish/hisuian/front.png b/graphics/pokemon/gen_2/qwilfish/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/qwilfish/hisuian/front.png
rename to graphics/pokemon/gen_2/qwilfish/hisuian/front.png
diff --git a/graphics/pokemon/qwilfish/hisuian/icon.png b/graphics/pokemon/gen_2/qwilfish/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/qwilfish/hisuian/icon.png
rename to graphics/pokemon/gen_2/qwilfish/hisuian/icon.png
diff --git a/graphics/pokemon/qwilfish/hisuian/normal.pal b/graphics/pokemon/gen_2/qwilfish/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/qwilfish/hisuian/normal.pal
rename to graphics/pokemon/gen_2/qwilfish/hisuian/normal.pal
diff --git a/graphics/pokemon/qwilfish/hisuian/shiny.pal b/graphics/pokemon/gen_2/qwilfish/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/qwilfish/hisuian/shiny.pal
rename to graphics/pokemon/gen_2/qwilfish/hisuian/shiny.pal
diff --git a/graphics/pokemon/qwilfish/icon.png b/graphics/pokemon/gen_2/qwilfish/icon.png
similarity index 100%
rename from graphics/pokemon/qwilfish/icon.png
rename to graphics/pokemon/gen_2/qwilfish/icon.png
diff --git a/graphics/pokemon/qwilfish/normal.pal b/graphics/pokemon/gen_2/qwilfish/normal.pal
similarity index 100%
rename from graphics/pokemon/qwilfish/normal.pal
rename to graphics/pokemon/gen_2/qwilfish/normal.pal
diff --git a/graphics/pokemon/qwilfish/shiny.pal b/graphics/pokemon/gen_2/qwilfish/shiny.pal
similarity index 100%
rename from graphics/pokemon/qwilfish/shiny.pal
rename to graphics/pokemon/gen_2/qwilfish/shiny.pal
diff --git a/graphics/pokemon/raikou/anim_front.png b/graphics/pokemon/gen_2/raikou/anim_front.png
similarity index 100%
rename from graphics/pokemon/raikou/anim_front.png
rename to graphics/pokemon/gen_2/raikou/anim_front.png
diff --git a/graphics/pokemon/raikou/back.png b/graphics/pokemon/gen_2/raikou/back.png
similarity index 100%
rename from graphics/pokemon/raikou/back.png
rename to graphics/pokemon/gen_2/raikou/back.png
diff --git a/graphics/pokemon/raikou/footprint.png b/graphics/pokemon/gen_2/raikou/footprint.png
similarity index 100%
rename from graphics/pokemon/raikou/footprint.png
rename to graphics/pokemon/gen_2/raikou/footprint.png
diff --git a/graphics/pokemon/raikou/icon.png b/graphics/pokemon/gen_2/raikou/icon.png
similarity index 100%
rename from graphics/pokemon/raikou/icon.png
rename to graphics/pokemon/gen_2/raikou/icon.png
diff --git a/graphics/pokemon/raikou/normal.pal b/graphics/pokemon/gen_2/raikou/normal.pal
similarity index 100%
rename from graphics/pokemon/raikou/normal.pal
rename to graphics/pokemon/gen_2/raikou/normal.pal
diff --git a/graphics/pokemon/raikou/shiny.pal b/graphics/pokemon/gen_2/raikou/shiny.pal
similarity index 100%
rename from graphics/pokemon/raikou/shiny.pal
rename to graphics/pokemon/gen_2/raikou/shiny.pal
diff --git a/graphics/pokemon/remoraid/anim_front.png b/graphics/pokemon/gen_2/remoraid/anim_front.png
similarity index 100%
rename from graphics/pokemon/remoraid/anim_front.png
rename to graphics/pokemon/gen_2/remoraid/anim_front.png
diff --git a/graphics/pokemon/remoraid/back.png b/graphics/pokemon/gen_2/remoraid/back.png
similarity index 100%
rename from graphics/pokemon/remoraid/back.png
rename to graphics/pokemon/gen_2/remoraid/back.png
diff --git a/graphics/pokemon/dreepy/footprint.png b/graphics/pokemon/gen_2/remoraid/footprint.png
similarity index 100%
rename from graphics/pokemon/dreepy/footprint.png
rename to graphics/pokemon/gen_2/remoraid/footprint.png
diff --git a/graphics/pokemon/remoraid/icon.png b/graphics/pokemon/gen_2/remoraid/icon.png
similarity index 100%
rename from graphics/pokemon/remoraid/icon.png
rename to graphics/pokemon/gen_2/remoraid/icon.png
diff --git a/graphics/pokemon/remoraid/normal.pal b/graphics/pokemon/gen_2/remoraid/normal.pal
similarity index 100%
rename from graphics/pokemon/remoraid/normal.pal
rename to graphics/pokemon/gen_2/remoraid/normal.pal
diff --git a/graphics/pokemon/remoraid/shiny.pal b/graphics/pokemon/gen_2/remoraid/shiny.pal
similarity index 100%
rename from graphics/pokemon/remoraid/shiny.pal
rename to graphics/pokemon/gen_2/remoraid/shiny.pal
diff --git a/graphics/pokemon/scizor/anim_front.png b/graphics/pokemon/gen_2/scizor/anim_front.png
similarity index 100%
rename from graphics/pokemon/scizor/anim_front.png
rename to graphics/pokemon/gen_2/scizor/anim_front.png
diff --git a/graphics/pokemon/scizor/anim_frontf.png b/graphics/pokemon/gen_2/scizor/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/scizor/anim_frontf.png
rename to graphics/pokemon/gen_2/scizor/anim_frontf.png
diff --git a/graphics/pokemon/scizor/back.png b/graphics/pokemon/gen_2/scizor/back.png
similarity index 100%
rename from graphics/pokemon/scizor/back.png
rename to graphics/pokemon/gen_2/scizor/back.png
diff --git a/graphics/pokemon/scizor/footprint.png b/graphics/pokemon/gen_2/scizor/footprint.png
similarity index 100%
rename from graphics/pokemon/scizor/footprint.png
rename to graphics/pokemon/gen_2/scizor/footprint.png
diff --git a/graphics/pokemon/scizor/icon.png b/graphics/pokemon/gen_2/scizor/icon.png
similarity index 100%
rename from graphics/pokemon/scizor/icon.png
rename to graphics/pokemon/gen_2/scizor/icon.png
diff --git a/graphics/pokemon/scizor/mega/back.png b/graphics/pokemon/gen_2/scizor/mega/back.png
similarity index 100%
rename from graphics/pokemon/scizor/mega/back.png
rename to graphics/pokemon/gen_2/scizor/mega/back.png
diff --git a/graphics/pokemon/scizor/mega/front.png b/graphics/pokemon/gen_2/scizor/mega/front.png
similarity index 100%
rename from graphics/pokemon/scizor/mega/front.png
rename to graphics/pokemon/gen_2/scizor/mega/front.png
diff --git a/graphics/pokemon/scizor/mega/icon.png b/graphics/pokemon/gen_2/scizor/mega/icon.png
similarity index 100%
rename from graphics/pokemon/scizor/mega/icon.png
rename to graphics/pokemon/gen_2/scizor/mega/icon.png
diff --git a/graphics/pokemon/scizor/mega/normal.pal b/graphics/pokemon/gen_2/scizor/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/scizor/mega/normal.pal
rename to graphics/pokemon/gen_2/scizor/mega/normal.pal
diff --git a/graphics/pokemon/scizor/mega/shiny.pal b/graphics/pokemon/gen_2/scizor/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/scizor/mega/shiny.pal
rename to graphics/pokemon/gen_2/scizor/mega/shiny.pal
diff --git a/graphics/pokemon/scizor/normal.pal b/graphics/pokemon/gen_2/scizor/normal.pal
similarity index 100%
rename from graphics/pokemon/scizor/normal.pal
rename to graphics/pokemon/gen_2/scizor/normal.pal
diff --git a/graphics/pokemon/scizor/shiny.pal b/graphics/pokemon/gen_2/scizor/shiny.pal
similarity index 100%
rename from graphics/pokemon/scizor/shiny.pal
rename to graphics/pokemon/gen_2/scizor/shiny.pal
diff --git a/graphics/pokemon/sentret/anim_front.png b/graphics/pokemon/gen_2/sentret/anim_front.png
similarity index 100%
rename from graphics/pokemon/sentret/anim_front.png
rename to graphics/pokemon/gen_2/sentret/anim_front.png
diff --git a/graphics/pokemon/sentret/back.png b/graphics/pokemon/gen_2/sentret/back.png
similarity index 100%
rename from graphics/pokemon/sentret/back.png
rename to graphics/pokemon/gen_2/sentret/back.png
diff --git a/graphics/pokemon/sentret/footprint.png b/graphics/pokemon/gen_2/sentret/footprint.png
similarity index 100%
rename from graphics/pokemon/sentret/footprint.png
rename to graphics/pokemon/gen_2/sentret/footprint.png
diff --git a/graphics/pokemon/sentret/icon.png b/graphics/pokemon/gen_2/sentret/icon.png
similarity index 100%
rename from graphics/pokemon/sentret/icon.png
rename to graphics/pokemon/gen_2/sentret/icon.png
diff --git a/graphics/pokemon/sentret/normal.pal b/graphics/pokemon/gen_2/sentret/normal.pal
similarity index 100%
rename from graphics/pokemon/sentret/normal.pal
rename to graphics/pokemon/gen_2/sentret/normal.pal
diff --git a/graphics/pokemon/sentret/shiny.pal b/graphics/pokemon/gen_2/sentret/shiny.pal
similarity index 100%
rename from graphics/pokemon/sentret/shiny.pal
rename to graphics/pokemon/gen_2/sentret/shiny.pal
diff --git a/graphics/pokemon/shuckle/anim_front.png b/graphics/pokemon/gen_2/shuckle/anim_front.png
similarity index 100%
rename from graphics/pokemon/shuckle/anim_front.png
rename to graphics/pokemon/gen_2/shuckle/anim_front.png
diff --git a/graphics/pokemon/shuckle/back.png b/graphics/pokemon/gen_2/shuckle/back.png
similarity index 100%
rename from graphics/pokemon/shuckle/back.png
rename to graphics/pokemon/gen_2/shuckle/back.png
diff --git a/graphics/pokemon/amaura/footprint.png b/graphics/pokemon/gen_2/shuckle/footprint.png
similarity index 100%
rename from graphics/pokemon/amaura/footprint.png
rename to graphics/pokemon/gen_2/shuckle/footprint.png
diff --git a/graphics/pokemon/shuckle/icon.png b/graphics/pokemon/gen_2/shuckle/icon.png
similarity index 100%
rename from graphics/pokemon/shuckle/icon.png
rename to graphics/pokemon/gen_2/shuckle/icon.png
diff --git a/graphics/pokemon/shuckle/normal.pal b/graphics/pokemon/gen_2/shuckle/normal.pal
similarity index 100%
rename from graphics/pokemon/shuckle/normal.pal
rename to graphics/pokemon/gen_2/shuckle/normal.pal
diff --git a/graphics/pokemon/shuckle/shiny.pal b/graphics/pokemon/gen_2/shuckle/shiny.pal
similarity index 100%
rename from graphics/pokemon/shuckle/shiny.pal
rename to graphics/pokemon/gen_2/shuckle/shiny.pal
diff --git a/graphics/pokemon/skarmory/anim_front.png b/graphics/pokemon/gen_2/skarmory/anim_front.png
similarity index 100%
rename from graphics/pokemon/skarmory/anim_front.png
rename to graphics/pokemon/gen_2/skarmory/anim_front.png
diff --git a/graphics/pokemon/skarmory/back.png b/graphics/pokemon/gen_2/skarmory/back.png
similarity index 100%
rename from graphics/pokemon/skarmory/back.png
rename to graphics/pokemon/gen_2/skarmory/back.png
diff --git a/graphics/pokemon/skarmory/footprint.png b/graphics/pokemon/gen_2/skarmory/footprint.png
similarity index 100%
rename from graphics/pokemon/skarmory/footprint.png
rename to graphics/pokemon/gen_2/skarmory/footprint.png
diff --git a/graphics/pokemon/skarmory/icon.png b/graphics/pokemon/gen_2/skarmory/icon.png
similarity index 100%
rename from graphics/pokemon/skarmory/icon.png
rename to graphics/pokemon/gen_2/skarmory/icon.png
diff --git a/graphics/pokemon/skarmory/normal.pal b/graphics/pokemon/gen_2/skarmory/normal.pal
similarity index 100%
rename from graphics/pokemon/skarmory/normal.pal
rename to graphics/pokemon/gen_2/skarmory/normal.pal
diff --git a/graphics/pokemon/skarmory/shiny.pal b/graphics/pokemon/gen_2/skarmory/shiny.pal
similarity index 100%
rename from graphics/pokemon/skarmory/shiny.pal
rename to graphics/pokemon/gen_2/skarmory/shiny.pal
diff --git a/graphics/pokemon/skiploom/anim_front.png b/graphics/pokemon/gen_2/skiploom/anim_front.png
similarity index 100%
rename from graphics/pokemon/skiploom/anim_front.png
rename to graphics/pokemon/gen_2/skiploom/anim_front.png
diff --git a/graphics/pokemon/skiploom/back.png b/graphics/pokemon/gen_2/skiploom/back.png
similarity index 100%
rename from graphics/pokemon/skiploom/back.png
rename to graphics/pokemon/gen_2/skiploom/back.png
diff --git a/graphics/pokemon/skiploom/footprint.png b/graphics/pokemon/gen_2/skiploom/footprint.png
similarity index 100%
rename from graphics/pokemon/skiploom/footprint.png
rename to graphics/pokemon/gen_2/skiploom/footprint.png
diff --git a/graphics/pokemon/skiploom/icon.png b/graphics/pokemon/gen_2/skiploom/icon.png
similarity index 100%
rename from graphics/pokemon/skiploom/icon.png
rename to graphics/pokemon/gen_2/skiploom/icon.png
diff --git a/graphics/pokemon/skiploom/normal.pal b/graphics/pokemon/gen_2/skiploom/normal.pal
similarity index 100%
rename from graphics/pokemon/skiploom/normal.pal
rename to graphics/pokemon/gen_2/skiploom/normal.pal
diff --git a/graphics/pokemon/skiploom/shiny.pal b/graphics/pokemon/gen_2/skiploom/shiny.pal
similarity index 100%
rename from graphics/pokemon/skiploom/shiny.pal
rename to graphics/pokemon/gen_2/skiploom/shiny.pal
diff --git a/graphics/pokemon/slowking/anim_front.png b/graphics/pokemon/gen_2/slowking/anim_front.png
similarity index 100%
rename from graphics/pokemon/slowking/anim_front.png
rename to graphics/pokemon/gen_2/slowking/anim_front.png
diff --git a/graphics/pokemon/slowking/back.png b/graphics/pokemon/gen_2/slowking/back.png
similarity index 100%
rename from graphics/pokemon/slowking/back.png
rename to graphics/pokemon/gen_2/slowking/back.png
diff --git a/graphics/pokemon/slowking/footprint.png b/graphics/pokemon/gen_2/slowking/footprint.png
similarity index 100%
rename from graphics/pokemon/slowking/footprint.png
rename to graphics/pokemon/gen_2/slowking/footprint.png
diff --git a/graphics/pokemon/slowking/galarian/back.png b/graphics/pokemon/gen_2/slowking/galarian/back.png
similarity index 100%
rename from graphics/pokemon/slowking/galarian/back.png
rename to graphics/pokemon/gen_2/slowking/galarian/back.png
diff --git a/graphics/pokemon/slowking/galarian/front.png b/graphics/pokemon/gen_2/slowking/galarian/front.png
similarity index 100%
rename from graphics/pokemon/slowking/galarian/front.png
rename to graphics/pokemon/gen_2/slowking/galarian/front.png
diff --git a/graphics/pokemon/slowking/galarian/icon.png b/graphics/pokemon/gen_2/slowking/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/slowking/galarian/icon.png
rename to graphics/pokemon/gen_2/slowking/galarian/icon.png
diff --git a/graphics/pokemon/slowking/galarian/normal.pal b/graphics/pokemon/gen_2/slowking/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/slowking/galarian/normal.pal
rename to graphics/pokemon/gen_2/slowking/galarian/normal.pal
diff --git a/graphics/pokemon/slowking/galarian/shiny.pal b/graphics/pokemon/gen_2/slowking/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowking/galarian/shiny.pal
rename to graphics/pokemon/gen_2/slowking/galarian/shiny.pal
diff --git a/graphics/pokemon/slowking/icon.png b/graphics/pokemon/gen_2/slowking/icon.png
similarity index 100%
rename from graphics/pokemon/slowking/icon.png
rename to graphics/pokemon/gen_2/slowking/icon.png
diff --git a/graphics/pokemon/slowking/normal.pal b/graphics/pokemon/gen_2/slowking/normal.pal
similarity index 100%
rename from graphics/pokemon/slowking/normal.pal
rename to graphics/pokemon/gen_2/slowking/normal.pal
diff --git a/graphics/pokemon/slowking/shiny.pal b/graphics/pokemon/gen_2/slowking/shiny.pal
similarity index 100%
rename from graphics/pokemon/slowking/shiny.pal
rename to graphics/pokemon/gen_2/slowking/shiny.pal
diff --git a/graphics/pokemon/slugma/anim_front.png b/graphics/pokemon/gen_2/slugma/anim_front.png
similarity index 100%
rename from graphics/pokemon/slugma/anim_front.png
rename to graphics/pokemon/gen_2/slugma/anim_front.png
diff --git a/graphics/pokemon/slugma/back.png b/graphics/pokemon/gen_2/slugma/back.png
similarity index 100%
rename from graphics/pokemon/slugma/back.png
rename to graphics/pokemon/gen_2/slugma/back.png
diff --git a/graphics/pokemon/drifblim/footprint.png b/graphics/pokemon/gen_2/slugma/footprint.png
similarity index 100%
rename from graphics/pokemon/drifblim/footprint.png
rename to graphics/pokemon/gen_2/slugma/footprint.png
diff --git a/graphics/pokemon/slugma/icon.png b/graphics/pokemon/gen_2/slugma/icon.png
similarity index 100%
rename from graphics/pokemon/slugma/icon.png
rename to graphics/pokemon/gen_2/slugma/icon.png
diff --git a/graphics/pokemon/slugma/normal.pal b/graphics/pokemon/gen_2/slugma/normal.pal
similarity index 100%
rename from graphics/pokemon/slugma/normal.pal
rename to graphics/pokemon/gen_2/slugma/normal.pal
diff --git a/graphics/pokemon/slugma/shiny.pal b/graphics/pokemon/gen_2/slugma/shiny.pal
similarity index 100%
rename from graphics/pokemon/slugma/shiny.pal
rename to graphics/pokemon/gen_2/slugma/shiny.pal
diff --git a/graphics/pokemon/smeargle/anim_front.png b/graphics/pokemon/gen_2/smeargle/anim_front.png
similarity index 100%
rename from graphics/pokemon/smeargle/anim_front.png
rename to graphics/pokemon/gen_2/smeargle/anim_front.png
diff --git a/graphics/pokemon/smeargle/back.png b/graphics/pokemon/gen_2/smeargle/back.png
similarity index 100%
rename from graphics/pokemon/smeargle/back.png
rename to graphics/pokemon/gen_2/smeargle/back.png
diff --git a/graphics/pokemon/smeargle/footprint.png b/graphics/pokemon/gen_2/smeargle/footprint.png
similarity index 100%
rename from graphics/pokemon/smeargle/footprint.png
rename to graphics/pokemon/gen_2/smeargle/footprint.png
diff --git a/graphics/pokemon/smeargle/icon.png b/graphics/pokemon/gen_2/smeargle/icon.png
similarity index 100%
rename from graphics/pokemon/smeargle/icon.png
rename to graphics/pokemon/gen_2/smeargle/icon.png
diff --git a/graphics/pokemon/smeargle/normal.pal b/graphics/pokemon/gen_2/smeargle/normal.pal
similarity index 100%
rename from graphics/pokemon/smeargle/normal.pal
rename to graphics/pokemon/gen_2/smeargle/normal.pal
diff --git a/graphics/pokemon/smeargle/shiny.pal b/graphics/pokemon/gen_2/smeargle/shiny.pal
similarity index 100%
rename from graphics/pokemon/smeargle/shiny.pal
rename to graphics/pokemon/gen_2/smeargle/shiny.pal
diff --git a/graphics/pokemon/smoochum/anim_front.png b/graphics/pokemon/gen_2/smoochum/anim_front.png
similarity index 100%
rename from graphics/pokemon/smoochum/anim_front.png
rename to graphics/pokemon/gen_2/smoochum/anim_front.png
diff --git a/graphics/pokemon/smoochum/back.png b/graphics/pokemon/gen_2/smoochum/back.png
similarity index 100%
rename from graphics/pokemon/smoochum/back.png
rename to graphics/pokemon/gen_2/smoochum/back.png
diff --git a/graphics/pokemon/smoochum/footprint.png b/graphics/pokemon/gen_2/smoochum/footprint.png
similarity index 100%
rename from graphics/pokemon/smoochum/footprint.png
rename to graphics/pokemon/gen_2/smoochum/footprint.png
diff --git a/graphics/pokemon/smoochum/icon.png b/graphics/pokemon/gen_2/smoochum/icon.png
similarity index 100%
rename from graphics/pokemon/smoochum/icon.png
rename to graphics/pokemon/gen_2/smoochum/icon.png
diff --git a/graphics/pokemon/smoochum/normal.pal b/graphics/pokemon/gen_2/smoochum/normal.pal
similarity index 100%
rename from graphics/pokemon/smoochum/normal.pal
rename to graphics/pokemon/gen_2/smoochum/normal.pal
diff --git a/graphics/pokemon/smoochum/shiny.pal b/graphics/pokemon/gen_2/smoochum/shiny.pal
similarity index 100%
rename from graphics/pokemon/smoochum/shiny.pal
rename to graphics/pokemon/gen_2/smoochum/shiny.pal
diff --git a/graphics/pokemon/sneasel/anim_front.png b/graphics/pokemon/gen_2/sneasel/anim_front.png
similarity index 100%
rename from graphics/pokemon/sneasel/anim_front.png
rename to graphics/pokemon/gen_2/sneasel/anim_front.png
diff --git a/graphics/pokemon/sneasel/anim_frontf.png b/graphics/pokemon/gen_2/sneasel/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/sneasel/anim_frontf.png
rename to graphics/pokemon/gen_2/sneasel/anim_frontf.png
diff --git a/graphics/pokemon/sneasel/back.png b/graphics/pokemon/gen_2/sneasel/back.png
similarity index 100%
rename from graphics/pokemon/sneasel/back.png
rename to graphics/pokemon/gen_2/sneasel/back.png
diff --git a/graphics/pokemon/sneasel/backf.png b/graphics/pokemon/gen_2/sneasel/backf.png
similarity index 100%
rename from graphics/pokemon/sneasel/backf.png
rename to graphics/pokemon/gen_2/sneasel/backf.png
diff --git a/graphics/pokemon/sneasel/footprint.png b/graphics/pokemon/gen_2/sneasel/footprint.png
similarity index 100%
rename from graphics/pokemon/sneasel/footprint.png
rename to graphics/pokemon/gen_2/sneasel/footprint.png
diff --git a/graphics/pokemon/sneasel/hisuian/back.png b/graphics/pokemon/gen_2/sneasel/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/back.png
rename to graphics/pokemon/gen_2/sneasel/hisuian/back.png
diff --git a/graphics/pokemon/sneasel/hisuian/backf.png b/graphics/pokemon/gen_2/sneasel/hisuian/backf.png
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/backf.png
rename to graphics/pokemon/gen_2/sneasel/hisuian/backf.png
diff --git a/graphics/pokemon/sneasel/hisuian/front.png b/graphics/pokemon/gen_2/sneasel/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/front.png
rename to graphics/pokemon/gen_2/sneasel/hisuian/front.png
diff --git a/graphics/pokemon/sneasel/hisuian/frontf.png b/graphics/pokemon/gen_2/sneasel/hisuian/frontf.png
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/frontf.png
rename to graphics/pokemon/gen_2/sneasel/hisuian/frontf.png
diff --git a/graphics/pokemon/sneasel/hisuian/icon.png b/graphics/pokemon/gen_2/sneasel/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/icon.png
rename to graphics/pokemon/gen_2/sneasel/hisuian/icon.png
diff --git a/graphics/pokemon/sneasel/hisuian/normal.pal b/graphics/pokemon/gen_2/sneasel/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/normal.pal
rename to graphics/pokemon/gen_2/sneasel/hisuian/normal.pal
diff --git a/graphics/pokemon/sneasel/hisuian/shiny.pal b/graphics/pokemon/gen_2/sneasel/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasel/hisuian/shiny.pal
rename to graphics/pokemon/gen_2/sneasel/hisuian/shiny.pal
diff --git a/graphics/pokemon/sneasel/icon.png b/graphics/pokemon/gen_2/sneasel/icon.png
similarity index 100%
rename from graphics/pokemon/sneasel/icon.png
rename to graphics/pokemon/gen_2/sneasel/icon.png
diff --git a/graphics/pokemon/sneasel/normal.pal b/graphics/pokemon/gen_2/sneasel/normal.pal
similarity index 100%
rename from graphics/pokemon/sneasel/normal.pal
rename to graphics/pokemon/gen_2/sneasel/normal.pal
diff --git a/graphics/pokemon/sneasel/shiny.pal b/graphics/pokemon/gen_2/sneasel/shiny.pal
similarity index 100%
rename from graphics/pokemon/sneasel/shiny.pal
rename to graphics/pokemon/gen_2/sneasel/shiny.pal
diff --git a/graphics/pokemon/snubbull/anim_front.png b/graphics/pokemon/gen_2/snubbull/anim_front.png
similarity index 100%
rename from graphics/pokemon/snubbull/anim_front.png
rename to graphics/pokemon/gen_2/snubbull/anim_front.png
diff --git a/graphics/pokemon/snubbull/back.png b/graphics/pokemon/gen_2/snubbull/back.png
similarity index 100%
rename from graphics/pokemon/snubbull/back.png
rename to graphics/pokemon/gen_2/snubbull/back.png
diff --git a/graphics/pokemon/snubbull/footprint.png b/graphics/pokemon/gen_2/snubbull/footprint.png
similarity index 100%
rename from graphics/pokemon/snubbull/footprint.png
rename to graphics/pokemon/gen_2/snubbull/footprint.png
diff --git a/graphics/pokemon/snubbull/icon.png b/graphics/pokemon/gen_2/snubbull/icon.png
similarity index 100%
rename from graphics/pokemon/snubbull/icon.png
rename to graphics/pokemon/gen_2/snubbull/icon.png
diff --git a/graphics/pokemon/snubbull/normal.pal b/graphics/pokemon/gen_2/snubbull/normal.pal
similarity index 100%
rename from graphics/pokemon/snubbull/normal.pal
rename to graphics/pokemon/gen_2/snubbull/normal.pal
diff --git a/graphics/pokemon/snubbull/shiny.pal b/graphics/pokemon/gen_2/snubbull/shiny.pal
similarity index 100%
rename from graphics/pokemon/snubbull/shiny.pal
rename to graphics/pokemon/gen_2/snubbull/shiny.pal
diff --git a/graphics/pokemon/spinarak/anim_front.png b/graphics/pokemon/gen_2/spinarak/anim_front.png
similarity index 100%
rename from graphics/pokemon/spinarak/anim_front.png
rename to graphics/pokemon/gen_2/spinarak/anim_front.png
diff --git a/graphics/pokemon/spinarak/back.png b/graphics/pokemon/gen_2/spinarak/back.png
similarity index 100%
rename from graphics/pokemon/spinarak/back.png
rename to graphics/pokemon/gen_2/spinarak/back.png
diff --git a/graphics/pokemon/clauncher/footprint.png b/graphics/pokemon/gen_2/spinarak/footprint.png
similarity index 100%
rename from graphics/pokemon/clauncher/footprint.png
rename to graphics/pokemon/gen_2/spinarak/footprint.png
diff --git a/graphics/pokemon/spinarak/icon.png b/graphics/pokemon/gen_2/spinarak/icon.png
similarity index 100%
rename from graphics/pokemon/spinarak/icon.png
rename to graphics/pokemon/gen_2/spinarak/icon.png
diff --git a/graphics/pokemon/spinarak/normal.pal b/graphics/pokemon/gen_2/spinarak/normal.pal
similarity index 100%
rename from graphics/pokemon/spinarak/normal.pal
rename to graphics/pokemon/gen_2/spinarak/normal.pal
diff --git a/graphics/pokemon/spinarak/shiny.pal b/graphics/pokemon/gen_2/spinarak/shiny.pal
similarity index 100%
rename from graphics/pokemon/spinarak/shiny.pal
rename to graphics/pokemon/gen_2/spinarak/shiny.pal
diff --git a/graphics/pokemon/stantler/anim_front.png b/graphics/pokemon/gen_2/stantler/anim_front.png
similarity index 100%
rename from graphics/pokemon/stantler/anim_front.png
rename to graphics/pokemon/gen_2/stantler/anim_front.png
diff --git a/graphics/pokemon/stantler/back.png b/graphics/pokemon/gen_2/stantler/back.png
similarity index 100%
rename from graphics/pokemon/stantler/back.png
rename to graphics/pokemon/gen_2/stantler/back.png
diff --git a/graphics/pokemon/stantler/footprint.png b/graphics/pokemon/gen_2/stantler/footprint.png
similarity index 100%
rename from graphics/pokemon/stantler/footprint.png
rename to graphics/pokemon/gen_2/stantler/footprint.png
diff --git a/graphics/pokemon/stantler/icon.png b/graphics/pokemon/gen_2/stantler/icon.png
similarity index 100%
rename from graphics/pokemon/stantler/icon.png
rename to graphics/pokemon/gen_2/stantler/icon.png
diff --git a/graphics/pokemon/stantler/normal.pal b/graphics/pokemon/gen_2/stantler/normal.pal
similarity index 100%
rename from graphics/pokemon/stantler/normal.pal
rename to graphics/pokemon/gen_2/stantler/normal.pal
diff --git a/graphics/pokemon/stantler/shiny.pal b/graphics/pokemon/gen_2/stantler/shiny.pal
similarity index 100%
rename from graphics/pokemon/stantler/shiny.pal
rename to graphics/pokemon/gen_2/stantler/shiny.pal
diff --git a/graphics/pokemon/steelix/anim_front.png b/graphics/pokemon/gen_2/steelix/anim_front.png
similarity index 100%
rename from graphics/pokemon/steelix/anim_front.png
rename to graphics/pokemon/gen_2/steelix/anim_front.png
diff --git a/graphics/pokemon/steelix/anim_frontf.png b/graphics/pokemon/gen_2/steelix/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/steelix/anim_frontf.png
rename to graphics/pokemon/gen_2/steelix/anim_frontf.png
diff --git a/graphics/pokemon/steelix/back.png b/graphics/pokemon/gen_2/steelix/back.png
similarity index 100%
rename from graphics/pokemon/steelix/back.png
rename to graphics/pokemon/gen_2/steelix/back.png
diff --git a/graphics/pokemon/steelix/backf.png b/graphics/pokemon/gen_2/steelix/backf.png
similarity index 100%
rename from graphics/pokemon/steelix/backf.png
rename to graphics/pokemon/gen_2/steelix/backf.png
diff --git a/graphics/pokemon/drifloon/footprint.png b/graphics/pokemon/gen_2/steelix/footprint.png
similarity index 100%
rename from graphics/pokemon/drifloon/footprint.png
rename to graphics/pokemon/gen_2/steelix/footprint.png
diff --git a/graphics/pokemon/steelix/icon.png b/graphics/pokemon/gen_2/steelix/icon.png
similarity index 100%
rename from graphics/pokemon/steelix/icon.png
rename to graphics/pokemon/gen_2/steelix/icon.png
diff --git a/graphics/pokemon/steelix/mega/back.png b/graphics/pokemon/gen_2/steelix/mega/back.png
similarity index 100%
rename from graphics/pokemon/steelix/mega/back.png
rename to graphics/pokemon/gen_2/steelix/mega/back.png
diff --git a/graphics/pokemon/steelix/mega/front.png b/graphics/pokemon/gen_2/steelix/mega/front.png
similarity index 100%
rename from graphics/pokemon/steelix/mega/front.png
rename to graphics/pokemon/gen_2/steelix/mega/front.png
diff --git a/graphics/pokemon/steelix/mega/icon.png b/graphics/pokemon/gen_2/steelix/mega/icon.png
similarity index 100%
rename from graphics/pokemon/steelix/mega/icon.png
rename to graphics/pokemon/gen_2/steelix/mega/icon.png
diff --git a/graphics/pokemon/steelix/mega/normal.pal b/graphics/pokemon/gen_2/steelix/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/steelix/mega/normal.pal
rename to graphics/pokemon/gen_2/steelix/mega/normal.pal
diff --git a/graphics/pokemon/steelix/mega/shiny.pal b/graphics/pokemon/gen_2/steelix/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/steelix/mega/shiny.pal
rename to graphics/pokemon/gen_2/steelix/mega/shiny.pal
diff --git a/graphics/pokemon/steelix/normal.pal b/graphics/pokemon/gen_2/steelix/normal.pal
similarity index 100%
rename from graphics/pokemon/steelix/normal.pal
rename to graphics/pokemon/gen_2/steelix/normal.pal
diff --git a/graphics/pokemon/steelix/shiny.pal b/graphics/pokemon/gen_2/steelix/shiny.pal
similarity index 100%
rename from graphics/pokemon/steelix/shiny.pal
rename to graphics/pokemon/gen_2/steelix/shiny.pal
diff --git a/graphics/pokemon/sudowoodo/anim_front.png b/graphics/pokemon/gen_2/sudowoodo/anim_front.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/anim_front.png
rename to graphics/pokemon/gen_2/sudowoodo/anim_front.png
diff --git a/graphics/pokemon/sudowoodo/anim_frontf.png b/graphics/pokemon/gen_2/sudowoodo/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/anim_frontf.png
rename to graphics/pokemon/gen_2/sudowoodo/anim_frontf.png
diff --git a/graphics/pokemon/sudowoodo/back.png b/graphics/pokemon/gen_2/sudowoodo/back.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/back.png
rename to graphics/pokemon/gen_2/sudowoodo/back.png
diff --git a/graphics/pokemon/sudowoodo/backf.png b/graphics/pokemon/gen_2/sudowoodo/backf.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/backf.png
rename to graphics/pokemon/gen_2/sudowoodo/backf.png
diff --git a/graphics/pokemon/sudowoodo/footprint.png b/graphics/pokemon/gen_2/sudowoodo/footprint.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/footprint.png
rename to graphics/pokemon/gen_2/sudowoodo/footprint.png
diff --git a/graphics/pokemon/sudowoodo/icon.png b/graphics/pokemon/gen_2/sudowoodo/icon.png
similarity index 100%
rename from graphics/pokemon/sudowoodo/icon.png
rename to graphics/pokemon/gen_2/sudowoodo/icon.png
diff --git a/graphics/pokemon/sudowoodo/normal.pal b/graphics/pokemon/gen_2/sudowoodo/normal.pal
similarity index 100%
rename from graphics/pokemon/sudowoodo/normal.pal
rename to graphics/pokemon/gen_2/sudowoodo/normal.pal
diff --git a/graphics/pokemon/sudowoodo/shiny.pal b/graphics/pokemon/gen_2/sudowoodo/shiny.pal
similarity index 100%
rename from graphics/pokemon/sudowoodo/shiny.pal
rename to graphics/pokemon/gen_2/sudowoodo/shiny.pal
diff --git a/graphics/pokemon/suicune/anim_front.png b/graphics/pokemon/gen_2/suicune/anim_front.png
similarity index 100%
rename from graphics/pokemon/suicune/anim_front.png
rename to graphics/pokemon/gen_2/suicune/anim_front.png
diff --git a/graphics/pokemon/suicune/back.png b/graphics/pokemon/gen_2/suicune/back.png
similarity index 100%
rename from graphics/pokemon/suicune/back.png
rename to graphics/pokemon/gen_2/suicune/back.png
diff --git a/graphics/pokemon/suicune/footprint.png b/graphics/pokemon/gen_2/suicune/footprint.png
similarity index 100%
rename from graphics/pokemon/suicune/footprint.png
rename to graphics/pokemon/gen_2/suicune/footprint.png
diff --git a/graphics/pokemon/suicune/icon.png b/graphics/pokemon/gen_2/suicune/icon.png
similarity index 100%
rename from graphics/pokemon/suicune/icon.png
rename to graphics/pokemon/gen_2/suicune/icon.png
diff --git a/graphics/pokemon/suicune/normal.pal b/graphics/pokemon/gen_2/suicune/normal.pal
similarity index 100%
rename from graphics/pokemon/suicune/normal.pal
rename to graphics/pokemon/gen_2/suicune/normal.pal
diff --git a/graphics/pokemon/suicune/shiny.pal b/graphics/pokemon/gen_2/suicune/shiny.pal
similarity index 100%
rename from graphics/pokemon/suicune/shiny.pal
rename to graphics/pokemon/gen_2/suicune/shiny.pal
diff --git a/graphics/pokemon/sunflora/anim_front.png b/graphics/pokemon/gen_2/sunflora/anim_front.png
similarity index 100%
rename from graphics/pokemon/sunflora/anim_front.png
rename to graphics/pokemon/gen_2/sunflora/anim_front.png
diff --git a/graphics/pokemon/sunflora/back.png b/graphics/pokemon/gen_2/sunflora/back.png
similarity index 100%
rename from graphics/pokemon/sunflora/back.png
rename to graphics/pokemon/gen_2/sunflora/back.png
diff --git a/graphics/pokemon/sunflora/footprint.png b/graphics/pokemon/gen_2/sunflora/footprint.png
similarity index 100%
rename from graphics/pokemon/sunflora/footprint.png
rename to graphics/pokemon/gen_2/sunflora/footprint.png
diff --git a/graphics/pokemon/sunflora/icon.png b/graphics/pokemon/gen_2/sunflora/icon.png
similarity index 100%
rename from graphics/pokemon/sunflora/icon.png
rename to graphics/pokemon/gen_2/sunflora/icon.png
diff --git a/graphics/pokemon/sunflora/normal.pal b/graphics/pokemon/gen_2/sunflora/normal.pal
similarity index 100%
rename from graphics/pokemon/sunflora/normal.pal
rename to graphics/pokemon/gen_2/sunflora/normal.pal
diff --git a/graphics/pokemon/sunflora/shiny.pal b/graphics/pokemon/gen_2/sunflora/shiny.pal
similarity index 100%
rename from graphics/pokemon/sunflora/shiny.pal
rename to graphics/pokemon/gen_2/sunflora/shiny.pal
diff --git a/graphics/pokemon/sunkern/anim_front.png b/graphics/pokemon/gen_2/sunkern/anim_front.png
similarity index 100%
rename from graphics/pokemon/sunkern/anim_front.png
rename to graphics/pokemon/gen_2/sunkern/anim_front.png
diff --git a/graphics/pokemon/sunkern/back.png b/graphics/pokemon/gen_2/sunkern/back.png
similarity index 100%
rename from graphics/pokemon/sunkern/back.png
rename to graphics/pokemon/gen_2/sunkern/back.png
diff --git a/graphics/pokemon/dugtrio/footprint.png b/graphics/pokemon/gen_2/sunkern/footprint.png
similarity index 100%
rename from graphics/pokemon/dugtrio/footprint.png
rename to graphics/pokemon/gen_2/sunkern/footprint.png
diff --git a/graphics/pokemon/sunkern/icon.png b/graphics/pokemon/gen_2/sunkern/icon.png
similarity index 100%
rename from graphics/pokemon/sunkern/icon.png
rename to graphics/pokemon/gen_2/sunkern/icon.png
diff --git a/graphics/pokemon/sunkern/normal.pal b/graphics/pokemon/gen_2/sunkern/normal.pal
similarity index 100%
rename from graphics/pokemon/sunkern/normal.pal
rename to graphics/pokemon/gen_2/sunkern/normal.pal
diff --git a/graphics/pokemon/sunkern/shiny.pal b/graphics/pokemon/gen_2/sunkern/shiny.pal
similarity index 100%
rename from graphics/pokemon/sunkern/shiny.pal
rename to graphics/pokemon/gen_2/sunkern/shiny.pal
diff --git a/graphics/pokemon/swinub/anim_front.png b/graphics/pokemon/gen_2/swinub/anim_front.png
similarity index 100%
rename from graphics/pokemon/swinub/anim_front.png
rename to graphics/pokemon/gen_2/swinub/anim_front.png
diff --git a/graphics/pokemon/swinub/back.png b/graphics/pokemon/gen_2/swinub/back.png
similarity index 100%
rename from graphics/pokemon/swinub/back.png
rename to graphics/pokemon/gen_2/swinub/back.png
diff --git a/graphics/pokemon/swinub/footprint.png b/graphics/pokemon/gen_2/swinub/footprint.png
similarity index 100%
rename from graphics/pokemon/swinub/footprint.png
rename to graphics/pokemon/gen_2/swinub/footprint.png
diff --git a/graphics/pokemon/swinub/icon.png b/graphics/pokemon/gen_2/swinub/icon.png
similarity index 100%
rename from graphics/pokemon/swinub/icon.png
rename to graphics/pokemon/gen_2/swinub/icon.png
diff --git a/graphics/pokemon/swinub/normal.pal b/graphics/pokemon/gen_2/swinub/normal.pal
similarity index 100%
rename from graphics/pokemon/swinub/normal.pal
rename to graphics/pokemon/gen_2/swinub/normal.pal
diff --git a/graphics/pokemon/swinub/shiny.pal b/graphics/pokemon/gen_2/swinub/shiny.pal
similarity index 100%
rename from graphics/pokemon/swinub/shiny.pal
rename to graphics/pokemon/gen_2/swinub/shiny.pal
diff --git a/graphics/pokemon/teddiursa/anim_front.png b/graphics/pokemon/gen_2/teddiursa/anim_front.png
similarity index 100%
rename from graphics/pokemon/teddiursa/anim_front.png
rename to graphics/pokemon/gen_2/teddiursa/anim_front.png
diff --git a/graphics/pokemon/teddiursa/back.png b/graphics/pokemon/gen_2/teddiursa/back.png
similarity index 100%
rename from graphics/pokemon/teddiursa/back.png
rename to graphics/pokemon/gen_2/teddiursa/back.png
diff --git a/graphics/pokemon/teddiursa/footprint.png b/graphics/pokemon/gen_2/teddiursa/footprint.png
similarity index 100%
rename from graphics/pokemon/teddiursa/footprint.png
rename to graphics/pokemon/gen_2/teddiursa/footprint.png
diff --git a/graphics/pokemon/teddiursa/icon.png b/graphics/pokemon/gen_2/teddiursa/icon.png
similarity index 100%
rename from graphics/pokemon/teddiursa/icon.png
rename to graphics/pokemon/gen_2/teddiursa/icon.png
diff --git a/graphics/pokemon/teddiursa/normal.pal b/graphics/pokemon/gen_2/teddiursa/normal.pal
similarity index 100%
rename from graphics/pokemon/teddiursa/normal.pal
rename to graphics/pokemon/gen_2/teddiursa/normal.pal
diff --git a/graphics/pokemon/teddiursa/shiny.pal b/graphics/pokemon/gen_2/teddiursa/shiny.pal
similarity index 100%
rename from graphics/pokemon/teddiursa/shiny.pal
rename to graphics/pokemon/gen_2/teddiursa/shiny.pal
diff --git a/graphics/pokemon/togepi/anim_front.png b/graphics/pokemon/gen_2/togepi/anim_front.png
similarity index 100%
rename from graphics/pokemon/togepi/anim_front.png
rename to graphics/pokemon/gen_2/togepi/anim_front.png
diff --git a/graphics/pokemon/togepi/back.png b/graphics/pokemon/gen_2/togepi/back.png
similarity index 100%
rename from graphics/pokemon/togepi/back.png
rename to graphics/pokemon/gen_2/togepi/back.png
diff --git a/graphics/pokemon/togepi/footprint.png b/graphics/pokemon/gen_2/togepi/footprint.png
similarity index 100%
rename from graphics/pokemon/togepi/footprint.png
rename to graphics/pokemon/gen_2/togepi/footprint.png
diff --git a/graphics/pokemon/togepi/icon.png b/graphics/pokemon/gen_2/togepi/icon.png
similarity index 100%
rename from graphics/pokemon/togepi/icon.png
rename to graphics/pokemon/gen_2/togepi/icon.png
diff --git a/graphics/pokemon/togepi/normal.pal b/graphics/pokemon/gen_2/togepi/normal.pal
similarity index 100%
rename from graphics/pokemon/togepi/normal.pal
rename to graphics/pokemon/gen_2/togepi/normal.pal
diff --git a/graphics/pokemon/togepi/shiny.pal b/graphics/pokemon/gen_2/togepi/shiny.pal
similarity index 100%
rename from graphics/pokemon/togepi/shiny.pal
rename to graphics/pokemon/gen_2/togepi/shiny.pal
diff --git a/graphics/pokemon/togetic/anim_front.png b/graphics/pokemon/gen_2/togetic/anim_front.png
similarity index 100%
rename from graphics/pokemon/togetic/anim_front.png
rename to graphics/pokemon/gen_2/togetic/anim_front.png
diff --git a/graphics/pokemon/togetic/back.png b/graphics/pokemon/gen_2/togetic/back.png
similarity index 100%
rename from graphics/pokemon/togetic/back.png
rename to graphics/pokemon/gen_2/togetic/back.png
diff --git a/graphics/pokemon/togetic/footprint.png b/graphics/pokemon/gen_2/togetic/footprint.png
similarity index 100%
rename from graphics/pokemon/togetic/footprint.png
rename to graphics/pokemon/gen_2/togetic/footprint.png
diff --git a/graphics/pokemon/togetic/icon.png b/graphics/pokemon/gen_2/togetic/icon.png
similarity index 100%
rename from graphics/pokemon/togetic/icon.png
rename to graphics/pokemon/gen_2/togetic/icon.png
diff --git a/graphics/pokemon/togetic/normal.pal b/graphics/pokemon/gen_2/togetic/normal.pal
similarity index 100%
rename from graphics/pokemon/togetic/normal.pal
rename to graphics/pokemon/gen_2/togetic/normal.pal
diff --git a/graphics/pokemon/togetic/shiny.pal b/graphics/pokemon/gen_2/togetic/shiny.pal
similarity index 100%
rename from graphics/pokemon/togetic/shiny.pal
rename to graphics/pokemon/gen_2/togetic/shiny.pal
diff --git a/graphics/pokemon/totodile/anim_front.png b/graphics/pokemon/gen_2/totodile/anim_front.png
similarity index 100%
rename from graphics/pokemon/totodile/anim_front.png
rename to graphics/pokemon/gen_2/totodile/anim_front.png
diff --git a/graphics/pokemon/totodile/back.png b/graphics/pokemon/gen_2/totodile/back.png
similarity index 100%
rename from graphics/pokemon/totodile/back.png
rename to graphics/pokemon/gen_2/totodile/back.png
diff --git a/graphics/pokemon/totodile/footprint.png b/graphics/pokemon/gen_2/totodile/footprint.png
similarity index 100%
rename from graphics/pokemon/totodile/footprint.png
rename to graphics/pokemon/gen_2/totodile/footprint.png
diff --git a/graphics/pokemon/totodile/icon.png b/graphics/pokemon/gen_2/totodile/icon.png
similarity index 100%
rename from graphics/pokemon/totodile/icon.png
rename to graphics/pokemon/gen_2/totodile/icon.png
diff --git a/graphics/pokemon/totodile/normal.pal b/graphics/pokemon/gen_2/totodile/normal.pal
similarity index 100%
rename from graphics/pokemon/totodile/normal.pal
rename to graphics/pokemon/gen_2/totodile/normal.pal
diff --git a/graphics/pokemon/totodile/shiny.pal b/graphics/pokemon/gen_2/totodile/shiny.pal
similarity index 100%
rename from graphics/pokemon/totodile/shiny.pal
rename to graphics/pokemon/gen_2/totodile/shiny.pal
diff --git a/graphics/pokemon/typhlosion/anim_front.png b/graphics/pokemon/gen_2/typhlosion/anim_front.png
similarity index 100%
rename from graphics/pokemon/typhlosion/anim_front.png
rename to graphics/pokemon/gen_2/typhlosion/anim_front.png
diff --git a/graphics/pokemon/typhlosion/back.png b/graphics/pokemon/gen_2/typhlosion/back.png
similarity index 100%
rename from graphics/pokemon/typhlosion/back.png
rename to graphics/pokemon/gen_2/typhlosion/back.png
diff --git a/graphics/pokemon/typhlosion/footprint.png b/graphics/pokemon/gen_2/typhlosion/footprint.png
similarity index 100%
rename from graphics/pokemon/typhlosion/footprint.png
rename to graphics/pokemon/gen_2/typhlosion/footprint.png
diff --git a/graphics/pokemon/typhlosion/hisuian/back.png b/graphics/pokemon/gen_2/typhlosion/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/typhlosion/hisuian/back.png
rename to graphics/pokemon/gen_2/typhlosion/hisuian/back.png
diff --git a/graphics/pokemon/typhlosion/hisuian/front.png b/graphics/pokemon/gen_2/typhlosion/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/typhlosion/hisuian/front.png
rename to graphics/pokemon/gen_2/typhlosion/hisuian/front.png
diff --git a/graphics/pokemon/typhlosion/hisuian/icon.png b/graphics/pokemon/gen_2/typhlosion/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/typhlosion/hisuian/icon.png
rename to graphics/pokemon/gen_2/typhlosion/hisuian/icon.png
diff --git a/graphics/pokemon/typhlosion/hisuian/normal.pal b/graphics/pokemon/gen_2/typhlosion/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/typhlosion/hisuian/normal.pal
rename to graphics/pokemon/gen_2/typhlosion/hisuian/normal.pal
diff --git a/graphics/pokemon/typhlosion/hisuian/shiny.pal b/graphics/pokemon/gen_2/typhlosion/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/typhlosion/hisuian/shiny.pal
rename to graphics/pokemon/gen_2/typhlosion/hisuian/shiny.pal
diff --git a/graphics/pokemon/typhlosion/icon.png b/graphics/pokemon/gen_2/typhlosion/icon.png
similarity index 100%
rename from graphics/pokemon/typhlosion/icon.png
rename to graphics/pokemon/gen_2/typhlosion/icon.png
diff --git a/graphics/pokemon/typhlosion/normal.pal b/graphics/pokemon/gen_2/typhlosion/normal.pal
similarity index 100%
rename from graphics/pokemon/typhlosion/normal.pal
rename to graphics/pokemon/gen_2/typhlosion/normal.pal
diff --git a/graphics/pokemon/typhlosion/shiny.pal b/graphics/pokemon/gen_2/typhlosion/shiny.pal
similarity index 100%
rename from graphics/pokemon/typhlosion/shiny.pal
rename to graphics/pokemon/gen_2/typhlosion/shiny.pal
diff --git a/graphics/pokemon/tyranitar/anim_front.png b/graphics/pokemon/gen_2/tyranitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/tyranitar/anim_front.png
rename to graphics/pokemon/gen_2/tyranitar/anim_front.png
diff --git a/graphics/pokemon/tyranitar/back.png b/graphics/pokemon/gen_2/tyranitar/back.png
similarity index 100%
rename from graphics/pokemon/tyranitar/back.png
rename to graphics/pokemon/gen_2/tyranitar/back.png
diff --git a/graphics/pokemon/tyranitar/footprint.png b/graphics/pokemon/gen_2/tyranitar/footprint.png
similarity index 100%
rename from graphics/pokemon/tyranitar/footprint.png
rename to graphics/pokemon/gen_2/tyranitar/footprint.png
diff --git a/graphics/pokemon/tyranitar/icon.png b/graphics/pokemon/gen_2/tyranitar/icon.png
similarity index 100%
rename from graphics/pokemon/tyranitar/icon.png
rename to graphics/pokemon/gen_2/tyranitar/icon.png
diff --git a/graphics/pokemon/tyranitar/mega/back.png b/graphics/pokemon/gen_2/tyranitar/mega/back.png
similarity index 100%
rename from graphics/pokemon/tyranitar/mega/back.png
rename to graphics/pokemon/gen_2/tyranitar/mega/back.png
diff --git a/graphics/pokemon/tyranitar/mega/front.png b/graphics/pokemon/gen_2/tyranitar/mega/front.png
similarity index 100%
rename from graphics/pokemon/tyranitar/mega/front.png
rename to graphics/pokemon/gen_2/tyranitar/mega/front.png
diff --git a/graphics/pokemon/tyranitar/mega/icon.png b/graphics/pokemon/gen_2/tyranitar/mega/icon.png
similarity index 100%
rename from graphics/pokemon/tyranitar/mega/icon.png
rename to graphics/pokemon/gen_2/tyranitar/mega/icon.png
diff --git a/graphics/pokemon/tyranitar/mega/normal.pal b/graphics/pokemon/gen_2/tyranitar/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/tyranitar/mega/normal.pal
rename to graphics/pokemon/gen_2/tyranitar/mega/normal.pal
diff --git a/graphics/pokemon/tyranitar/mega/shiny.pal b/graphics/pokemon/gen_2/tyranitar/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/tyranitar/mega/shiny.pal
rename to graphics/pokemon/gen_2/tyranitar/mega/shiny.pal
diff --git a/graphics/pokemon/tyranitar/normal.pal b/graphics/pokemon/gen_2/tyranitar/normal.pal
similarity index 100%
rename from graphics/pokemon/tyranitar/normal.pal
rename to graphics/pokemon/gen_2/tyranitar/normal.pal
diff --git a/graphics/pokemon/tyranitar/shiny.pal b/graphics/pokemon/gen_2/tyranitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/tyranitar/shiny.pal
rename to graphics/pokemon/gen_2/tyranitar/shiny.pal
diff --git a/graphics/pokemon/tyrogue/anim_front.png b/graphics/pokemon/gen_2/tyrogue/anim_front.png
similarity index 100%
rename from graphics/pokemon/tyrogue/anim_front.png
rename to graphics/pokemon/gen_2/tyrogue/anim_front.png
diff --git a/graphics/pokemon/tyrogue/back.png b/graphics/pokemon/gen_2/tyrogue/back.png
similarity index 100%
rename from graphics/pokemon/tyrogue/back.png
rename to graphics/pokemon/gen_2/tyrogue/back.png
diff --git a/graphics/pokemon/tyrogue/footprint.png b/graphics/pokemon/gen_2/tyrogue/footprint.png
similarity index 100%
rename from graphics/pokemon/tyrogue/footprint.png
rename to graphics/pokemon/gen_2/tyrogue/footprint.png
diff --git a/graphics/pokemon/tyrogue/icon.png b/graphics/pokemon/gen_2/tyrogue/icon.png
similarity index 100%
rename from graphics/pokemon/tyrogue/icon.png
rename to graphics/pokemon/gen_2/tyrogue/icon.png
diff --git a/graphics/pokemon/tyrogue/normal.pal b/graphics/pokemon/gen_2/tyrogue/normal.pal
similarity index 100%
rename from graphics/pokemon/tyrogue/normal.pal
rename to graphics/pokemon/gen_2/tyrogue/normal.pal
diff --git a/graphics/pokemon/tyrogue/shiny.pal b/graphics/pokemon/gen_2/tyrogue/shiny.pal
similarity index 100%
rename from graphics/pokemon/tyrogue/shiny.pal
rename to graphics/pokemon/gen_2/tyrogue/shiny.pal
diff --git a/graphics/pokemon/umbreon/anim_front.png b/graphics/pokemon/gen_2/umbreon/anim_front.png
similarity index 100%
rename from graphics/pokemon/umbreon/anim_front.png
rename to graphics/pokemon/gen_2/umbreon/anim_front.png
diff --git a/graphics/pokemon/umbreon/back.png b/graphics/pokemon/gen_2/umbreon/back.png
similarity index 100%
rename from graphics/pokemon/umbreon/back.png
rename to graphics/pokemon/gen_2/umbreon/back.png
diff --git a/graphics/pokemon/umbreon/footprint.png b/graphics/pokemon/gen_2/umbreon/footprint.png
similarity index 100%
rename from graphics/pokemon/umbreon/footprint.png
rename to graphics/pokemon/gen_2/umbreon/footprint.png
diff --git a/graphics/pokemon/umbreon/icon.png b/graphics/pokemon/gen_2/umbreon/icon.png
similarity index 100%
rename from graphics/pokemon/umbreon/icon.png
rename to graphics/pokemon/gen_2/umbreon/icon.png
diff --git a/graphics/pokemon/umbreon/normal.pal b/graphics/pokemon/gen_2/umbreon/normal.pal
similarity index 100%
rename from graphics/pokemon/umbreon/normal.pal
rename to graphics/pokemon/gen_2/umbreon/normal.pal
diff --git a/graphics/pokemon/umbreon/shiny.pal b/graphics/pokemon/gen_2/umbreon/shiny.pal
similarity index 100%
rename from graphics/pokemon/umbreon/shiny.pal
rename to graphics/pokemon/gen_2/umbreon/shiny.pal
diff --git a/graphics/pokemon/unown/anim_front.png b/graphics/pokemon/gen_2/unown/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/anim_front.png
rename to graphics/pokemon/gen_2/unown/anim_front.png
diff --git a/graphics/pokemon/unown/b/anim_front.png b/graphics/pokemon/gen_2/unown/b/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/b/anim_front.png
rename to graphics/pokemon/gen_2/unown/b/anim_front.png
diff --git a/graphics/pokemon/unown/b/back.png b/graphics/pokemon/gen_2/unown/b/back.png
similarity index 100%
rename from graphics/pokemon/unown/b/back.png
rename to graphics/pokemon/gen_2/unown/b/back.png
diff --git a/graphics/pokemon/unown/b/icon.png b/graphics/pokemon/gen_2/unown/b/icon.png
similarity index 100%
rename from graphics/pokemon/unown/b/icon.png
rename to graphics/pokemon/gen_2/unown/b/icon.png
diff --git a/graphics/pokemon/unown/back.png b/graphics/pokemon/gen_2/unown/back.png
similarity index 100%
rename from graphics/pokemon/unown/back.png
rename to graphics/pokemon/gen_2/unown/back.png
diff --git a/graphics/pokemon/unown/c/anim_front.png b/graphics/pokemon/gen_2/unown/c/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/c/anim_front.png
rename to graphics/pokemon/gen_2/unown/c/anim_front.png
diff --git a/graphics/pokemon/unown/c/back.png b/graphics/pokemon/gen_2/unown/c/back.png
similarity index 100%
rename from graphics/pokemon/unown/c/back.png
rename to graphics/pokemon/gen_2/unown/c/back.png
diff --git a/graphics/pokemon/unown/c/icon.png b/graphics/pokemon/gen_2/unown/c/icon.png
similarity index 100%
rename from graphics/pokemon/unown/c/icon.png
rename to graphics/pokemon/gen_2/unown/c/icon.png
diff --git a/graphics/pokemon/unown/d/anim_front.png b/graphics/pokemon/gen_2/unown/d/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/d/anim_front.png
rename to graphics/pokemon/gen_2/unown/d/anim_front.png
diff --git a/graphics/pokemon/unown/d/back.png b/graphics/pokemon/gen_2/unown/d/back.png
similarity index 100%
rename from graphics/pokemon/unown/d/back.png
rename to graphics/pokemon/gen_2/unown/d/back.png
diff --git a/graphics/pokemon/unown/d/icon.png b/graphics/pokemon/gen_2/unown/d/icon.png
similarity index 100%
rename from graphics/pokemon/unown/d/icon.png
rename to graphics/pokemon/gen_2/unown/d/icon.png
diff --git a/graphics/pokemon/unown/e/anim_front.png b/graphics/pokemon/gen_2/unown/e/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/e/anim_front.png
rename to graphics/pokemon/gen_2/unown/e/anim_front.png
diff --git a/graphics/pokemon/unown/e/back.png b/graphics/pokemon/gen_2/unown/e/back.png
similarity index 100%
rename from graphics/pokemon/unown/e/back.png
rename to graphics/pokemon/gen_2/unown/e/back.png
diff --git a/graphics/pokemon/unown/e/icon.png b/graphics/pokemon/gen_2/unown/e/icon.png
similarity index 100%
rename from graphics/pokemon/unown/e/icon.png
rename to graphics/pokemon/gen_2/unown/e/icon.png
diff --git a/graphics/pokemon/unown/exclamation_mark/anim_front.png b/graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/exclamation_mark/anim_front.png
rename to graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.png
diff --git a/graphics/pokemon/unown/exclamation_mark/back.png b/graphics/pokemon/gen_2/unown/exclamation_mark/back.png
similarity index 100%
rename from graphics/pokemon/unown/exclamation_mark/back.png
rename to graphics/pokemon/gen_2/unown/exclamation_mark/back.png
diff --git a/graphics/pokemon/unown/exclamation_mark/icon.png b/graphics/pokemon/gen_2/unown/exclamation_mark/icon.png
similarity index 100%
rename from graphics/pokemon/unown/exclamation_mark/icon.png
rename to graphics/pokemon/gen_2/unown/exclamation_mark/icon.png
diff --git a/graphics/pokemon/unown/f/anim_front.png b/graphics/pokemon/gen_2/unown/f/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/f/anim_front.png
rename to graphics/pokemon/gen_2/unown/f/anim_front.png
diff --git a/graphics/pokemon/unown/f/back.png b/graphics/pokemon/gen_2/unown/f/back.png
similarity index 100%
rename from graphics/pokemon/unown/f/back.png
rename to graphics/pokemon/gen_2/unown/f/back.png
diff --git a/graphics/pokemon/unown/f/icon.png b/graphics/pokemon/gen_2/unown/f/icon.png
similarity index 100%
rename from graphics/pokemon/unown/f/icon.png
rename to graphics/pokemon/gen_2/unown/f/icon.png
diff --git a/graphics/pokemon/dunsparce/footprint.png b/graphics/pokemon/gen_2/unown/footprint.png
similarity index 100%
rename from graphics/pokemon/dunsparce/footprint.png
rename to graphics/pokemon/gen_2/unown/footprint.png
diff --git a/graphics/pokemon/unown/g/anim_front.png b/graphics/pokemon/gen_2/unown/g/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/g/anim_front.png
rename to graphics/pokemon/gen_2/unown/g/anim_front.png
diff --git a/graphics/pokemon/unown/g/back.png b/graphics/pokemon/gen_2/unown/g/back.png
similarity index 100%
rename from graphics/pokemon/unown/g/back.png
rename to graphics/pokemon/gen_2/unown/g/back.png
diff --git a/graphics/pokemon/unown/g/icon.png b/graphics/pokemon/gen_2/unown/g/icon.png
similarity index 100%
rename from graphics/pokemon/unown/g/icon.png
rename to graphics/pokemon/gen_2/unown/g/icon.png
diff --git a/graphics/pokemon/unown/h/anim_front.png b/graphics/pokemon/gen_2/unown/h/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/h/anim_front.png
rename to graphics/pokemon/gen_2/unown/h/anim_front.png
diff --git a/graphics/pokemon/unown/h/back.png b/graphics/pokemon/gen_2/unown/h/back.png
similarity index 100%
rename from graphics/pokemon/unown/h/back.png
rename to graphics/pokemon/gen_2/unown/h/back.png
diff --git a/graphics/pokemon/unown/h/icon.png b/graphics/pokemon/gen_2/unown/h/icon.png
similarity index 100%
rename from graphics/pokemon/unown/h/icon.png
rename to graphics/pokemon/gen_2/unown/h/icon.png
diff --git a/graphics/pokemon/unown/i/anim_front.png b/graphics/pokemon/gen_2/unown/i/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/i/anim_front.png
rename to graphics/pokemon/gen_2/unown/i/anim_front.png
diff --git a/graphics/pokemon/unown/i/back.png b/graphics/pokemon/gen_2/unown/i/back.png
similarity index 100%
rename from graphics/pokemon/unown/i/back.png
rename to graphics/pokemon/gen_2/unown/i/back.png
diff --git a/graphics/pokemon/unown/i/icon.png b/graphics/pokemon/gen_2/unown/i/icon.png
similarity index 100%
rename from graphics/pokemon/unown/i/icon.png
rename to graphics/pokemon/gen_2/unown/i/icon.png
diff --git a/graphics/pokemon/unown/icon.png b/graphics/pokemon/gen_2/unown/icon.png
similarity index 100%
rename from graphics/pokemon/unown/icon.png
rename to graphics/pokemon/gen_2/unown/icon.png
diff --git a/graphics/pokemon/unown/j/anim_front.png b/graphics/pokemon/gen_2/unown/j/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/j/anim_front.png
rename to graphics/pokemon/gen_2/unown/j/anim_front.png
diff --git a/graphics/pokemon/unown/j/back.png b/graphics/pokemon/gen_2/unown/j/back.png
similarity index 100%
rename from graphics/pokemon/unown/j/back.png
rename to graphics/pokemon/gen_2/unown/j/back.png
diff --git a/graphics/pokemon/unown/j/icon.png b/graphics/pokemon/gen_2/unown/j/icon.png
similarity index 100%
rename from graphics/pokemon/unown/j/icon.png
rename to graphics/pokemon/gen_2/unown/j/icon.png
diff --git a/graphics/pokemon/unown/k/anim_front.png b/graphics/pokemon/gen_2/unown/k/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/k/anim_front.png
rename to graphics/pokemon/gen_2/unown/k/anim_front.png
diff --git a/graphics/pokemon/unown/k/back.png b/graphics/pokemon/gen_2/unown/k/back.png
similarity index 100%
rename from graphics/pokemon/unown/k/back.png
rename to graphics/pokemon/gen_2/unown/k/back.png
diff --git a/graphics/pokemon/unown/k/icon.png b/graphics/pokemon/gen_2/unown/k/icon.png
similarity index 100%
rename from graphics/pokemon/unown/k/icon.png
rename to graphics/pokemon/gen_2/unown/k/icon.png
diff --git a/graphics/pokemon/unown/l/anim_front.png b/graphics/pokemon/gen_2/unown/l/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/l/anim_front.png
rename to graphics/pokemon/gen_2/unown/l/anim_front.png
diff --git a/graphics/pokemon/unown/l/back.png b/graphics/pokemon/gen_2/unown/l/back.png
similarity index 100%
rename from graphics/pokemon/unown/l/back.png
rename to graphics/pokemon/gen_2/unown/l/back.png
diff --git a/graphics/pokemon/unown/l/icon.png b/graphics/pokemon/gen_2/unown/l/icon.png
similarity index 100%
rename from graphics/pokemon/unown/l/icon.png
rename to graphics/pokemon/gen_2/unown/l/icon.png
diff --git a/graphics/pokemon/unown/m/anim_front.png b/graphics/pokemon/gen_2/unown/m/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/m/anim_front.png
rename to graphics/pokemon/gen_2/unown/m/anim_front.png
diff --git a/graphics/pokemon/unown/m/back.png b/graphics/pokemon/gen_2/unown/m/back.png
similarity index 100%
rename from graphics/pokemon/unown/m/back.png
rename to graphics/pokemon/gen_2/unown/m/back.png
diff --git a/graphics/pokemon/unown/m/icon.png b/graphics/pokemon/gen_2/unown/m/icon.png
similarity index 100%
rename from graphics/pokemon/unown/m/icon.png
rename to graphics/pokemon/gen_2/unown/m/icon.png
diff --git a/graphics/pokemon/unown/n/anim_front.png b/graphics/pokemon/gen_2/unown/n/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/n/anim_front.png
rename to graphics/pokemon/gen_2/unown/n/anim_front.png
diff --git a/graphics/pokemon/unown/n/back.png b/graphics/pokemon/gen_2/unown/n/back.png
similarity index 100%
rename from graphics/pokemon/unown/n/back.png
rename to graphics/pokemon/gen_2/unown/n/back.png
diff --git a/graphics/pokemon/unown/n/icon.png b/graphics/pokemon/gen_2/unown/n/icon.png
similarity index 100%
rename from graphics/pokemon/unown/n/icon.png
rename to graphics/pokemon/gen_2/unown/n/icon.png
diff --git a/graphics/pokemon/unown/normal.pal b/graphics/pokemon/gen_2/unown/normal.pal
similarity index 100%
rename from graphics/pokemon/unown/normal.pal
rename to graphics/pokemon/gen_2/unown/normal.pal
diff --git a/graphics/pokemon/unown/o/anim_front.png b/graphics/pokemon/gen_2/unown/o/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/o/anim_front.png
rename to graphics/pokemon/gen_2/unown/o/anim_front.png
diff --git a/graphics/pokemon/unown/o/back.png b/graphics/pokemon/gen_2/unown/o/back.png
similarity index 100%
rename from graphics/pokemon/unown/o/back.png
rename to graphics/pokemon/gen_2/unown/o/back.png
diff --git a/graphics/pokemon/unown/o/icon.png b/graphics/pokemon/gen_2/unown/o/icon.png
similarity index 100%
rename from graphics/pokemon/unown/o/icon.png
rename to graphics/pokemon/gen_2/unown/o/icon.png
diff --git a/graphics/pokemon/unown/p/anim_front.png b/graphics/pokemon/gen_2/unown/p/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/p/anim_front.png
rename to graphics/pokemon/gen_2/unown/p/anim_front.png
diff --git a/graphics/pokemon/unown/p/back.png b/graphics/pokemon/gen_2/unown/p/back.png
similarity index 100%
rename from graphics/pokemon/unown/p/back.png
rename to graphics/pokemon/gen_2/unown/p/back.png
diff --git a/graphics/pokemon/unown/p/icon.png b/graphics/pokemon/gen_2/unown/p/icon.png
similarity index 100%
rename from graphics/pokemon/unown/p/icon.png
rename to graphics/pokemon/gen_2/unown/p/icon.png
diff --git a/graphics/pokemon/unown/q/anim_front.png b/graphics/pokemon/gen_2/unown/q/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/q/anim_front.png
rename to graphics/pokemon/gen_2/unown/q/anim_front.png
diff --git a/graphics/pokemon/unown/q/back.png b/graphics/pokemon/gen_2/unown/q/back.png
similarity index 100%
rename from graphics/pokemon/unown/q/back.png
rename to graphics/pokemon/gen_2/unown/q/back.png
diff --git a/graphics/pokemon/unown/q/icon.png b/graphics/pokemon/gen_2/unown/q/icon.png
similarity index 100%
rename from graphics/pokemon/unown/q/icon.png
rename to graphics/pokemon/gen_2/unown/q/icon.png
diff --git a/graphics/pokemon/unown/question_mark/anim_front.png b/graphics/pokemon/gen_2/unown/question_mark/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/question_mark/anim_front.png
rename to graphics/pokemon/gen_2/unown/question_mark/anim_front.png
diff --git a/graphics/pokemon/unown/question_mark/back.png b/graphics/pokemon/gen_2/unown/question_mark/back.png
similarity index 100%
rename from graphics/pokemon/unown/question_mark/back.png
rename to graphics/pokemon/gen_2/unown/question_mark/back.png
diff --git a/graphics/pokemon/unown/question_mark/icon.png b/graphics/pokemon/gen_2/unown/question_mark/icon.png
similarity index 100%
rename from graphics/pokemon/unown/question_mark/icon.png
rename to graphics/pokemon/gen_2/unown/question_mark/icon.png
diff --git a/graphics/pokemon/unown/r/anim_front.png b/graphics/pokemon/gen_2/unown/r/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/r/anim_front.png
rename to graphics/pokemon/gen_2/unown/r/anim_front.png
diff --git a/graphics/pokemon/unown/r/back.png b/graphics/pokemon/gen_2/unown/r/back.png
similarity index 100%
rename from graphics/pokemon/unown/r/back.png
rename to graphics/pokemon/gen_2/unown/r/back.png
diff --git a/graphics/pokemon/unown/r/icon.png b/graphics/pokemon/gen_2/unown/r/icon.png
similarity index 100%
rename from graphics/pokemon/unown/r/icon.png
rename to graphics/pokemon/gen_2/unown/r/icon.png
diff --git a/graphics/pokemon/unown/s/anim_front.png b/graphics/pokemon/gen_2/unown/s/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/s/anim_front.png
rename to graphics/pokemon/gen_2/unown/s/anim_front.png
diff --git a/graphics/pokemon/unown/s/back.png b/graphics/pokemon/gen_2/unown/s/back.png
similarity index 100%
rename from graphics/pokemon/unown/s/back.png
rename to graphics/pokemon/gen_2/unown/s/back.png
diff --git a/graphics/pokemon/unown/s/icon.png b/graphics/pokemon/gen_2/unown/s/icon.png
similarity index 100%
rename from graphics/pokemon/unown/s/icon.png
rename to graphics/pokemon/gen_2/unown/s/icon.png
diff --git a/graphics/pokemon/unown/shiny.pal b/graphics/pokemon/gen_2/unown/shiny.pal
similarity index 100%
rename from graphics/pokemon/unown/shiny.pal
rename to graphics/pokemon/gen_2/unown/shiny.pal
diff --git a/graphics/pokemon/unown/t/anim_front.png b/graphics/pokemon/gen_2/unown/t/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/t/anim_front.png
rename to graphics/pokemon/gen_2/unown/t/anim_front.png
diff --git a/graphics/pokemon/unown/t/back.png b/graphics/pokemon/gen_2/unown/t/back.png
similarity index 100%
rename from graphics/pokemon/unown/t/back.png
rename to graphics/pokemon/gen_2/unown/t/back.png
diff --git a/graphics/pokemon/unown/t/icon.png b/graphics/pokemon/gen_2/unown/t/icon.png
similarity index 100%
rename from graphics/pokemon/unown/t/icon.png
rename to graphics/pokemon/gen_2/unown/t/icon.png
diff --git a/graphics/pokemon/unown/u/anim_front.png b/graphics/pokemon/gen_2/unown/u/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/u/anim_front.png
rename to graphics/pokemon/gen_2/unown/u/anim_front.png
diff --git a/graphics/pokemon/unown/u/back.png b/graphics/pokemon/gen_2/unown/u/back.png
similarity index 100%
rename from graphics/pokemon/unown/u/back.png
rename to graphics/pokemon/gen_2/unown/u/back.png
diff --git a/graphics/pokemon/unown/u/icon.png b/graphics/pokemon/gen_2/unown/u/icon.png
similarity index 100%
rename from graphics/pokemon/unown/u/icon.png
rename to graphics/pokemon/gen_2/unown/u/icon.png
diff --git a/graphics/pokemon/unown/v/anim_front.png b/graphics/pokemon/gen_2/unown/v/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/v/anim_front.png
rename to graphics/pokemon/gen_2/unown/v/anim_front.png
diff --git a/graphics/pokemon/unown/v/back.png b/graphics/pokemon/gen_2/unown/v/back.png
similarity index 100%
rename from graphics/pokemon/unown/v/back.png
rename to graphics/pokemon/gen_2/unown/v/back.png
diff --git a/graphics/pokemon/unown/v/icon.png b/graphics/pokemon/gen_2/unown/v/icon.png
similarity index 100%
rename from graphics/pokemon/unown/v/icon.png
rename to graphics/pokemon/gen_2/unown/v/icon.png
diff --git a/graphics/pokemon/unown/w/anim_front.png b/graphics/pokemon/gen_2/unown/w/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/w/anim_front.png
rename to graphics/pokemon/gen_2/unown/w/anim_front.png
diff --git a/graphics/pokemon/unown/w/back.png b/graphics/pokemon/gen_2/unown/w/back.png
similarity index 100%
rename from graphics/pokemon/unown/w/back.png
rename to graphics/pokemon/gen_2/unown/w/back.png
diff --git a/graphics/pokemon/unown/w/icon.png b/graphics/pokemon/gen_2/unown/w/icon.png
similarity index 100%
rename from graphics/pokemon/unown/w/icon.png
rename to graphics/pokemon/gen_2/unown/w/icon.png
diff --git a/graphics/pokemon/unown/x/anim_front.png b/graphics/pokemon/gen_2/unown/x/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/x/anim_front.png
rename to graphics/pokemon/gen_2/unown/x/anim_front.png
diff --git a/graphics/pokemon/unown/x/back.png b/graphics/pokemon/gen_2/unown/x/back.png
similarity index 100%
rename from graphics/pokemon/unown/x/back.png
rename to graphics/pokemon/gen_2/unown/x/back.png
diff --git a/graphics/pokemon/unown/x/icon.png b/graphics/pokemon/gen_2/unown/x/icon.png
similarity index 100%
rename from graphics/pokemon/unown/x/icon.png
rename to graphics/pokemon/gen_2/unown/x/icon.png
diff --git a/graphics/pokemon/unown/y/anim_front.png b/graphics/pokemon/gen_2/unown/y/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/y/anim_front.png
rename to graphics/pokemon/gen_2/unown/y/anim_front.png
diff --git a/graphics/pokemon/unown/y/back.png b/graphics/pokemon/gen_2/unown/y/back.png
similarity index 100%
rename from graphics/pokemon/unown/y/back.png
rename to graphics/pokemon/gen_2/unown/y/back.png
diff --git a/graphics/pokemon/unown/y/icon.png b/graphics/pokemon/gen_2/unown/y/icon.png
similarity index 100%
rename from graphics/pokemon/unown/y/icon.png
rename to graphics/pokemon/gen_2/unown/y/icon.png
diff --git a/graphics/pokemon/unown/z/anim_front.png b/graphics/pokemon/gen_2/unown/z/anim_front.png
similarity index 100%
rename from graphics/pokemon/unown/z/anim_front.png
rename to graphics/pokemon/gen_2/unown/z/anim_front.png
diff --git a/graphics/pokemon/unown/z/back.png b/graphics/pokemon/gen_2/unown/z/back.png
similarity index 100%
rename from graphics/pokemon/unown/z/back.png
rename to graphics/pokemon/gen_2/unown/z/back.png
diff --git a/graphics/pokemon/unown/z/icon.png b/graphics/pokemon/gen_2/unown/z/icon.png
similarity index 100%
rename from graphics/pokemon/unown/z/icon.png
rename to graphics/pokemon/gen_2/unown/z/icon.png
diff --git a/graphics/pokemon/ursaring/anim_front.png b/graphics/pokemon/gen_2/ursaring/anim_front.png
similarity index 100%
rename from graphics/pokemon/ursaring/anim_front.png
rename to graphics/pokemon/gen_2/ursaring/anim_front.png
diff --git a/graphics/pokemon/ursaring/anim_frontf.png b/graphics/pokemon/gen_2/ursaring/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/ursaring/anim_frontf.png
rename to graphics/pokemon/gen_2/ursaring/anim_frontf.png
diff --git a/graphics/pokemon/ursaring/back.png b/graphics/pokemon/gen_2/ursaring/back.png
similarity index 100%
rename from graphics/pokemon/ursaring/back.png
rename to graphics/pokemon/gen_2/ursaring/back.png
diff --git a/graphics/pokemon/ursaring/backf.png b/graphics/pokemon/gen_2/ursaring/backf.png
similarity index 100%
rename from graphics/pokemon/ursaring/backf.png
rename to graphics/pokemon/gen_2/ursaring/backf.png
diff --git a/graphics/pokemon/ursaring/footprint.png b/graphics/pokemon/gen_2/ursaring/footprint.png
similarity index 100%
rename from graphics/pokemon/ursaring/footprint.png
rename to graphics/pokemon/gen_2/ursaring/footprint.png
diff --git a/graphics/pokemon/ursaring/icon.png b/graphics/pokemon/gen_2/ursaring/icon.png
similarity index 100%
rename from graphics/pokemon/ursaring/icon.png
rename to graphics/pokemon/gen_2/ursaring/icon.png
diff --git a/graphics/pokemon/ursaring/normal.pal b/graphics/pokemon/gen_2/ursaring/normal.pal
similarity index 100%
rename from graphics/pokemon/ursaring/normal.pal
rename to graphics/pokemon/gen_2/ursaring/normal.pal
diff --git a/graphics/pokemon/ursaring/shiny.pal b/graphics/pokemon/gen_2/ursaring/shiny.pal
similarity index 100%
rename from graphics/pokemon/ursaring/shiny.pal
rename to graphics/pokemon/gen_2/ursaring/shiny.pal
diff --git a/graphics/pokemon/wobbuffet/anim_front.png b/graphics/pokemon/gen_2/wobbuffet/anim_front.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/anim_front.png
rename to graphics/pokemon/gen_2/wobbuffet/anim_front.png
diff --git a/graphics/pokemon/wobbuffet/anim_frontf.png b/graphics/pokemon/gen_2/wobbuffet/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/anim_frontf.png
rename to graphics/pokemon/gen_2/wobbuffet/anim_frontf.png
diff --git a/graphics/pokemon/wobbuffet/back.png b/graphics/pokemon/gen_2/wobbuffet/back.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/back.png
rename to graphics/pokemon/gen_2/wobbuffet/back.png
diff --git a/graphics/pokemon/wobbuffet/backf.png b/graphics/pokemon/gen_2/wobbuffet/backf.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/backf.png
rename to graphics/pokemon/gen_2/wobbuffet/backf.png
diff --git a/graphics/pokemon/wobbuffet/footprint.png b/graphics/pokemon/gen_2/wobbuffet/footprint.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/footprint.png
rename to graphics/pokemon/gen_2/wobbuffet/footprint.png
diff --git a/graphics/pokemon/wobbuffet/icon.png b/graphics/pokemon/gen_2/wobbuffet/icon.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/icon.png
rename to graphics/pokemon/gen_2/wobbuffet/icon.png
diff --git a/graphics/pokemon/wobbuffet/iconf.png b/graphics/pokemon/gen_2/wobbuffet/iconf.png
similarity index 100%
rename from graphics/pokemon/wobbuffet/iconf.png
rename to graphics/pokemon/gen_2/wobbuffet/iconf.png
diff --git a/graphics/pokemon/wobbuffet/normal.pal b/graphics/pokemon/gen_2/wobbuffet/normal.pal
similarity index 100%
rename from graphics/pokemon/wobbuffet/normal.pal
rename to graphics/pokemon/gen_2/wobbuffet/normal.pal
diff --git a/graphics/pokemon/wobbuffet/shiny.pal b/graphics/pokemon/gen_2/wobbuffet/shiny.pal
similarity index 100%
rename from graphics/pokemon/wobbuffet/shiny.pal
rename to graphics/pokemon/gen_2/wobbuffet/shiny.pal
diff --git a/graphics/pokemon/wooper/anim_front.png b/graphics/pokemon/gen_2/wooper/anim_front.png
similarity index 100%
rename from graphics/pokemon/wooper/anim_front.png
rename to graphics/pokemon/gen_2/wooper/anim_front.png
diff --git a/graphics/pokemon/wooper/anim_frontf.png b/graphics/pokemon/gen_2/wooper/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/wooper/anim_frontf.png
rename to graphics/pokemon/gen_2/wooper/anim_frontf.png
diff --git a/graphics/pokemon/wooper/back.png b/graphics/pokemon/gen_2/wooper/back.png
similarity index 100%
rename from graphics/pokemon/wooper/back.png
rename to graphics/pokemon/gen_2/wooper/back.png
diff --git a/graphics/pokemon/wooper/backf.png b/graphics/pokemon/gen_2/wooper/backf.png
similarity index 100%
rename from graphics/pokemon/wooper/backf.png
rename to graphics/pokemon/gen_2/wooper/backf.png
diff --git a/graphics/pokemon/wooper/footprint.png b/graphics/pokemon/gen_2/wooper/footprint.png
similarity index 100%
rename from graphics/pokemon/wooper/footprint.png
rename to graphics/pokemon/gen_2/wooper/footprint.png
diff --git a/graphics/pokemon/wooper/icon.png b/graphics/pokemon/gen_2/wooper/icon.png
similarity index 100%
rename from graphics/pokemon/wooper/icon.png
rename to graphics/pokemon/gen_2/wooper/icon.png
diff --git a/graphics/pokemon/wooper/normal.pal b/graphics/pokemon/gen_2/wooper/normal.pal
similarity index 100%
rename from graphics/pokemon/wooper/normal.pal
rename to graphics/pokemon/gen_2/wooper/normal.pal
diff --git a/graphics/pokemon/wooper/shiny.pal b/graphics/pokemon/gen_2/wooper/shiny.pal
similarity index 100%
rename from graphics/pokemon/wooper/shiny.pal
rename to graphics/pokemon/gen_2/wooper/shiny.pal
diff --git a/graphics/pokemon/wooper/wooper_paldean/back.png b/graphics/pokemon/gen_2/wooper/wooper_paldean/back.png
similarity index 100%
rename from graphics/pokemon/wooper/wooper_paldean/back.png
rename to graphics/pokemon/gen_2/wooper/wooper_paldean/back.png
diff --git a/graphics/pokemon/wooper/wooper_paldean/front.png b/graphics/pokemon/gen_2/wooper/wooper_paldean/front.png
similarity index 100%
rename from graphics/pokemon/wooper/wooper_paldean/front.png
rename to graphics/pokemon/gen_2/wooper/wooper_paldean/front.png
diff --git a/graphics/pokemon/wooper/wooper_paldean/normal.pal b/graphics/pokemon/gen_2/wooper/wooper_paldean/normal.pal
similarity index 100%
rename from graphics/pokemon/wooper/wooper_paldean/normal.pal
rename to graphics/pokemon/gen_2/wooper/wooper_paldean/normal.pal
diff --git a/graphics/pokemon/wooper/wooper_paldean/shiny.pal b/graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.pal
similarity index 100%
rename from graphics/pokemon/wooper/wooper_paldean/shiny.pal
rename to graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.pal
diff --git a/graphics/pokemon/xatu/anim_front.png b/graphics/pokemon/gen_2/xatu/anim_front.png
similarity index 100%
rename from graphics/pokemon/xatu/anim_front.png
rename to graphics/pokemon/gen_2/xatu/anim_front.png
diff --git a/graphics/pokemon/xatu/anim_frontf.png b/graphics/pokemon/gen_2/xatu/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/xatu/anim_frontf.png
rename to graphics/pokemon/gen_2/xatu/anim_frontf.png
diff --git a/graphics/pokemon/xatu/back.png b/graphics/pokemon/gen_2/xatu/back.png
similarity index 100%
rename from graphics/pokemon/xatu/back.png
rename to graphics/pokemon/gen_2/xatu/back.png
diff --git a/graphics/pokemon/xatu/footprint.png b/graphics/pokemon/gen_2/xatu/footprint.png
similarity index 100%
rename from graphics/pokemon/xatu/footprint.png
rename to graphics/pokemon/gen_2/xatu/footprint.png
diff --git a/graphics/pokemon/xatu/icon.png b/graphics/pokemon/gen_2/xatu/icon.png
similarity index 100%
rename from graphics/pokemon/xatu/icon.png
rename to graphics/pokemon/gen_2/xatu/icon.png
diff --git a/graphics/pokemon/xatu/normal.pal b/graphics/pokemon/gen_2/xatu/normal.pal
similarity index 100%
rename from graphics/pokemon/xatu/normal.pal
rename to graphics/pokemon/gen_2/xatu/normal.pal
diff --git a/graphics/pokemon/xatu/shiny.pal b/graphics/pokemon/gen_2/xatu/shiny.pal
similarity index 100%
rename from graphics/pokemon/xatu/shiny.pal
rename to graphics/pokemon/gen_2/xatu/shiny.pal
diff --git a/graphics/pokemon/yanma/anim_front.png b/graphics/pokemon/gen_2/yanma/anim_front.png
similarity index 100%
rename from graphics/pokemon/yanma/anim_front.png
rename to graphics/pokemon/gen_2/yanma/anim_front.png
diff --git a/graphics/pokemon/yanma/back.png b/graphics/pokemon/gen_2/yanma/back.png
similarity index 100%
rename from graphics/pokemon/yanma/back.png
rename to graphics/pokemon/gen_2/yanma/back.png
diff --git a/graphics/pokemon/yanma/footprint.png b/graphics/pokemon/gen_2/yanma/footprint.png
similarity index 100%
rename from graphics/pokemon/yanma/footprint.png
rename to graphics/pokemon/gen_2/yanma/footprint.png
diff --git a/graphics/pokemon/yanma/icon.png b/graphics/pokemon/gen_2/yanma/icon.png
similarity index 100%
rename from graphics/pokemon/yanma/icon.png
rename to graphics/pokemon/gen_2/yanma/icon.png
diff --git a/graphics/pokemon/yanma/normal.pal b/graphics/pokemon/gen_2/yanma/normal.pal
similarity index 100%
rename from graphics/pokemon/yanma/normal.pal
rename to graphics/pokemon/gen_2/yanma/normal.pal
diff --git a/graphics/pokemon/yanma/shiny.pal b/graphics/pokemon/gen_2/yanma/shiny.pal
similarity index 100%
rename from graphics/pokemon/yanma/shiny.pal
rename to graphics/pokemon/gen_2/yanma/shiny.pal
diff --git a/graphics/pokemon/absol/anim_front.png b/graphics/pokemon/gen_3/absol/anim_front.png
similarity index 100%
rename from graphics/pokemon/absol/anim_front.png
rename to graphics/pokemon/gen_3/absol/anim_front.png
diff --git a/graphics/pokemon/absol/back.png b/graphics/pokemon/gen_3/absol/back.png
similarity index 100%
rename from graphics/pokemon/absol/back.png
rename to graphics/pokemon/gen_3/absol/back.png
diff --git a/graphics/pokemon/absol/footprint.png b/graphics/pokemon/gen_3/absol/footprint.png
similarity index 100%
rename from graphics/pokemon/absol/footprint.png
rename to graphics/pokemon/gen_3/absol/footprint.png
diff --git a/graphics/pokemon/absol/icon.png b/graphics/pokemon/gen_3/absol/icon.png
similarity index 100%
rename from graphics/pokemon/absol/icon.png
rename to graphics/pokemon/gen_3/absol/icon.png
diff --git a/graphics/pokemon/absol/mega/back.png b/graphics/pokemon/gen_3/absol/mega/back.png
similarity index 100%
rename from graphics/pokemon/absol/mega/back.png
rename to graphics/pokemon/gen_3/absol/mega/back.png
diff --git a/graphics/pokemon/absol/mega/front.png b/graphics/pokemon/gen_3/absol/mega/front.png
similarity index 100%
rename from graphics/pokemon/absol/mega/front.png
rename to graphics/pokemon/gen_3/absol/mega/front.png
diff --git a/graphics/pokemon/absol/mega/icon.png b/graphics/pokemon/gen_3/absol/mega/icon.png
similarity index 100%
rename from graphics/pokemon/absol/mega/icon.png
rename to graphics/pokemon/gen_3/absol/mega/icon.png
diff --git a/graphics/pokemon/absol/mega/normal.pal b/graphics/pokemon/gen_3/absol/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/absol/mega/normal.pal
rename to graphics/pokemon/gen_3/absol/mega/normal.pal
diff --git a/graphics/pokemon/absol/mega/shiny.pal b/graphics/pokemon/gen_3/absol/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/absol/mega/shiny.pal
rename to graphics/pokemon/gen_3/absol/mega/shiny.pal
diff --git a/graphics/pokemon/absol/normal.pal b/graphics/pokemon/gen_3/absol/normal.pal
similarity index 100%
rename from graphics/pokemon/absol/normal.pal
rename to graphics/pokemon/gen_3/absol/normal.pal
diff --git a/graphics/pokemon/absol/shiny.pal b/graphics/pokemon/gen_3/absol/shiny.pal
similarity index 100%
rename from graphics/pokemon/absol/shiny.pal
rename to graphics/pokemon/gen_3/absol/shiny.pal
diff --git a/graphics/pokemon/aggron/anim_front.png b/graphics/pokemon/gen_3/aggron/anim_front.png
similarity index 100%
rename from graphics/pokemon/aggron/anim_front.png
rename to graphics/pokemon/gen_3/aggron/anim_front.png
diff --git a/graphics/pokemon/aggron/back.png b/graphics/pokemon/gen_3/aggron/back.png
similarity index 100%
rename from graphics/pokemon/aggron/back.png
rename to graphics/pokemon/gen_3/aggron/back.png
diff --git a/graphics/pokemon/aggron/footprint.png b/graphics/pokemon/gen_3/aggron/footprint.png
similarity index 100%
rename from graphics/pokemon/aggron/footprint.png
rename to graphics/pokemon/gen_3/aggron/footprint.png
diff --git a/graphics/pokemon/aggron/icon.png b/graphics/pokemon/gen_3/aggron/icon.png
similarity index 100%
rename from graphics/pokemon/aggron/icon.png
rename to graphics/pokemon/gen_3/aggron/icon.png
diff --git a/graphics/pokemon/aggron/mega/back.png b/graphics/pokemon/gen_3/aggron/mega/back.png
similarity index 100%
rename from graphics/pokemon/aggron/mega/back.png
rename to graphics/pokemon/gen_3/aggron/mega/back.png
diff --git a/graphics/pokemon/aggron/mega/front.png b/graphics/pokemon/gen_3/aggron/mega/front.png
similarity index 100%
rename from graphics/pokemon/aggron/mega/front.png
rename to graphics/pokemon/gen_3/aggron/mega/front.png
diff --git a/graphics/pokemon/aggron/mega/icon.png b/graphics/pokemon/gen_3/aggron/mega/icon.png
similarity index 100%
rename from graphics/pokemon/aggron/mega/icon.png
rename to graphics/pokemon/gen_3/aggron/mega/icon.png
diff --git a/graphics/pokemon/aggron/mega/normal.pal b/graphics/pokemon/gen_3/aggron/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/aggron/mega/normal.pal
rename to graphics/pokemon/gen_3/aggron/mega/normal.pal
diff --git a/graphics/pokemon/aggron/mega/shiny.pal b/graphics/pokemon/gen_3/aggron/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/aggron/mega/shiny.pal
rename to graphics/pokemon/gen_3/aggron/mega/shiny.pal
diff --git a/graphics/pokemon/aggron/normal.pal b/graphics/pokemon/gen_3/aggron/normal.pal
similarity index 100%
rename from graphics/pokemon/aggron/normal.pal
rename to graphics/pokemon/gen_3/aggron/normal.pal
diff --git a/graphics/pokemon/aggron/shiny.pal b/graphics/pokemon/gen_3/aggron/shiny.pal
similarity index 100%
rename from graphics/pokemon/aggron/shiny.pal
rename to graphics/pokemon/gen_3/aggron/shiny.pal
diff --git a/graphics/pokemon/altaria/anim_front.png b/graphics/pokemon/gen_3/altaria/anim_front.png
similarity index 100%
rename from graphics/pokemon/altaria/anim_front.png
rename to graphics/pokemon/gen_3/altaria/anim_front.png
diff --git a/graphics/pokemon/altaria/back.png b/graphics/pokemon/gen_3/altaria/back.png
similarity index 100%
rename from graphics/pokemon/altaria/back.png
rename to graphics/pokemon/gen_3/altaria/back.png
diff --git a/graphics/pokemon/altaria/footprint.png b/graphics/pokemon/gen_3/altaria/footprint.png
similarity index 100%
rename from graphics/pokemon/altaria/footprint.png
rename to graphics/pokemon/gen_3/altaria/footprint.png
diff --git a/graphics/pokemon/altaria/icon.png b/graphics/pokemon/gen_3/altaria/icon.png
similarity index 100%
rename from graphics/pokemon/altaria/icon.png
rename to graphics/pokemon/gen_3/altaria/icon.png
diff --git a/graphics/pokemon/altaria/mega/back.png b/graphics/pokemon/gen_3/altaria/mega/back.png
similarity index 100%
rename from graphics/pokemon/altaria/mega/back.png
rename to graphics/pokemon/gen_3/altaria/mega/back.png
diff --git a/graphics/pokemon/altaria/mega/front.png b/graphics/pokemon/gen_3/altaria/mega/front.png
similarity index 100%
rename from graphics/pokemon/altaria/mega/front.png
rename to graphics/pokemon/gen_3/altaria/mega/front.png
diff --git a/graphics/pokemon/altaria/mega/icon.png b/graphics/pokemon/gen_3/altaria/mega/icon.png
similarity index 100%
rename from graphics/pokemon/altaria/mega/icon.png
rename to graphics/pokemon/gen_3/altaria/mega/icon.png
diff --git a/graphics/pokemon/altaria/mega/normal.pal b/graphics/pokemon/gen_3/altaria/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/altaria/mega/normal.pal
rename to graphics/pokemon/gen_3/altaria/mega/normal.pal
diff --git a/graphics/pokemon/altaria/mega/shiny.pal b/graphics/pokemon/gen_3/altaria/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/altaria/mega/shiny.pal
rename to graphics/pokemon/gen_3/altaria/mega/shiny.pal
diff --git a/graphics/pokemon/altaria/normal.pal b/graphics/pokemon/gen_3/altaria/normal.pal
similarity index 100%
rename from graphics/pokemon/altaria/normal.pal
rename to graphics/pokemon/gen_3/altaria/normal.pal
diff --git a/graphics/pokemon/altaria/shiny.pal b/graphics/pokemon/gen_3/altaria/shiny.pal
similarity index 100%
rename from graphics/pokemon/altaria/shiny.pal
rename to graphics/pokemon/gen_3/altaria/shiny.pal
diff --git a/graphics/pokemon/anorith/anim_front.png b/graphics/pokemon/gen_3/anorith/anim_front.png
similarity index 100%
rename from graphics/pokemon/anorith/anim_front.png
rename to graphics/pokemon/gen_3/anorith/anim_front.png
diff --git a/graphics/pokemon/anorith/back.png b/graphics/pokemon/gen_3/anorith/back.png
similarity index 100%
rename from graphics/pokemon/anorith/back.png
rename to graphics/pokemon/gen_3/anorith/back.png
diff --git a/graphics/pokemon/duosion/footprint.png b/graphics/pokemon/gen_3/anorith/footprint.png
similarity index 100%
rename from graphics/pokemon/duosion/footprint.png
rename to graphics/pokemon/gen_3/anorith/footprint.png
diff --git a/graphics/pokemon/anorith/icon.png b/graphics/pokemon/gen_3/anorith/icon.png
similarity index 100%
rename from graphics/pokemon/anorith/icon.png
rename to graphics/pokemon/gen_3/anorith/icon.png
diff --git a/graphics/pokemon/anorith/normal.pal b/graphics/pokemon/gen_3/anorith/normal.pal
similarity index 100%
rename from graphics/pokemon/anorith/normal.pal
rename to graphics/pokemon/gen_3/anorith/normal.pal
diff --git a/graphics/pokemon/anorith/shiny.pal b/graphics/pokemon/gen_3/anorith/shiny.pal
similarity index 100%
rename from graphics/pokemon/anorith/shiny.pal
rename to graphics/pokemon/gen_3/anorith/shiny.pal
diff --git a/graphics/pokemon/armaldo/anim_front.png b/graphics/pokemon/gen_3/armaldo/anim_front.png
similarity index 100%
rename from graphics/pokemon/armaldo/anim_front.png
rename to graphics/pokemon/gen_3/armaldo/anim_front.png
diff --git a/graphics/pokemon/armaldo/back.png b/graphics/pokemon/gen_3/armaldo/back.png
similarity index 100%
rename from graphics/pokemon/armaldo/back.png
rename to graphics/pokemon/gen_3/armaldo/back.png
diff --git a/graphics/pokemon/armaldo/footprint.png b/graphics/pokemon/gen_3/armaldo/footprint.png
similarity index 100%
rename from graphics/pokemon/armaldo/footprint.png
rename to graphics/pokemon/gen_3/armaldo/footprint.png
diff --git a/graphics/pokemon/armaldo/icon.png b/graphics/pokemon/gen_3/armaldo/icon.png
similarity index 100%
rename from graphics/pokemon/armaldo/icon.png
rename to graphics/pokemon/gen_3/armaldo/icon.png
diff --git a/graphics/pokemon/armaldo/normal.pal b/graphics/pokemon/gen_3/armaldo/normal.pal
similarity index 100%
rename from graphics/pokemon/armaldo/normal.pal
rename to graphics/pokemon/gen_3/armaldo/normal.pal
diff --git a/graphics/pokemon/armaldo/shiny.pal b/graphics/pokemon/gen_3/armaldo/shiny.pal
similarity index 100%
rename from graphics/pokemon/armaldo/shiny.pal
rename to graphics/pokemon/gen_3/armaldo/shiny.pal
diff --git a/graphics/pokemon/aron/anim_front.png b/graphics/pokemon/gen_3/aron/anim_front.png
similarity index 100%
rename from graphics/pokemon/aron/anim_front.png
rename to graphics/pokemon/gen_3/aron/anim_front.png
diff --git a/graphics/pokemon/aron/back.png b/graphics/pokemon/gen_3/aron/back.png
similarity index 100%
rename from graphics/pokemon/aron/back.png
rename to graphics/pokemon/gen_3/aron/back.png
diff --git a/graphics/pokemon/aron/footprint.png b/graphics/pokemon/gen_3/aron/footprint.png
similarity index 100%
rename from graphics/pokemon/aron/footprint.png
rename to graphics/pokemon/gen_3/aron/footprint.png
diff --git a/graphics/pokemon/aron/icon.png b/graphics/pokemon/gen_3/aron/icon.png
similarity index 100%
rename from graphics/pokemon/aron/icon.png
rename to graphics/pokemon/gen_3/aron/icon.png
diff --git a/graphics/pokemon/aron/normal.pal b/graphics/pokemon/gen_3/aron/normal.pal
similarity index 100%
rename from graphics/pokemon/aron/normal.pal
rename to graphics/pokemon/gen_3/aron/normal.pal
diff --git a/graphics/pokemon/aron/shiny.pal b/graphics/pokemon/gen_3/aron/shiny.pal
similarity index 100%
rename from graphics/pokemon/aron/shiny.pal
rename to graphics/pokemon/gen_3/aron/shiny.pal
diff --git a/graphics/pokemon/azurill/anim_front.png b/graphics/pokemon/gen_3/azurill/anim_front.png
similarity index 100%
rename from graphics/pokemon/azurill/anim_front.png
rename to graphics/pokemon/gen_3/azurill/anim_front.png
diff --git a/graphics/pokemon/azurill/back.png b/graphics/pokemon/gen_3/azurill/back.png
similarity index 100%
rename from graphics/pokemon/azurill/back.png
rename to graphics/pokemon/gen_3/azurill/back.png
diff --git a/graphics/pokemon/azurill/footprint.png b/graphics/pokemon/gen_3/azurill/footprint.png
similarity index 100%
rename from graphics/pokemon/azurill/footprint.png
rename to graphics/pokemon/gen_3/azurill/footprint.png
diff --git a/graphics/pokemon/azurill/icon.png b/graphics/pokemon/gen_3/azurill/icon.png
similarity index 100%
rename from graphics/pokemon/azurill/icon.png
rename to graphics/pokemon/gen_3/azurill/icon.png
diff --git a/graphics/pokemon/azurill/normal.pal b/graphics/pokemon/gen_3/azurill/normal.pal
similarity index 100%
rename from graphics/pokemon/azurill/normal.pal
rename to graphics/pokemon/gen_3/azurill/normal.pal
diff --git a/graphics/pokemon/azurill/shiny.pal b/graphics/pokemon/gen_3/azurill/shiny.pal
similarity index 100%
rename from graphics/pokemon/azurill/shiny.pal
rename to graphics/pokemon/gen_3/azurill/shiny.pal
diff --git a/graphics/pokemon/bagon/anim_front.png b/graphics/pokemon/gen_3/bagon/anim_front.png
similarity index 100%
rename from graphics/pokemon/bagon/anim_front.png
rename to graphics/pokemon/gen_3/bagon/anim_front.png
diff --git a/graphics/pokemon/bagon/back.png b/graphics/pokemon/gen_3/bagon/back.png
similarity index 100%
rename from graphics/pokemon/bagon/back.png
rename to graphics/pokemon/gen_3/bagon/back.png
diff --git a/graphics/pokemon/bagon/footprint.png b/graphics/pokemon/gen_3/bagon/footprint.png
similarity index 100%
rename from graphics/pokemon/bagon/footprint.png
rename to graphics/pokemon/gen_3/bagon/footprint.png
diff --git a/graphics/pokemon/bagon/icon.png b/graphics/pokemon/gen_3/bagon/icon.png
similarity index 100%
rename from graphics/pokemon/bagon/icon.png
rename to graphics/pokemon/gen_3/bagon/icon.png
diff --git a/graphics/pokemon/bagon/normal.pal b/graphics/pokemon/gen_3/bagon/normal.pal
similarity index 100%
rename from graphics/pokemon/bagon/normal.pal
rename to graphics/pokemon/gen_3/bagon/normal.pal
diff --git a/graphics/pokemon/bagon/shiny.pal b/graphics/pokemon/gen_3/bagon/shiny.pal
similarity index 100%
rename from graphics/pokemon/bagon/shiny.pal
rename to graphics/pokemon/gen_3/bagon/shiny.pal
diff --git a/graphics/pokemon/baltoy/anim_front.png b/graphics/pokemon/gen_3/baltoy/anim_front.png
similarity index 100%
rename from graphics/pokemon/baltoy/anim_front.png
rename to graphics/pokemon/gen_3/baltoy/anim_front.png
diff --git a/graphics/pokemon/baltoy/back.png b/graphics/pokemon/gen_3/baltoy/back.png
similarity index 100%
rename from graphics/pokemon/baltoy/back.png
rename to graphics/pokemon/gen_3/baltoy/back.png
diff --git a/graphics/pokemon/drapion/footprint.png b/graphics/pokemon/gen_3/baltoy/footprint.png
similarity index 100%
rename from graphics/pokemon/drapion/footprint.png
rename to graphics/pokemon/gen_3/baltoy/footprint.png
diff --git a/graphics/pokemon/baltoy/icon.png b/graphics/pokemon/gen_3/baltoy/icon.png
similarity index 100%
rename from graphics/pokemon/baltoy/icon.png
rename to graphics/pokemon/gen_3/baltoy/icon.png
diff --git a/graphics/pokemon/baltoy/normal.pal b/graphics/pokemon/gen_3/baltoy/normal.pal
similarity index 100%
rename from graphics/pokemon/baltoy/normal.pal
rename to graphics/pokemon/gen_3/baltoy/normal.pal
diff --git a/graphics/pokemon/baltoy/shiny.pal b/graphics/pokemon/gen_3/baltoy/shiny.pal
similarity index 100%
rename from graphics/pokemon/baltoy/shiny.pal
rename to graphics/pokemon/gen_3/baltoy/shiny.pal
diff --git a/graphics/pokemon/banette/anim_front.png b/graphics/pokemon/gen_3/banette/anim_front.png
similarity index 100%
rename from graphics/pokemon/banette/anim_front.png
rename to graphics/pokemon/gen_3/banette/anim_front.png
diff --git a/graphics/pokemon/banette/back.png b/graphics/pokemon/gen_3/banette/back.png
similarity index 100%
rename from graphics/pokemon/banette/back.png
rename to graphics/pokemon/gen_3/banette/back.png
diff --git a/graphics/pokemon/banette/footprint.png b/graphics/pokemon/gen_3/banette/footprint.png
similarity index 100%
rename from graphics/pokemon/banette/footprint.png
rename to graphics/pokemon/gen_3/banette/footprint.png
diff --git a/graphics/pokemon/banette/icon.png b/graphics/pokemon/gen_3/banette/icon.png
similarity index 100%
rename from graphics/pokemon/banette/icon.png
rename to graphics/pokemon/gen_3/banette/icon.png
diff --git a/graphics/pokemon/banette/mega/back.png b/graphics/pokemon/gen_3/banette/mega/back.png
similarity index 100%
rename from graphics/pokemon/banette/mega/back.png
rename to graphics/pokemon/gen_3/banette/mega/back.png
diff --git a/graphics/pokemon/banette/mega/front.png b/graphics/pokemon/gen_3/banette/mega/front.png
similarity index 100%
rename from graphics/pokemon/banette/mega/front.png
rename to graphics/pokemon/gen_3/banette/mega/front.png
diff --git a/graphics/pokemon/banette/mega/icon.png b/graphics/pokemon/gen_3/banette/mega/icon.png
similarity index 100%
rename from graphics/pokemon/banette/mega/icon.png
rename to graphics/pokemon/gen_3/banette/mega/icon.png
diff --git a/graphics/pokemon/banette/mega/normal.pal b/graphics/pokemon/gen_3/banette/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/banette/mega/normal.pal
rename to graphics/pokemon/gen_3/banette/mega/normal.pal
diff --git a/graphics/pokemon/banette/mega/shiny.pal b/graphics/pokemon/gen_3/banette/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/banette/mega/shiny.pal
rename to graphics/pokemon/gen_3/banette/mega/shiny.pal
diff --git a/graphics/pokemon/banette/normal.pal b/graphics/pokemon/gen_3/banette/normal.pal
similarity index 100%
rename from graphics/pokemon/banette/normal.pal
rename to graphics/pokemon/gen_3/banette/normal.pal
diff --git a/graphics/pokemon/banette/shiny.pal b/graphics/pokemon/gen_3/banette/shiny.pal
similarity index 100%
rename from graphics/pokemon/banette/shiny.pal
rename to graphics/pokemon/gen_3/banette/shiny.pal
diff --git a/graphics/pokemon/barboach/anim_front.png b/graphics/pokemon/gen_3/barboach/anim_front.png
similarity index 100%
rename from graphics/pokemon/barboach/anim_front.png
rename to graphics/pokemon/gen_3/barboach/anim_front.png
diff --git a/graphics/pokemon/barboach/back.png b/graphics/pokemon/gen_3/barboach/back.png
similarity index 100%
rename from graphics/pokemon/barboach/back.png
rename to graphics/pokemon/gen_3/barboach/back.png
diff --git a/graphics/pokemon/dusknoir/footprint.png b/graphics/pokemon/gen_3/barboach/footprint.png
similarity index 100%
rename from graphics/pokemon/dusknoir/footprint.png
rename to graphics/pokemon/gen_3/barboach/footprint.png
diff --git a/graphics/pokemon/barboach/icon.png b/graphics/pokemon/gen_3/barboach/icon.png
similarity index 100%
rename from graphics/pokemon/barboach/icon.png
rename to graphics/pokemon/gen_3/barboach/icon.png
diff --git a/graphics/pokemon/barboach/normal.pal b/graphics/pokemon/gen_3/barboach/normal.pal
similarity index 100%
rename from graphics/pokemon/barboach/normal.pal
rename to graphics/pokemon/gen_3/barboach/normal.pal
diff --git a/graphics/pokemon/barboach/shiny.pal b/graphics/pokemon/gen_3/barboach/shiny.pal
similarity index 100%
rename from graphics/pokemon/barboach/shiny.pal
rename to graphics/pokemon/gen_3/barboach/shiny.pal
diff --git a/graphics/pokemon/beautifly/anim_front.png b/graphics/pokemon/gen_3/beautifly/anim_front.png
similarity index 100%
rename from graphics/pokemon/beautifly/anim_front.png
rename to graphics/pokemon/gen_3/beautifly/anim_front.png
diff --git a/graphics/pokemon/beautifly/anim_frontf.png b/graphics/pokemon/gen_3/beautifly/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/beautifly/anim_frontf.png
rename to graphics/pokemon/gen_3/beautifly/anim_frontf.png
diff --git a/graphics/pokemon/beautifly/back.png b/graphics/pokemon/gen_3/beautifly/back.png
similarity index 100%
rename from graphics/pokemon/beautifly/back.png
rename to graphics/pokemon/gen_3/beautifly/back.png
diff --git a/graphics/pokemon/beautifly/backf.png b/graphics/pokemon/gen_3/beautifly/backf.png
similarity index 100%
rename from graphics/pokemon/beautifly/backf.png
rename to graphics/pokemon/gen_3/beautifly/backf.png
diff --git a/graphics/pokemon/beautifly/footprint.png b/graphics/pokemon/gen_3/beautifly/footprint.png
similarity index 100%
rename from graphics/pokemon/beautifly/footprint.png
rename to graphics/pokemon/gen_3/beautifly/footprint.png
diff --git a/graphics/pokemon/beautifly/icon.png b/graphics/pokemon/gen_3/beautifly/icon.png
similarity index 100%
rename from graphics/pokemon/beautifly/icon.png
rename to graphics/pokemon/gen_3/beautifly/icon.png
diff --git a/graphics/pokemon/beautifly/normal.pal b/graphics/pokemon/gen_3/beautifly/normal.pal
similarity index 100%
rename from graphics/pokemon/beautifly/normal.pal
rename to graphics/pokemon/gen_3/beautifly/normal.pal
diff --git a/graphics/pokemon/beautifly/shiny.pal b/graphics/pokemon/gen_3/beautifly/shiny.pal
similarity index 100%
rename from graphics/pokemon/beautifly/shiny.pal
rename to graphics/pokemon/gen_3/beautifly/shiny.pal
diff --git a/graphics/pokemon/beldum/anim_front.png b/graphics/pokemon/gen_3/beldum/anim_front.png
similarity index 100%
rename from graphics/pokemon/beldum/anim_front.png
rename to graphics/pokemon/gen_3/beldum/anim_front.png
diff --git a/graphics/pokemon/beldum/back.png b/graphics/pokemon/gen_3/beldum/back.png
similarity index 100%
rename from graphics/pokemon/beldum/back.png
rename to graphics/pokemon/gen_3/beldum/back.png
diff --git a/graphics/pokemon/beldum/footprint.png b/graphics/pokemon/gen_3/beldum/footprint.png
similarity index 100%
rename from graphics/pokemon/beldum/footprint.png
rename to graphics/pokemon/gen_3/beldum/footprint.png
diff --git a/graphics/pokemon/beldum/icon.png b/graphics/pokemon/gen_3/beldum/icon.png
similarity index 100%
rename from graphics/pokemon/beldum/icon.png
rename to graphics/pokemon/gen_3/beldum/icon.png
diff --git a/graphics/pokemon/beldum/normal.pal b/graphics/pokemon/gen_3/beldum/normal.pal
similarity index 100%
rename from graphics/pokemon/beldum/normal.pal
rename to graphics/pokemon/gen_3/beldum/normal.pal
diff --git a/graphics/pokemon/beldum/shiny.pal b/graphics/pokemon/gen_3/beldum/shiny.pal
similarity index 100%
rename from graphics/pokemon/beldum/shiny.pal
rename to graphics/pokemon/gen_3/beldum/shiny.pal
diff --git a/graphics/pokemon/blaziken/anim_front.png b/graphics/pokemon/gen_3/blaziken/anim_front.png
similarity index 100%
rename from graphics/pokemon/blaziken/anim_front.png
rename to graphics/pokemon/gen_3/blaziken/anim_front.png
diff --git a/graphics/pokemon/blaziken/anim_frontf.png b/graphics/pokemon/gen_3/blaziken/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/blaziken/anim_frontf.png
rename to graphics/pokemon/gen_3/blaziken/anim_frontf.png
diff --git a/graphics/pokemon/blaziken/back.png b/graphics/pokemon/gen_3/blaziken/back.png
similarity index 100%
rename from graphics/pokemon/blaziken/back.png
rename to graphics/pokemon/gen_3/blaziken/back.png
diff --git a/graphics/pokemon/blaziken/backf.png b/graphics/pokemon/gen_3/blaziken/backf.png
similarity index 100%
rename from graphics/pokemon/blaziken/backf.png
rename to graphics/pokemon/gen_3/blaziken/backf.png
diff --git a/graphics/pokemon/blaziken/footprint.png b/graphics/pokemon/gen_3/blaziken/footprint.png
similarity index 100%
rename from graphics/pokemon/blaziken/footprint.png
rename to graphics/pokemon/gen_3/blaziken/footprint.png
diff --git a/graphics/pokemon/blaziken/icon.png b/graphics/pokemon/gen_3/blaziken/icon.png
similarity index 100%
rename from graphics/pokemon/blaziken/icon.png
rename to graphics/pokemon/gen_3/blaziken/icon.png
diff --git a/graphics/pokemon/blaziken/mega/back.png b/graphics/pokemon/gen_3/blaziken/mega/back.png
similarity index 100%
rename from graphics/pokemon/blaziken/mega/back.png
rename to graphics/pokemon/gen_3/blaziken/mega/back.png
diff --git a/graphics/pokemon/blaziken/mega/front.png b/graphics/pokemon/gen_3/blaziken/mega/front.png
similarity index 100%
rename from graphics/pokemon/blaziken/mega/front.png
rename to graphics/pokemon/gen_3/blaziken/mega/front.png
diff --git a/graphics/pokemon/blaziken/mega/icon.png b/graphics/pokemon/gen_3/blaziken/mega/icon.png
similarity index 100%
rename from graphics/pokemon/blaziken/mega/icon.png
rename to graphics/pokemon/gen_3/blaziken/mega/icon.png
diff --git a/graphics/pokemon/blaziken/mega/normal.pal b/graphics/pokemon/gen_3/blaziken/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/blaziken/mega/normal.pal
rename to graphics/pokemon/gen_3/blaziken/mega/normal.pal
diff --git a/graphics/pokemon/blaziken/mega/shiny.pal b/graphics/pokemon/gen_3/blaziken/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/blaziken/mega/shiny.pal
rename to graphics/pokemon/gen_3/blaziken/mega/shiny.pal
diff --git a/graphics/pokemon/blaziken/normal.pal b/graphics/pokemon/gen_3/blaziken/normal.pal
similarity index 100%
rename from graphics/pokemon/blaziken/normal.pal
rename to graphics/pokemon/gen_3/blaziken/normal.pal
diff --git a/graphics/pokemon/blaziken/shiny.pal b/graphics/pokemon/gen_3/blaziken/shiny.pal
similarity index 100%
rename from graphics/pokemon/blaziken/shiny.pal
rename to graphics/pokemon/gen_3/blaziken/shiny.pal
diff --git a/graphics/pokemon/breloom/anim_front.png b/graphics/pokemon/gen_3/breloom/anim_front.png
similarity index 100%
rename from graphics/pokemon/breloom/anim_front.png
rename to graphics/pokemon/gen_3/breloom/anim_front.png
diff --git a/graphics/pokemon/breloom/back.png b/graphics/pokemon/gen_3/breloom/back.png
similarity index 100%
rename from graphics/pokemon/breloom/back.png
rename to graphics/pokemon/gen_3/breloom/back.png
diff --git a/graphics/pokemon/breloom/footprint.png b/graphics/pokemon/gen_3/breloom/footprint.png
similarity index 100%
rename from graphics/pokemon/breloom/footprint.png
rename to graphics/pokemon/gen_3/breloom/footprint.png
diff --git a/graphics/pokemon/breloom/icon.png b/graphics/pokemon/gen_3/breloom/icon.png
similarity index 100%
rename from graphics/pokemon/breloom/icon.png
rename to graphics/pokemon/gen_3/breloom/icon.png
diff --git a/graphics/pokemon/breloom/normal.pal b/graphics/pokemon/gen_3/breloom/normal.pal
similarity index 100%
rename from graphics/pokemon/breloom/normal.pal
rename to graphics/pokemon/gen_3/breloom/normal.pal
diff --git a/graphics/pokemon/breloom/shiny.pal b/graphics/pokemon/gen_3/breloom/shiny.pal
similarity index 100%
rename from graphics/pokemon/breloom/shiny.pal
rename to graphics/pokemon/gen_3/breloom/shiny.pal
diff --git a/graphics/pokemon/cacnea/anim_front.png b/graphics/pokemon/gen_3/cacnea/anim_front.png
similarity index 100%
rename from graphics/pokemon/cacnea/anim_front.png
rename to graphics/pokemon/gen_3/cacnea/anim_front.png
diff --git a/graphics/pokemon/cacnea/back.png b/graphics/pokemon/gen_3/cacnea/back.png
similarity index 100%
rename from graphics/pokemon/cacnea/back.png
rename to graphics/pokemon/gen_3/cacnea/back.png
diff --git a/graphics/pokemon/cacnea/footprint.png b/graphics/pokemon/gen_3/cacnea/footprint.png
similarity index 100%
rename from graphics/pokemon/cacnea/footprint.png
rename to graphics/pokemon/gen_3/cacnea/footprint.png
diff --git a/graphics/pokemon/cacnea/icon.png b/graphics/pokemon/gen_3/cacnea/icon.png
similarity index 100%
rename from graphics/pokemon/cacnea/icon.png
rename to graphics/pokemon/gen_3/cacnea/icon.png
diff --git a/graphics/pokemon/cacnea/normal.pal b/graphics/pokemon/gen_3/cacnea/normal.pal
similarity index 100%
rename from graphics/pokemon/cacnea/normal.pal
rename to graphics/pokemon/gen_3/cacnea/normal.pal
diff --git a/graphics/pokemon/cacnea/shiny.pal b/graphics/pokemon/gen_3/cacnea/shiny.pal
similarity index 100%
rename from graphics/pokemon/cacnea/shiny.pal
rename to graphics/pokemon/gen_3/cacnea/shiny.pal
diff --git a/graphics/pokemon/cacturne/anim_front.png b/graphics/pokemon/gen_3/cacturne/anim_front.png
similarity index 100%
rename from graphics/pokemon/cacturne/anim_front.png
rename to graphics/pokemon/gen_3/cacturne/anim_front.png
diff --git a/graphics/pokemon/cacturne/anim_frontf.png b/graphics/pokemon/gen_3/cacturne/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/cacturne/anim_frontf.png
rename to graphics/pokemon/gen_3/cacturne/anim_frontf.png
diff --git a/graphics/pokemon/cacturne/back.png b/graphics/pokemon/gen_3/cacturne/back.png
similarity index 100%
rename from graphics/pokemon/cacturne/back.png
rename to graphics/pokemon/gen_3/cacturne/back.png
diff --git a/graphics/pokemon/cacturne/footprint.png b/graphics/pokemon/gen_3/cacturne/footprint.png
similarity index 100%
rename from graphics/pokemon/cacturne/footprint.png
rename to graphics/pokemon/gen_3/cacturne/footprint.png
diff --git a/graphics/pokemon/cacturne/icon.png b/graphics/pokemon/gen_3/cacturne/icon.png
similarity index 100%
rename from graphics/pokemon/cacturne/icon.png
rename to graphics/pokemon/gen_3/cacturne/icon.png
diff --git a/graphics/pokemon/cacturne/normal.pal b/graphics/pokemon/gen_3/cacturne/normal.pal
similarity index 100%
rename from graphics/pokemon/cacturne/normal.pal
rename to graphics/pokemon/gen_3/cacturne/normal.pal
diff --git a/graphics/pokemon/cacturne/shiny.pal b/graphics/pokemon/gen_3/cacturne/shiny.pal
similarity index 100%
rename from graphics/pokemon/cacturne/shiny.pal
rename to graphics/pokemon/gen_3/cacturne/shiny.pal
diff --git a/graphics/pokemon/camerupt/anim_front.png b/graphics/pokemon/gen_3/camerupt/anim_front.png
similarity index 100%
rename from graphics/pokemon/camerupt/anim_front.png
rename to graphics/pokemon/gen_3/camerupt/anim_front.png
diff --git a/graphics/pokemon/camerupt/anim_frontf.png b/graphics/pokemon/gen_3/camerupt/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/camerupt/anim_frontf.png
rename to graphics/pokemon/gen_3/camerupt/anim_frontf.png
diff --git a/graphics/pokemon/camerupt/back.png b/graphics/pokemon/gen_3/camerupt/back.png
similarity index 100%
rename from graphics/pokemon/camerupt/back.png
rename to graphics/pokemon/gen_3/camerupt/back.png
diff --git a/graphics/pokemon/camerupt/backf.png b/graphics/pokemon/gen_3/camerupt/backf.png
similarity index 100%
rename from graphics/pokemon/camerupt/backf.png
rename to graphics/pokemon/gen_3/camerupt/backf.png
diff --git a/graphics/pokemon/camerupt/footprint.png b/graphics/pokemon/gen_3/camerupt/footprint.png
similarity index 100%
rename from graphics/pokemon/camerupt/footprint.png
rename to graphics/pokemon/gen_3/camerupt/footprint.png
diff --git a/graphics/pokemon/camerupt/icon.png b/graphics/pokemon/gen_3/camerupt/icon.png
similarity index 100%
rename from graphics/pokemon/camerupt/icon.png
rename to graphics/pokemon/gen_3/camerupt/icon.png
diff --git a/graphics/pokemon/camerupt/mega/back.png b/graphics/pokemon/gen_3/camerupt/mega/back.png
similarity index 100%
rename from graphics/pokemon/camerupt/mega/back.png
rename to graphics/pokemon/gen_3/camerupt/mega/back.png
diff --git a/graphics/pokemon/camerupt/mega/front.png b/graphics/pokemon/gen_3/camerupt/mega/front.png
similarity index 100%
rename from graphics/pokemon/camerupt/mega/front.png
rename to graphics/pokemon/gen_3/camerupt/mega/front.png
diff --git a/graphics/pokemon/camerupt/mega/icon.png b/graphics/pokemon/gen_3/camerupt/mega/icon.png
similarity index 100%
rename from graphics/pokemon/camerupt/mega/icon.png
rename to graphics/pokemon/gen_3/camerupt/mega/icon.png
diff --git a/graphics/pokemon/camerupt/mega/normal.pal b/graphics/pokemon/gen_3/camerupt/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/camerupt/mega/normal.pal
rename to graphics/pokemon/gen_3/camerupt/mega/normal.pal
diff --git a/graphics/pokemon/camerupt/mega/shiny.pal b/graphics/pokemon/gen_3/camerupt/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/camerupt/mega/shiny.pal
rename to graphics/pokemon/gen_3/camerupt/mega/shiny.pal
diff --git a/graphics/pokemon/camerupt/normal.pal b/graphics/pokemon/gen_3/camerupt/normal.pal
similarity index 100%
rename from graphics/pokemon/camerupt/normal.pal
rename to graphics/pokemon/gen_3/camerupt/normal.pal
diff --git a/graphics/pokemon/camerupt/shiny.pal b/graphics/pokemon/gen_3/camerupt/shiny.pal
similarity index 100%
rename from graphics/pokemon/camerupt/shiny.pal
rename to graphics/pokemon/gen_3/camerupt/shiny.pal
diff --git a/graphics/pokemon/carvanha/anim_front.png b/graphics/pokemon/gen_3/carvanha/anim_front.png
similarity index 100%
rename from graphics/pokemon/carvanha/anim_front.png
rename to graphics/pokemon/gen_3/carvanha/anim_front.png
diff --git a/graphics/pokemon/carvanha/back.png b/graphics/pokemon/gen_3/carvanha/back.png
similarity index 100%
rename from graphics/pokemon/carvanha/back.png
rename to graphics/pokemon/gen_3/carvanha/back.png
diff --git a/graphics/pokemon/duskull/footprint.png b/graphics/pokemon/gen_3/carvanha/footprint.png
similarity index 100%
rename from graphics/pokemon/duskull/footprint.png
rename to graphics/pokemon/gen_3/carvanha/footprint.png
diff --git a/graphics/pokemon/carvanha/icon.png b/graphics/pokemon/gen_3/carvanha/icon.png
similarity index 100%
rename from graphics/pokemon/carvanha/icon.png
rename to graphics/pokemon/gen_3/carvanha/icon.png
diff --git a/graphics/pokemon/carvanha/normal.pal b/graphics/pokemon/gen_3/carvanha/normal.pal
similarity index 100%
rename from graphics/pokemon/carvanha/normal.pal
rename to graphics/pokemon/gen_3/carvanha/normal.pal
diff --git a/graphics/pokemon/carvanha/shiny.pal b/graphics/pokemon/gen_3/carvanha/shiny.pal
similarity index 100%
rename from graphics/pokemon/carvanha/shiny.pal
rename to graphics/pokemon/gen_3/carvanha/shiny.pal
diff --git a/graphics/pokemon/cascoon/anim_front.png b/graphics/pokemon/gen_3/cascoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/cascoon/anim_front.png
rename to graphics/pokemon/gen_3/cascoon/anim_front.png
diff --git a/graphics/pokemon/cascoon/back.png b/graphics/pokemon/gen_3/cascoon/back.png
similarity index 100%
rename from graphics/pokemon/cascoon/back.png
rename to graphics/pokemon/gen_3/cascoon/back.png
diff --git a/graphics/pokemon/eelektrik/footprint.png b/graphics/pokemon/gen_3/cascoon/footprint.png
similarity index 100%
rename from graphics/pokemon/eelektrik/footprint.png
rename to graphics/pokemon/gen_3/cascoon/footprint.png
diff --git a/graphics/pokemon/cascoon/icon.png b/graphics/pokemon/gen_3/cascoon/icon.png
similarity index 100%
rename from graphics/pokemon/cascoon/icon.png
rename to graphics/pokemon/gen_3/cascoon/icon.png
diff --git a/graphics/pokemon/cascoon/normal.pal b/graphics/pokemon/gen_3/cascoon/normal.pal
similarity index 100%
rename from graphics/pokemon/cascoon/normal.pal
rename to graphics/pokemon/gen_3/cascoon/normal.pal
diff --git a/graphics/pokemon/cascoon/shiny.pal b/graphics/pokemon/gen_3/cascoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/cascoon/shiny.pal
rename to graphics/pokemon/gen_3/cascoon/shiny.pal
diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/gen_3/castform/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/anim_front.png
rename to graphics/pokemon/gen_3/castform/anim_front.png
diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/gen_3/castform/back.png
similarity index 100%
rename from graphics/pokemon/castform/back.png
rename to graphics/pokemon/gen_3/castform/back.png
diff --git a/graphics/pokemon/eelektross/footprint.png b/graphics/pokemon/gen_3/castform/footprint.png
similarity index 100%
rename from graphics/pokemon/eelektross/footprint.png
rename to graphics/pokemon/gen_3/castform/footprint.png
diff --git a/graphics/pokemon/castform/icon.png b/graphics/pokemon/gen_3/castform/icon.png
similarity index 100%
rename from graphics/pokemon/castform/icon.png
rename to graphics/pokemon/gen_3/castform/icon.png
diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/gen_3/castform/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/normal.pal
rename to graphics/pokemon/gen_3/castform/normal.pal
diff --git a/graphics/pokemon/castform/rainy/anim_front.png b/graphics/pokemon/gen_3/castform/rainy/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/rainy/anim_front.png
rename to graphics/pokemon/gen_3/castform/rainy/anim_front.png
diff --git a/graphics/pokemon/castform/rainy/back.png b/graphics/pokemon/gen_3/castform/rainy/back.png
similarity index 100%
rename from graphics/pokemon/castform/rainy/back.png
rename to graphics/pokemon/gen_3/castform/rainy/back.png
diff --git a/graphics/pokemon/castform/rainy/icon.png b/graphics/pokemon/gen_3/castform/rainy/icon.png
similarity index 100%
rename from graphics/pokemon/castform/rainy/icon.png
rename to graphics/pokemon/gen_3/castform/rainy/icon.png
diff --git a/graphics/pokemon/castform/rainy/normal.pal b/graphics/pokemon/gen_3/castform/rainy/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/rainy/normal.pal
rename to graphics/pokemon/gen_3/castform/rainy/normal.pal
diff --git a/graphics/pokemon/castform/rainy/shiny.pal b/graphics/pokemon/gen_3/castform/rainy/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/rainy/shiny.pal
rename to graphics/pokemon/gen_3/castform/rainy/shiny.pal
diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/gen_3/castform/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/shiny.pal
rename to graphics/pokemon/gen_3/castform/shiny.pal
diff --git a/graphics/pokemon/castform/snowy/anim_front.png b/graphics/pokemon/gen_3/castform/snowy/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/snowy/anim_front.png
rename to graphics/pokemon/gen_3/castform/snowy/anim_front.png
diff --git a/graphics/pokemon/castform/snowy/back.png b/graphics/pokemon/gen_3/castform/snowy/back.png
similarity index 100%
rename from graphics/pokemon/castform/snowy/back.png
rename to graphics/pokemon/gen_3/castform/snowy/back.png
diff --git a/graphics/pokemon/castform/snowy/icon.png b/graphics/pokemon/gen_3/castform/snowy/icon.png
similarity index 100%
rename from graphics/pokemon/castform/snowy/icon.png
rename to graphics/pokemon/gen_3/castform/snowy/icon.png
diff --git a/graphics/pokemon/castform/snowy/normal.pal b/graphics/pokemon/gen_3/castform/snowy/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/snowy/normal.pal
rename to graphics/pokemon/gen_3/castform/snowy/normal.pal
diff --git a/graphics/pokemon/castform/snowy/shiny.pal b/graphics/pokemon/gen_3/castform/snowy/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/snowy/shiny.pal
rename to graphics/pokemon/gen_3/castform/snowy/shiny.pal
diff --git a/graphics/pokemon/castform/sunny/anim_front.png b/graphics/pokemon/gen_3/castform/sunny/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/sunny/anim_front.png
rename to graphics/pokemon/gen_3/castform/sunny/anim_front.png
diff --git a/graphics/pokemon/castform/sunny/back.png b/graphics/pokemon/gen_3/castform/sunny/back.png
similarity index 100%
rename from graphics/pokemon/castform/sunny/back.png
rename to graphics/pokemon/gen_3/castform/sunny/back.png
diff --git a/graphics/pokemon/castform/sunny/icon.png b/graphics/pokemon/gen_3/castform/sunny/icon.png
similarity index 100%
rename from graphics/pokemon/castform/sunny/icon.png
rename to graphics/pokemon/gen_3/castform/sunny/icon.png
diff --git a/graphics/pokemon/castform/sunny/normal.pal b/graphics/pokemon/gen_3/castform/sunny/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/sunny/normal.pal
rename to graphics/pokemon/gen_3/castform/sunny/normal.pal
diff --git a/graphics/pokemon/castform/sunny/shiny.pal b/graphics/pokemon/gen_3/castform/sunny/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/sunny/shiny.pal
rename to graphics/pokemon/gen_3/castform/sunny/shiny.pal
diff --git a/graphics/pokemon/chimecho/anim_front.png b/graphics/pokemon/gen_3/chimecho/anim_front.png
similarity index 100%
rename from graphics/pokemon/chimecho/anim_front.png
rename to graphics/pokemon/gen_3/chimecho/anim_front.png
diff --git a/graphics/pokemon/chimecho/back.png b/graphics/pokemon/gen_3/chimecho/back.png
similarity index 100%
rename from graphics/pokemon/chimecho/back.png
rename to graphics/pokemon/gen_3/chimecho/back.png
diff --git a/graphics/pokemon/ekans/footprint.png b/graphics/pokemon/gen_3/chimecho/footprint.png
similarity index 100%
rename from graphics/pokemon/ekans/footprint.png
rename to graphics/pokemon/gen_3/chimecho/footprint.png
diff --git a/graphics/pokemon/chimecho/icon.png b/graphics/pokemon/gen_3/chimecho/icon.png
similarity index 100%
rename from graphics/pokemon/chimecho/icon.png
rename to graphics/pokemon/gen_3/chimecho/icon.png
diff --git a/graphics/pokemon/chimecho/normal.pal b/graphics/pokemon/gen_3/chimecho/normal.pal
similarity index 100%
rename from graphics/pokemon/chimecho/normal.pal
rename to graphics/pokemon/gen_3/chimecho/normal.pal
diff --git a/graphics/pokemon/chimecho/shiny.pal b/graphics/pokemon/gen_3/chimecho/shiny.pal
similarity index 100%
rename from graphics/pokemon/chimecho/shiny.pal
rename to graphics/pokemon/gen_3/chimecho/shiny.pal
diff --git a/graphics/pokemon/clamperl/anim_front.png b/graphics/pokemon/gen_3/clamperl/anim_front.png
similarity index 100%
rename from graphics/pokemon/clamperl/anim_front.png
rename to graphics/pokemon/gen_3/clamperl/anim_front.png
diff --git a/graphics/pokemon/clamperl/back.png b/graphics/pokemon/gen_3/clamperl/back.png
similarity index 100%
rename from graphics/pokemon/clamperl/back.png
rename to graphics/pokemon/gen_3/clamperl/back.png
diff --git a/graphics/pokemon/eldegoss/footprint.png b/graphics/pokemon/gen_3/clamperl/footprint.png
similarity index 100%
rename from graphics/pokemon/eldegoss/footprint.png
rename to graphics/pokemon/gen_3/clamperl/footprint.png
diff --git a/graphics/pokemon/clamperl/icon.png b/graphics/pokemon/gen_3/clamperl/icon.png
similarity index 100%
rename from graphics/pokemon/clamperl/icon.png
rename to graphics/pokemon/gen_3/clamperl/icon.png
diff --git a/graphics/pokemon/clamperl/normal.pal b/graphics/pokemon/gen_3/clamperl/normal.pal
similarity index 100%
rename from graphics/pokemon/clamperl/normal.pal
rename to graphics/pokemon/gen_3/clamperl/normal.pal
diff --git a/graphics/pokemon/clamperl/shiny.pal b/graphics/pokemon/gen_3/clamperl/shiny.pal
similarity index 100%
rename from graphics/pokemon/clamperl/shiny.pal
rename to graphics/pokemon/gen_3/clamperl/shiny.pal
diff --git a/graphics/pokemon/claydol/anim_front.png b/graphics/pokemon/gen_3/claydol/anim_front.png
similarity index 100%
rename from graphics/pokemon/claydol/anim_front.png
rename to graphics/pokemon/gen_3/claydol/anim_front.png
diff --git a/graphics/pokemon/claydol/back.png b/graphics/pokemon/gen_3/claydol/back.png
similarity index 100%
rename from graphics/pokemon/claydol/back.png
rename to graphics/pokemon/gen_3/claydol/back.png
diff --git a/graphics/pokemon/claydol/footprint.png b/graphics/pokemon/gen_3/claydol/footprint.png
similarity index 100%
rename from graphics/pokemon/claydol/footprint.png
rename to graphics/pokemon/gen_3/claydol/footprint.png
diff --git a/graphics/pokemon/claydol/icon.png b/graphics/pokemon/gen_3/claydol/icon.png
similarity index 100%
rename from graphics/pokemon/claydol/icon.png
rename to graphics/pokemon/gen_3/claydol/icon.png
diff --git a/graphics/pokemon/claydol/normal.pal b/graphics/pokemon/gen_3/claydol/normal.pal
similarity index 100%
rename from graphics/pokemon/claydol/normal.pal
rename to graphics/pokemon/gen_3/claydol/normal.pal
diff --git a/graphics/pokemon/claydol/shiny.pal b/graphics/pokemon/gen_3/claydol/shiny.pal
similarity index 100%
rename from graphics/pokemon/claydol/shiny.pal
rename to graphics/pokemon/gen_3/claydol/shiny.pal
diff --git a/graphics/pokemon/combusken/anim_front.png b/graphics/pokemon/gen_3/combusken/anim_front.png
similarity index 100%
rename from graphics/pokemon/combusken/anim_front.png
rename to graphics/pokemon/gen_3/combusken/anim_front.png
diff --git a/graphics/pokemon/combusken/anim_frontf.png b/graphics/pokemon/gen_3/combusken/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/combusken/anim_frontf.png
rename to graphics/pokemon/gen_3/combusken/anim_frontf.png
diff --git a/graphics/pokemon/combusken/back.png b/graphics/pokemon/gen_3/combusken/back.png
similarity index 100%
rename from graphics/pokemon/combusken/back.png
rename to graphics/pokemon/gen_3/combusken/back.png
diff --git a/graphics/pokemon/combusken/backf.png b/graphics/pokemon/gen_3/combusken/backf.png
similarity index 100%
rename from graphics/pokemon/combusken/backf.png
rename to graphics/pokemon/gen_3/combusken/backf.png
diff --git a/graphics/pokemon/combusken/footprint.png b/graphics/pokemon/gen_3/combusken/footprint.png
similarity index 100%
rename from graphics/pokemon/combusken/footprint.png
rename to graphics/pokemon/gen_3/combusken/footprint.png
diff --git a/graphics/pokemon/combusken/icon.png b/graphics/pokemon/gen_3/combusken/icon.png
similarity index 100%
rename from graphics/pokemon/combusken/icon.png
rename to graphics/pokemon/gen_3/combusken/icon.png
diff --git a/graphics/pokemon/combusken/normal.pal b/graphics/pokemon/gen_3/combusken/normal.pal
similarity index 100%
rename from graphics/pokemon/combusken/normal.pal
rename to graphics/pokemon/gen_3/combusken/normal.pal
diff --git a/graphics/pokemon/combusken/shiny.pal b/graphics/pokemon/gen_3/combusken/shiny.pal
similarity index 100%
rename from graphics/pokemon/combusken/shiny.pal
rename to graphics/pokemon/gen_3/combusken/shiny.pal
diff --git a/graphics/pokemon/corphish/anim_front.png b/graphics/pokemon/gen_3/corphish/anim_front.png
similarity index 100%
rename from graphics/pokemon/corphish/anim_front.png
rename to graphics/pokemon/gen_3/corphish/anim_front.png
diff --git a/graphics/pokemon/corphish/back.png b/graphics/pokemon/gen_3/corphish/back.png
similarity index 100%
rename from graphics/pokemon/corphish/back.png
rename to graphics/pokemon/gen_3/corphish/back.png
diff --git a/graphics/pokemon/corphish/footprint.png b/graphics/pokemon/gen_3/corphish/footprint.png
similarity index 100%
rename from graphics/pokemon/corphish/footprint.png
rename to graphics/pokemon/gen_3/corphish/footprint.png
diff --git a/graphics/pokemon/corphish/icon.png b/graphics/pokemon/gen_3/corphish/icon.png
similarity index 100%
rename from graphics/pokemon/corphish/icon.png
rename to graphics/pokemon/gen_3/corphish/icon.png
diff --git a/graphics/pokemon/corphish/normal.pal b/graphics/pokemon/gen_3/corphish/normal.pal
similarity index 100%
rename from graphics/pokemon/corphish/normal.pal
rename to graphics/pokemon/gen_3/corphish/normal.pal
diff --git a/graphics/pokemon/corphish/shiny.pal b/graphics/pokemon/gen_3/corphish/shiny.pal
similarity index 100%
rename from graphics/pokemon/corphish/shiny.pal
rename to graphics/pokemon/gen_3/corphish/shiny.pal
diff --git a/graphics/pokemon/cradily/anim_front.png b/graphics/pokemon/gen_3/cradily/anim_front.png
similarity index 100%
rename from graphics/pokemon/cradily/anim_front.png
rename to graphics/pokemon/gen_3/cradily/anim_front.png
diff --git a/graphics/pokemon/cradily/back.png b/graphics/pokemon/gen_3/cradily/back.png
similarity index 100%
rename from graphics/pokemon/cradily/back.png
rename to graphics/pokemon/gen_3/cradily/back.png
diff --git a/graphics/pokemon/cradily/footprint.png b/graphics/pokemon/gen_3/cradily/footprint.png
similarity index 100%
rename from graphics/pokemon/cradily/footprint.png
rename to graphics/pokemon/gen_3/cradily/footprint.png
diff --git a/graphics/pokemon/cradily/icon.png b/graphics/pokemon/gen_3/cradily/icon.png
similarity index 100%
rename from graphics/pokemon/cradily/icon.png
rename to graphics/pokemon/gen_3/cradily/icon.png
diff --git a/graphics/pokemon/cradily/normal.pal b/graphics/pokemon/gen_3/cradily/normal.pal
similarity index 100%
rename from graphics/pokemon/cradily/normal.pal
rename to graphics/pokemon/gen_3/cradily/normal.pal
diff --git a/graphics/pokemon/cradily/shiny.pal b/graphics/pokemon/gen_3/cradily/shiny.pal
similarity index 100%
rename from graphics/pokemon/cradily/shiny.pal
rename to graphics/pokemon/gen_3/cradily/shiny.pal
diff --git a/graphics/pokemon/crawdaunt/anim_front.png b/graphics/pokemon/gen_3/crawdaunt/anim_front.png
similarity index 100%
rename from graphics/pokemon/crawdaunt/anim_front.png
rename to graphics/pokemon/gen_3/crawdaunt/anim_front.png
diff --git a/graphics/pokemon/crawdaunt/back.png b/graphics/pokemon/gen_3/crawdaunt/back.png
similarity index 100%
rename from graphics/pokemon/crawdaunt/back.png
rename to graphics/pokemon/gen_3/crawdaunt/back.png
diff --git a/graphics/pokemon/crawdaunt/footprint.png b/graphics/pokemon/gen_3/crawdaunt/footprint.png
similarity index 100%
rename from graphics/pokemon/crawdaunt/footprint.png
rename to graphics/pokemon/gen_3/crawdaunt/footprint.png
diff --git a/graphics/pokemon/crawdaunt/icon.png b/graphics/pokemon/gen_3/crawdaunt/icon.png
similarity index 100%
rename from graphics/pokemon/crawdaunt/icon.png
rename to graphics/pokemon/gen_3/crawdaunt/icon.png
diff --git a/graphics/pokemon/crawdaunt/normal.pal b/graphics/pokemon/gen_3/crawdaunt/normal.pal
similarity index 100%
rename from graphics/pokemon/crawdaunt/normal.pal
rename to graphics/pokemon/gen_3/crawdaunt/normal.pal
diff --git a/graphics/pokemon/crawdaunt/shiny.pal b/graphics/pokemon/gen_3/crawdaunt/shiny.pal
similarity index 100%
rename from graphics/pokemon/crawdaunt/shiny.pal
rename to graphics/pokemon/gen_3/crawdaunt/shiny.pal
diff --git a/graphics/pokemon/delcatty/anim_front.png b/graphics/pokemon/gen_3/delcatty/anim_front.png
similarity index 100%
rename from graphics/pokemon/delcatty/anim_front.png
rename to graphics/pokemon/gen_3/delcatty/anim_front.png
diff --git a/graphics/pokemon/delcatty/back.png b/graphics/pokemon/gen_3/delcatty/back.png
similarity index 100%
rename from graphics/pokemon/delcatty/back.png
rename to graphics/pokemon/gen_3/delcatty/back.png
diff --git a/graphics/pokemon/delcatty/footprint.png b/graphics/pokemon/gen_3/delcatty/footprint.png
similarity index 100%
rename from graphics/pokemon/delcatty/footprint.png
rename to graphics/pokemon/gen_3/delcatty/footprint.png
diff --git a/graphics/pokemon/delcatty/icon.png b/graphics/pokemon/gen_3/delcatty/icon.png
similarity index 100%
rename from graphics/pokemon/delcatty/icon.png
rename to graphics/pokemon/gen_3/delcatty/icon.png
diff --git a/graphics/pokemon/delcatty/normal.pal b/graphics/pokemon/gen_3/delcatty/normal.pal
similarity index 100%
rename from graphics/pokemon/delcatty/normal.pal
rename to graphics/pokemon/gen_3/delcatty/normal.pal
diff --git a/graphics/pokemon/delcatty/shiny.pal b/graphics/pokemon/gen_3/delcatty/shiny.pal
similarity index 100%
rename from graphics/pokemon/delcatty/shiny.pal
rename to graphics/pokemon/gen_3/delcatty/shiny.pal
diff --git a/graphics/pokemon/deoxys/anim_front.png b/graphics/pokemon/gen_3/deoxys/anim_front.png
similarity index 100%
rename from graphics/pokemon/deoxys/anim_front.png
rename to graphics/pokemon/gen_3/deoxys/anim_front.png
diff --git a/graphics/pokemon/deoxys/attack/anim_front.png b/graphics/pokemon/gen_3/deoxys/attack/anim_front.png
similarity index 100%
rename from graphics/pokemon/deoxys/attack/anim_front.png
rename to graphics/pokemon/gen_3/deoxys/attack/anim_front.png
diff --git a/graphics/pokemon/deoxys/attack/back.png b/graphics/pokemon/gen_3/deoxys/attack/back.png
similarity index 100%
rename from graphics/pokemon/deoxys/attack/back.png
rename to graphics/pokemon/gen_3/deoxys/attack/back.png
diff --git a/graphics/pokemon/deoxys/attack/icon.png b/graphics/pokemon/gen_3/deoxys/attack/icon.png
similarity index 100%
rename from graphics/pokemon/deoxys/attack/icon.png
rename to graphics/pokemon/gen_3/deoxys/attack/icon.png
diff --git a/graphics/pokemon/deoxys/attack/normal.pal b/graphics/pokemon/gen_3/deoxys/attack/normal.pal
similarity index 100%
rename from graphics/pokemon/deoxys/attack/normal.pal
rename to graphics/pokemon/gen_3/deoxys/attack/normal.pal
diff --git a/graphics/pokemon/deoxys/attack/shiny.pal b/graphics/pokemon/gen_3/deoxys/attack/shiny.pal
similarity index 100%
rename from graphics/pokemon/deoxys/attack/shiny.pal
rename to graphics/pokemon/gen_3/deoxys/attack/shiny.pal
diff --git a/graphics/pokemon/deoxys/back.png b/graphics/pokemon/gen_3/deoxys/back.png
similarity index 100%
rename from graphics/pokemon/deoxys/back.png
rename to graphics/pokemon/gen_3/deoxys/back.png
diff --git a/graphics/pokemon/deoxys/defense/anim_front.png b/graphics/pokemon/gen_3/deoxys/defense/anim_front.png
similarity index 100%
rename from graphics/pokemon/deoxys/defense/anim_front.png
rename to graphics/pokemon/gen_3/deoxys/defense/anim_front.png
diff --git a/graphics/pokemon/deoxys/defense/back.png b/graphics/pokemon/gen_3/deoxys/defense/back.png
similarity index 100%
rename from graphics/pokemon/deoxys/defense/back.png
rename to graphics/pokemon/gen_3/deoxys/defense/back.png
diff --git a/graphics/pokemon/deoxys/defense/icon.png b/graphics/pokemon/gen_3/deoxys/defense/icon.png
similarity index 100%
rename from graphics/pokemon/deoxys/defense/icon.png
rename to graphics/pokemon/gen_3/deoxys/defense/icon.png
diff --git a/graphics/pokemon/deoxys/defense/normal.pal b/graphics/pokemon/gen_3/deoxys/defense/normal.pal
similarity index 100%
rename from graphics/pokemon/deoxys/defense/normal.pal
rename to graphics/pokemon/gen_3/deoxys/defense/normal.pal
diff --git a/graphics/pokemon/deoxys/defense/shiny.pal b/graphics/pokemon/gen_3/deoxys/defense/shiny.pal
similarity index 100%
rename from graphics/pokemon/deoxys/defense/shiny.pal
rename to graphics/pokemon/gen_3/deoxys/defense/shiny.pal
diff --git a/graphics/pokemon/deoxys/footprint.png b/graphics/pokemon/gen_3/deoxys/footprint.png
similarity index 100%
rename from graphics/pokemon/deoxys/footprint.png
rename to graphics/pokemon/gen_3/deoxys/footprint.png
diff --git a/graphics/pokemon/deoxys/icon.png b/graphics/pokemon/gen_3/deoxys/icon.png
similarity index 100%
rename from graphics/pokemon/deoxys/icon.png
rename to graphics/pokemon/gen_3/deoxys/icon.png
diff --git a/graphics/pokemon/deoxys/icon_speed_wide.png b/graphics/pokemon/gen_3/deoxys/icon_speed_wide.png
similarity index 100%
rename from graphics/pokemon/deoxys/icon_speed_wide.png
rename to graphics/pokemon/gen_3/deoxys/icon_speed_wide.png
diff --git a/graphics/pokemon/deoxys/normal.pal b/graphics/pokemon/gen_3/deoxys/normal.pal
similarity index 100%
rename from graphics/pokemon/deoxys/normal.pal
rename to graphics/pokemon/gen_3/deoxys/normal.pal
diff --git a/graphics/pokemon/deoxys/shiny.pal b/graphics/pokemon/gen_3/deoxys/shiny.pal
similarity index 100%
rename from graphics/pokemon/deoxys/shiny.pal
rename to graphics/pokemon/gen_3/deoxys/shiny.pal
diff --git a/graphics/pokemon/deoxys/speed/anim_front.png b/graphics/pokemon/gen_3/deoxys/speed/anim_front.png
similarity index 100%
rename from graphics/pokemon/deoxys/speed/anim_front.png
rename to graphics/pokemon/gen_3/deoxys/speed/anim_front.png
diff --git a/graphics/pokemon/deoxys/speed/back.png b/graphics/pokemon/gen_3/deoxys/speed/back.png
similarity index 100%
rename from graphics/pokemon/deoxys/speed/back.png
rename to graphics/pokemon/gen_3/deoxys/speed/back.png
diff --git a/graphics/pokemon/deoxys/speed/icon.png b/graphics/pokemon/gen_3/deoxys/speed/icon.png
similarity index 100%
rename from graphics/pokemon/deoxys/speed/icon.png
rename to graphics/pokemon/gen_3/deoxys/speed/icon.png
diff --git a/graphics/pokemon/deoxys/speed/normal.pal b/graphics/pokemon/gen_3/deoxys/speed/normal.pal
similarity index 100%
rename from graphics/pokemon/deoxys/speed/normal.pal
rename to graphics/pokemon/gen_3/deoxys/speed/normal.pal
diff --git a/graphics/pokemon/deoxys/speed/shiny.pal b/graphics/pokemon/gen_3/deoxys/speed/shiny.pal
similarity index 100%
rename from graphics/pokemon/deoxys/speed/shiny.pal
rename to graphics/pokemon/gen_3/deoxys/speed/shiny.pal
diff --git a/graphics/pokemon/dusclops/anim_front.png b/graphics/pokemon/gen_3/dusclops/anim_front.png
similarity index 100%
rename from graphics/pokemon/dusclops/anim_front.png
rename to graphics/pokemon/gen_3/dusclops/anim_front.png
diff --git a/graphics/pokemon/dusclops/back.png b/graphics/pokemon/gen_3/dusclops/back.png
similarity index 100%
rename from graphics/pokemon/dusclops/back.png
rename to graphics/pokemon/gen_3/dusclops/back.png
diff --git a/graphics/pokemon/dusclops/footprint.png b/graphics/pokemon/gen_3/dusclops/footprint.png
similarity index 100%
rename from graphics/pokemon/dusclops/footprint.png
rename to graphics/pokemon/gen_3/dusclops/footprint.png
diff --git a/graphics/pokemon/dusclops/icon.png b/graphics/pokemon/gen_3/dusclops/icon.png
similarity index 100%
rename from graphics/pokemon/dusclops/icon.png
rename to graphics/pokemon/gen_3/dusclops/icon.png
diff --git a/graphics/pokemon/dusclops/normal.pal b/graphics/pokemon/gen_3/dusclops/normal.pal
similarity index 100%
rename from graphics/pokemon/dusclops/normal.pal
rename to graphics/pokemon/gen_3/dusclops/normal.pal
diff --git a/graphics/pokemon/dusclops/shiny.pal b/graphics/pokemon/gen_3/dusclops/shiny.pal
similarity index 100%
rename from graphics/pokemon/dusclops/shiny.pal
rename to graphics/pokemon/gen_3/dusclops/shiny.pal
diff --git a/graphics/pokemon/duskull/anim_front.png b/graphics/pokemon/gen_3/duskull/anim_front.png
similarity index 100%
rename from graphics/pokemon/duskull/anim_front.png
rename to graphics/pokemon/gen_3/duskull/anim_front.png
diff --git a/graphics/pokemon/duskull/back.png b/graphics/pokemon/gen_3/duskull/back.png
similarity index 100%
rename from graphics/pokemon/duskull/back.png
rename to graphics/pokemon/gen_3/duskull/back.png
diff --git a/graphics/pokemon/electrode/footprint.png b/graphics/pokemon/gen_3/duskull/footprint.png
similarity index 100%
rename from graphics/pokemon/electrode/footprint.png
rename to graphics/pokemon/gen_3/duskull/footprint.png
diff --git a/graphics/pokemon/duskull/icon.png b/graphics/pokemon/gen_3/duskull/icon.png
similarity index 100%
rename from graphics/pokemon/duskull/icon.png
rename to graphics/pokemon/gen_3/duskull/icon.png
diff --git a/graphics/pokemon/duskull/normal.pal b/graphics/pokemon/gen_3/duskull/normal.pal
similarity index 100%
rename from graphics/pokemon/duskull/normal.pal
rename to graphics/pokemon/gen_3/duskull/normal.pal
diff --git a/graphics/pokemon/duskull/shiny.pal b/graphics/pokemon/gen_3/duskull/shiny.pal
similarity index 100%
rename from graphics/pokemon/duskull/shiny.pal
rename to graphics/pokemon/gen_3/duskull/shiny.pal
diff --git a/graphics/pokemon/dustox/anim_front.png b/graphics/pokemon/gen_3/dustox/anim_front.png
similarity index 100%
rename from graphics/pokemon/dustox/anim_front.png
rename to graphics/pokemon/gen_3/dustox/anim_front.png
diff --git a/graphics/pokemon/dustox/anim_frontf.png b/graphics/pokemon/gen_3/dustox/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/dustox/anim_frontf.png
rename to graphics/pokemon/gen_3/dustox/anim_frontf.png
diff --git a/graphics/pokemon/dustox/back.png b/graphics/pokemon/gen_3/dustox/back.png
similarity index 100%
rename from graphics/pokemon/dustox/back.png
rename to graphics/pokemon/gen_3/dustox/back.png
diff --git a/graphics/pokemon/dustox/backf.png b/graphics/pokemon/gen_3/dustox/backf.png
similarity index 100%
rename from graphics/pokemon/dustox/backf.png
rename to graphics/pokemon/gen_3/dustox/backf.png
diff --git a/graphics/pokemon/dustox/footprint.png b/graphics/pokemon/gen_3/dustox/footprint.png
similarity index 100%
rename from graphics/pokemon/dustox/footprint.png
rename to graphics/pokemon/gen_3/dustox/footprint.png
diff --git a/graphics/pokemon/dustox/icon.png b/graphics/pokemon/gen_3/dustox/icon.png
similarity index 100%
rename from graphics/pokemon/dustox/icon.png
rename to graphics/pokemon/gen_3/dustox/icon.png
diff --git a/graphics/pokemon/dustox/normal.pal b/graphics/pokemon/gen_3/dustox/normal.pal
similarity index 100%
rename from graphics/pokemon/dustox/normal.pal
rename to graphics/pokemon/gen_3/dustox/normal.pal
diff --git a/graphics/pokemon/dustox/shiny.pal b/graphics/pokemon/gen_3/dustox/shiny.pal
similarity index 100%
rename from graphics/pokemon/dustox/shiny.pal
rename to graphics/pokemon/gen_3/dustox/shiny.pal
diff --git a/graphics/pokemon/electrike/anim_front.png b/graphics/pokemon/gen_3/electrike/anim_front.png
similarity index 100%
rename from graphics/pokemon/electrike/anim_front.png
rename to graphics/pokemon/gen_3/electrike/anim_front.png
diff --git a/graphics/pokemon/electrike/back.png b/graphics/pokemon/gen_3/electrike/back.png
similarity index 100%
rename from graphics/pokemon/electrike/back.png
rename to graphics/pokemon/gen_3/electrike/back.png
diff --git a/graphics/pokemon/electrike/footprint.png b/graphics/pokemon/gen_3/electrike/footprint.png
similarity index 100%
rename from graphics/pokemon/electrike/footprint.png
rename to graphics/pokemon/gen_3/electrike/footprint.png
diff --git a/graphics/pokemon/electrike/icon.png b/graphics/pokemon/gen_3/electrike/icon.png
similarity index 100%
rename from graphics/pokemon/electrike/icon.png
rename to graphics/pokemon/gen_3/electrike/icon.png
diff --git a/graphics/pokemon/electrike/normal.pal b/graphics/pokemon/gen_3/electrike/normal.pal
similarity index 100%
rename from graphics/pokemon/electrike/normal.pal
rename to graphics/pokemon/gen_3/electrike/normal.pal
diff --git a/graphics/pokemon/electrike/shiny.pal b/graphics/pokemon/gen_3/electrike/shiny.pal
similarity index 100%
rename from graphics/pokemon/electrike/shiny.pal
rename to graphics/pokemon/gen_3/electrike/shiny.pal
diff --git a/graphics/pokemon/exploud/anim_front.png b/graphics/pokemon/gen_3/exploud/anim_front.png
similarity index 100%
rename from graphics/pokemon/exploud/anim_front.png
rename to graphics/pokemon/gen_3/exploud/anim_front.png
diff --git a/graphics/pokemon/exploud/back.png b/graphics/pokemon/gen_3/exploud/back.png
similarity index 100%
rename from graphics/pokemon/exploud/back.png
rename to graphics/pokemon/gen_3/exploud/back.png
diff --git a/graphics/pokemon/exploud/footprint.png b/graphics/pokemon/gen_3/exploud/footprint.png
similarity index 100%
rename from graphics/pokemon/exploud/footprint.png
rename to graphics/pokemon/gen_3/exploud/footprint.png
diff --git a/graphics/pokemon/exploud/icon.png b/graphics/pokemon/gen_3/exploud/icon.png
similarity index 100%
rename from graphics/pokemon/exploud/icon.png
rename to graphics/pokemon/gen_3/exploud/icon.png
diff --git a/graphics/pokemon/exploud/normal.pal b/graphics/pokemon/gen_3/exploud/normal.pal
similarity index 100%
rename from graphics/pokemon/exploud/normal.pal
rename to graphics/pokemon/gen_3/exploud/normal.pal
diff --git a/graphics/pokemon/exploud/shiny.pal b/graphics/pokemon/gen_3/exploud/shiny.pal
similarity index 100%
rename from graphics/pokemon/exploud/shiny.pal
rename to graphics/pokemon/gen_3/exploud/shiny.pal
diff --git a/graphics/pokemon/feebas/anim_front.png b/graphics/pokemon/gen_3/feebas/anim_front.png
similarity index 100%
rename from graphics/pokemon/feebas/anim_front.png
rename to graphics/pokemon/gen_3/feebas/anim_front.png
diff --git a/graphics/pokemon/feebas/back.png b/graphics/pokemon/gen_3/feebas/back.png
similarity index 100%
rename from graphics/pokemon/feebas/back.png
rename to graphics/pokemon/gen_3/feebas/back.png
diff --git a/graphics/pokemon/escavalier/footprint.png b/graphics/pokemon/gen_3/feebas/footprint.png
similarity index 100%
rename from graphics/pokemon/escavalier/footprint.png
rename to graphics/pokemon/gen_3/feebas/footprint.png
diff --git a/graphics/pokemon/feebas/icon.png b/graphics/pokemon/gen_3/feebas/icon.png
similarity index 100%
rename from graphics/pokemon/feebas/icon.png
rename to graphics/pokemon/gen_3/feebas/icon.png
diff --git a/graphics/pokemon/feebas/normal.pal b/graphics/pokemon/gen_3/feebas/normal.pal
similarity index 100%
rename from graphics/pokemon/feebas/normal.pal
rename to graphics/pokemon/gen_3/feebas/normal.pal
diff --git a/graphics/pokemon/feebas/shiny.pal b/graphics/pokemon/gen_3/feebas/shiny.pal
similarity index 100%
rename from graphics/pokemon/feebas/shiny.pal
rename to graphics/pokemon/gen_3/feebas/shiny.pal
diff --git a/graphics/pokemon/flygon/anim_front.png b/graphics/pokemon/gen_3/flygon/anim_front.png
similarity index 100%
rename from graphics/pokemon/flygon/anim_front.png
rename to graphics/pokemon/gen_3/flygon/anim_front.png
diff --git a/graphics/pokemon/flygon/back.png b/graphics/pokemon/gen_3/flygon/back.png
similarity index 100%
rename from graphics/pokemon/flygon/back.png
rename to graphics/pokemon/gen_3/flygon/back.png
diff --git a/graphics/pokemon/flygon/footprint.png b/graphics/pokemon/gen_3/flygon/footprint.png
similarity index 100%
rename from graphics/pokemon/flygon/footprint.png
rename to graphics/pokemon/gen_3/flygon/footprint.png
diff --git a/graphics/pokemon/flygon/icon.png b/graphics/pokemon/gen_3/flygon/icon.png
similarity index 100%
rename from graphics/pokemon/flygon/icon.png
rename to graphics/pokemon/gen_3/flygon/icon.png
diff --git a/graphics/pokemon/flygon/normal.pal b/graphics/pokemon/gen_3/flygon/normal.pal
similarity index 100%
rename from graphics/pokemon/flygon/normal.pal
rename to graphics/pokemon/gen_3/flygon/normal.pal
diff --git a/graphics/pokemon/flygon/shiny.pal b/graphics/pokemon/gen_3/flygon/shiny.pal
similarity index 100%
rename from graphics/pokemon/flygon/shiny.pal
rename to graphics/pokemon/gen_3/flygon/shiny.pal
diff --git a/graphics/pokemon/gardevoir/anim_front.png b/graphics/pokemon/gen_3/gardevoir/anim_front.png
similarity index 100%
rename from graphics/pokemon/gardevoir/anim_front.png
rename to graphics/pokemon/gen_3/gardevoir/anim_front.png
diff --git a/graphics/pokemon/gardevoir/back.png b/graphics/pokemon/gen_3/gardevoir/back.png
similarity index 100%
rename from graphics/pokemon/gardevoir/back.png
rename to graphics/pokemon/gen_3/gardevoir/back.png
diff --git a/graphics/pokemon/gardevoir/footprint.png b/graphics/pokemon/gen_3/gardevoir/footprint.png
similarity index 100%
rename from graphics/pokemon/gardevoir/footprint.png
rename to graphics/pokemon/gen_3/gardevoir/footprint.png
diff --git a/graphics/pokemon/gardevoir/icon.png b/graphics/pokemon/gen_3/gardevoir/icon.png
similarity index 100%
rename from graphics/pokemon/gardevoir/icon.png
rename to graphics/pokemon/gen_3/gardevoir/icon.png
diff --git a/graphics/pokemon/gardevoir/mega/back.png b/graphics/pokemon/gen_3/gardevoir/mega/back.png
similarity index 100%
rename from graphics/pokemon/gardevoir/mega/back.png
rename to graphics/pokemon/gen_3/gardevoir/mega/back.png
diff --git a/graphics/pokemon/gardevoir/mega/front.png b/graphics/pokemon/gen_3/gardevoir/mega/front.png
similarity index 100%
rename from graphics/pokemon/gardevoir/mega/front.png
rename to graphics/pokemon/gen_3/gardevoir/mega/front.png
diff --git a/graphics/pokemon/gardevoir/mega/icon.png b/graphics/pokemon/gen_3/gardevoir/mega/icon.png
similarity index 100%
rename from graphics/pokemon/gardevoir/mega/icon.png
rename to graphics/pokemon/gen_3/gardevoir/mega/icon.png
diff --git a/graphics/pokemon/gardevoir/mega/normal.pal b/graphics/pokemon/gen_3/gardevoir/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/gardevoir/mega/normal.pal
rename to graphics/pokemon/gen_3/gardevoir/mega/normal.pal
diff --git a/graphics/pokemon/gardevoir/mega/shiny.pal b/graphics/pokemon/gen_3/gardevoir/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/gardevoir/mega/shiny.pal
rename to graphics/pokemon/gen_3/gardevoir/mega/shiny.pal
diff --git a/graphics/pokemon/gardevoir/normal.pal b/graphics/pokemon/gen_3/gardevoir/normal.pal
similarity index 100%
rename from graphics/pokemon/gardevoir/normal.pal
rename to graphics/pokemon/gen_3/gardevoir/normal.pal
diff --git a/graphics/pokemon/gardevoir/shiny.pal b/graphics/pokemon/gen_3/gardevoir/shiny.pal
similarity index 100%
rename from graphics/pokemon/gardevoir/shiny.pal
rename to graphics/pokemon/gen_3/gardevoir/shiny.pal
diff --git a/graphics/pokemon/glalie/anim_front.png b/graphics/pokemon/gen_3/glalie/anim_front.png
similarity index 100%
rename from graphics/pokemon/glalie/anim_front.png
rename to graphics/pokemon/gen_3/glalie/anim_front.png
diff --git a/graphics/pokemon/glalie/back.png b/graphics/pokemon/gen_3/glalie/back.png
similarity index 100%
rename from graphics/pokemon/glalie/back.png
rename to graphics/pokemon/gen_3/glalie/back.png
diff --git a/graphics/pokemon/exeggcute/footprint.png b/graphics/pokemon/gen_3/glalie/footprint.png
similarity index 100%
rename from graphics/pokemon/exeggcute/footprint.png
rename to graphics/pokemon/gen_3/glalie/footprint.png
diff --git a/graphics/pokemon/glalie/icon.png b/graphics/pokemon/gen_3/glalie/icon.png
similarity index 100%
rename from graphics/pokemon/glalie/icon.png
rename to graphics/pokemon/gen_3/glalie/icon.png
diff --git a/graphics/pokemon/glalie/mega/back.png b/graphics/pokemon/gen_3/glalie/mega/back.png
similarity index 100%
rename from graphics/pokemon/glalie/mega/back.png
rename to graphics/pokemon/gen_3/glalie/mega/back.png
diff --git a/graphics/pokemon/glalie/mega/front.png b/graphics/pokemon/gen_3/glalie/mega/front.png
similarity index 100%
rename from graphics/pokemon/glalie/mega/front.png
rename to graphics/pokemon/gen_3/glalie/mega/front.png
diff --git a/graphics/pokemon/glalie/mega/icon.png b/graphics/pokemon/gen_3/glalie/mega/icon.png
similarity index 100%
rename from graphics/pokemon/glalie/mega/icon.png
rename to graphics/pokemon/gen_3/glalie/mega/icon.png
diff --git a/graphics/pokemon/glalie/mega/normal.pal b/graphics/pokemon/gen_3/glalie/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/glalie/mega/normal.pal
rename to graphics/pokemon/gen_3/glalie/mega/normal.pal
diff --git a/graphics/pokemon/glalie/mega/shiny.pal b/graphics/pokemon/gen_3/glalie/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/glalie/mega/shiny.pal
rename to graphics/pokemon/gen_3/glalie/mega/shiny.pal
diff --git a/graphics/pokemon/glalie/normal.pal b/graphics/pokemon/gen_3/glalie/normal.pal
similarity index 100%
rename from graphics/pokemon/glalie/normal.pal
rename to graphics/pokemon/gen_3/glalie/normal.pal
diff --git a/graphics/pokemon/glalie/shiny.pal b/graphics/pokemon/gen_3/glalie/shiny.pal
similarity index 100%
rename from graphics/pokemon/glalie/shiny.pal
rename to graphics/pokemon/gen_3/glalie/shiny.pal
diff --git a/graphics/pokemon/gorebyss/anim_front.png b/graphics/pokemon/gen_3/gorebyss/anim_front.png
similarity index 100%
rename from graphics/pokemon/gorebyss/anim_front.png
rename to graphics/pokemon/gen_3/gorebyss/anim_front.png
diff --git a/graphics/pokemon/gorebyss/back.png b/graphics/pokemon/gen_3/gorebyss/back.png
similarity index 100%
rename from graphics/pokemon/gorebyss/back.png
rename to graphics/pokemon/gen_3/gorebyss/back.png
diff --git a/graphics/pokemon/feebas/footprint.png b/graphics/pokemon/gen_3/gorebyss/footprint.png
similarity index 100%
rename from graphics/pokemon/feebas/footprint.png
rename to graphics/pokemon/gen_3/gorebyss/footprint.png
diff --git a/graphics/pokemon/gorebyss/icon.png b/graphics/pokemon/gen_3/gorebyss/icon.png
similarity index 100%
rename from graphics/pokemon/gorebyss/icon.png
rename to graphics/pokemon/gen_3/gorebyss/icon.png
diff --git a/graphics/pokemon/gorebyss/normal.pal b/graphics/pokemon/gen_3/gorebyss/normal.pal
similarity index 100%
rename from graphics/pokemon/gorebyss/normal.pal
rename to graphics/pokemon/gen_3/gorebyss/normal.pal
diff --git a/graphics/pokemon/gorebyss/shiny.pal b/graphics/pokemon/gen_3/gorebyss/shiny.pal
similarity index 100%
rename from graphics/pokemon/gorebyss/shiny.pal
rename to graphics/pokemon/gen_3/gorebyss/shiny.pal
diff --git a/graphics/pokemon/groudon/anim_front.png b/graphics/pokemon/gen_3/groudon/anim_front.png
similarity index 100%
rename from graphics/pokemon/groudon/anim_front.png
rename to graphics/pokemon/gen_3/groudon/anim_front.png
diff --git a/graphics/pokemon/groudon/back.png b/graphics/pokemon/gen_3/groudon/back.png
similarity index 100%
rename from graphics/pokemon/groudon/back.png
rename to graphics/pokemon/gen_3/groudon/back.png
diff --git a/graphics/pokemon/groudon/footprint.png b/graphics/pokemon/gen_3/groudon/footprint.png
similarity index 100%
rename from graphics/pokemon/groudon/footprint.png
rename to graphics/pokemon/gen_3/groudon/footprint.png
diff --git a/graphics/pokemon/groudon/icon.png b/graphics/pokemon/gen_3/groudon/icon.png
similarity index 100%
rename from graphics/pokemon/groudon/icon.png
rename to graphics/pokemon/gen_3/groudon/icon.png
diff --git a/graphics/pokemon/groudon/normal.pal b/graphics/pokemon/gen_3/groudon/normal.pal
similarity index 100%
rename from graphics/pokemon/groudon/normal.pal
rename to graphics/pokemon/gen_3/groudon/normal.pal
diff --git a/graphics/pokemon/groudon/primal/back.png b/graphics/pokemon/gen_3/groudon/primal/back.png
similarity index 100%
rename from graphics/pokemon/groudon/primal/back.png
rename to graphics/pokemon/gen_3/groudon/primal/back.png
diff --git a/graphics/pokemon/groudon/primal/front.png b/graphics/pokemon/gen_3/groudon/primal/front.png
similarity index 100%
rename from graphics/pokemon/groudon/primal/front.png
rename to graphics/pokemon/gen_3/groudon/primal/front.png
diff --git a/graphics/pokemon/groudon/primal/icon.png b/graphics/pokemon/gen_3/groudon/primal/icon.png
similarity index 100%
rename from graphics/pokemon/groudon/primal/icon.png
rename to graphics/pokemon/gen_3/groudon/primal/icon.png
diff --git a/graphics/pokemon/groudon/primal/normal.pal b/graphics/pokemon/gen_3/groudon/primal/normal.pal
similarity index 100%
rename from graphics/pokemon/groudon/primal/normal.pal
rename to graphics/pokemon/gen_3/groudon/primal/normal.pal
diff --git a/graphics/pokemon/groudon/primal/shiny.pal b/graphics/pokemon/gen_3/groudon/primal/shiny.pal
similarity index 100%
rename from graphics/pokemon/groudon/primal/shiny.pal
rename to graphics/pokemon/gen_3/groudon/primal/shiny.pal
diff --git a/graphics/pokemon/groudon/shiny.pal b/graphics/pokemon/gen_3/groudon/shiny.pal
similarity index 100%
rename from graphics/pokemon/groudon/shiny.pal
rename to graphics/pokemon/gen_3/groudon/shiny.pal
diff --git a/graphics/pokemon/grovyle/anim_front.png b/graphics/pokemon/gen_3/grovyle/anim_front.png
similarity index 100%
rename from graphics/pokemon/grovyle/anim_front.png
rename to graphics/pokemon/gen_3/grovyle/anim_front.png
diff --git a/graphics/pokemon/grovyle/back.png b/graphics/pokemon/gen_3/grovyle/back.png
similarity index 100%
rename from graphics/pokemon/grovyle/back.png
rename to graphics/pokemon/gen_3/grovyle/back.png
diff --git a/graphics/pokemon/grovyle/footprint.png b/graphics/pokemon/gen_3/grovyle/footprint.png
similarity index 100%
rename from graphics/pokemon/grovyle/footprint.png
rename to graphics/pokemon/gen_3/grovyle/footprint.png
diff --git a/graphics/pokemon/grovyle/icon.png b/graphics/pokemon/gen_3/grovyle/icon.png
similarity index 100%
rename from graphics/pokemon/grovyle/icon.png
rename to graphics/pokemon/gen_3/grovyle/icon.png
diff --git a/graphics/pokemon/grovyle/normal.pal b/graphics/pokemon/gen_3/grovyle/normal.pal
similarity index 100%
rename from graphics/pokemon/grovyle/normal.pal
rename to graphics/pokemon/gen_3/grovyle/normal.pal
diff --git a/graphics/pokemon/grovyle/shiny.pal b/graphics/pokemon/gen_3/grovyle/shiny.pal
similarity index 100%
rename from graphics/pokemon/grovyle/shiny.pal
rename to graphics/pokemon/gen_3/grovyle/shiny.pal
diff --git a/graphics/pokemon/grumpig/anim_front.png b/graphics/pokemon/gen_3/grumpig/anim_front.png
similarity index 100%
rename from graphics/pokemon/grumpig/anim_front.png
rename to graphics/pokemon/gen_3/grumpig/anim_front.png
diff --git a/graphics/pokemon/grumpig/back.png b/graphics/pokemon/gen_3/grumpig/back.png
similarity index 100%
rename from graphics/pokemon/grumpig/back.png
rename to graphics/pokemon/gen_3/grumpig/back.png
diff --git a/graphics/pokemon/grumpig/footprint.png b/graphics/pokemon/gen_3/grumpig/footprint.png
similarity index 100%
rename from graphics/pokemon/grumpig/footprint.png
rename to graphics/pokemon/gen_3/grumpig/footprint.png
diff --git a/graphics/pokemon/grumpig/icon.png b/graphics/pokemon/gen_3/grumpig/icon.png
similarity index 100%
rename from graphics/pokemon/grumpig/icon.png
rename to graphics/pokemon/gen_3/grumpig/icon.png
diff --git a/graphics/pokemon/grumpig/normal.pal b/graphics/pokemon/gen_3/grumpig/normal.pal
similarity index 100%
rename from graphics/pokemon/grumpig/normal.pal
rename to graphics/pokemon/gen_3/grumpig/normal.pal
diff --git a/graphics/pokemon/grumpig/shiny.pal b/graphics/pokemon/gen_3/grumpig/shiny.pal
similarity index 100%
rename from graphics/pokemon/grumpig/shiny.pal
rename to graphics/pokemon/gen_3/grumpig/shiny.pal
diff --git a/graphics/pokemon/gulpin/anim_front.png b/graphics/pokemon/gen_3/gulpin/anim_front.png
similarity index 100%
rename from graphics/pokemon/gulpin/anim_front.png
rename to graphics/pokemon/gen_3/gulpin/anim_front.png
diff --git a/graphics/pokemon/gulpin/anim_frontf.png b/graphics/pokemon/gen_3/gulpin/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gulpin/anim_frontf.png
rename to graphics/pokemon/gen_3/gulpin/anim_frontf.png
diff --git a/graphics/pokemon/gulpin/back.png b/graphics/pokemon/gen_3/gulpin/back.png
similarity index 100%
rename from graphics/pokemon/gulpin/back.png
rename to graphics/pokemon/gen_3/gulpin/back.png
diff --git a/graphics/pokemon/gulpin/backf.png b/graphics/pokemon/gen_3/gulpin/backf.png
similarity index 100%
rename from graphics/pokemon/gulpin/backf.png
rename to graphics/pokemon/gen_3/gulpin/backf.png
diff --git a/graphics/pokemon/ferroseed/footprint.png b/graphics/pokemon/gen_3/gulpin/footprint.png
similarity index 100%
rename from graphics/pokemon/ferroseed/footprint.png
rename to graphics/pokemon/gen_3/gulpin/footprint.png
diff --git a/graphics/pokemon/gulpin/icon.png b/graphics/pokemon/gen_3/gulpin/icon.png
similarity index 100%
rename from graphics/pokemon/gulpin/icon.png
rename to graphics/pokemon/gen_3/gulpin/icon.png
diff --git a/graphics/pokemon/gulpin/normal.pal b/graphics/pokemon/gen_3/gulpin/normal.pal
similarity index 100%
rename from graphics/pokemon/gulpin/normal.pal
rename to graphics/pokemon/gen_3/gulpin/normal.pal
diff --git a/graphics/pokemon/gulpin/shiny.pal b/graphics/pokemon/gen_3/gulpin/shiny.pal
similarity index 100%
rename from graphics/pokemon/gulpin/shiny.pal
rename to graphics/pokemon/gen_3/gulpin/shiny.pal
diff --git a/graphics/pokemon/hariyama/anim_front.png b/graphics/pokemon/gen_3/hariyama/anim_front.png
similarity index 100%
rename from graphics/pokemon/hariyama/anim_front.png
rename to graphics/pokemon/gen_3/hariyama/anim_front.png
diff --git a/graphics/pokemon/hariyama/back.png b/graphics/pokemon/gen_3/hariyama/back.png
similarity index 100%
rename from graphics/pokemon/hariyama/back.png
rename to graphics/pokemon/gen_3/hariyama/back.png
diff --git a/graphics/pokemon/hariyama/footprint.png b/graphics/pokemon/gen_3/hariyama/footprint.png
similarity index 100%
rename from graphics/pokemon/hariyama/footprint.png
rename to graphics/pokemon/gen_3/hariyama/footprint.png
diff --git a/graphics/pokemon/hariyama/icon.png b/graphics/pokemon/gen_3/hariyama/icon.png
similarity index 100%
rename from graphics/pokemon/hariyama/icon.png
rename to graphics/pokemon/gen_3/hariyama/icon.png
diff --git a/graphics/pokemon/hariyama/normal.pal b/graphics/pokemon/gen_3/hariyama/normal.pal
similarity index 100%
rename from graphics/pokemon/hariyama/normal.pal
rename to graphics/pokemon/gen_3/hariyama/normal.pal
diff --git a/graphics/pokemon/hariyama/shiny.pal b/graphics/pokemon/gen_3/hariyama/shiny.pal
similarity index 100%
rename from graphics/pokemon/hariyama/shiny.pal
rename to graphics/pokemon/gen_3/hariyama/shiny.pal
diff --git a/graphics/pokemon/huntail/anim_front.png b/graphics/pokemon/gen_3/huntail/anim_front.png
similarity index 100%
rename from graphics/pokemon/huntail/anim_front.png
rename to graphics/pokemon/gen_3/huntail/anim_front.png
diff --git a/graphics/pokemon/huntail/back.png b/graphics/pokemon/gen_3/huntail/back.png
similarity index 100%
rename from graphics/pokemon/huntail/back.png
rename to graphics/pokemon/gen_3/huntail/back.png
diff --git a/graphics/pokemon/finneon/footprint.png b/graphics/pokemon/gen_3/huntail/footprint.png
similarity index 100%
rename from graphics/pokemon/finneon/footprint.png
rename to graphics/pokemon/gen_3/huntail/footprint.png
diff --git a/graphics/pokemon/huntail/icon.png b/graphics/pokemon/gen_3/huntail/icon.png
similarity index 100%
rename from graphics/pokemon/huntail/icon.png
rename to graphics/pokemon/gen_3/huntail/icon.png
diff --git a/graphics/pokemon/huntail/normal.pal b/graphics/pokemon/gen_3/huntail/normal.pal
similarity index 100%
rename from graphics/pokemon/huntail/normal.pal
rename to graphics/pokemon/gen_3/huntail/normal.pal
diff --git a/graphics/pokemon/huntail/shiny.pal b/graphics/pokemon/gen_3/huntail/shiny.pal
similarity index 100%
rename from graphics/pokemon/huntail/shiny.pal
rename to graphics/pokemon/gen_3/huntail/shiny.pal
diff --git a/graphics/pokemon/illumise/anim_front.png b/graphics/pokemon/gen_3/illumise/anim_front.png
similarity index 100%
rename from graphics/pokemon/illumise/anim_front.png
rename to graphics/pokemon/gen_3/illumise/anim_front.png
diff --git a/graphics/pokemon/illumise/back.png b/graphics/pokemon/gen_3/illumise/back.png
similarity index 100%
rename from graphics/pokemon/illumise/back.png
rename to graphics/pokemon/gen_3/illumise/back.png
diff --git a/graphics/pokemon/illumise/footprint.png b/graphics/pokemon/gen_3/illumise/footprint.png
similarity index 100%
rename from graphics/pokemon/illumise/footprint.png
rename to graphics/pokemon/gen_3/illumise/footprint.png
diff --git a/graphics/pokemon/illumise/icon.png b/graphics/pokemon/gen_3/illumise/icon.png
similarity index 100%
rename from graphics/pokemon/illumise/icon.png
rename to graphics/pokemon/gen_3/illumise/icon.png
diff --git a/graphics/pokemon/illumise/normal.pal b/graphics/pokemon/gen_3/illumise/normal.pal
similarity index 100%
rename from graphics/pokemon/illumise/normal.pal
rename to graphics/pokemon/gen_3/illumise/normal.pal
diff --git a/graphics/pokemon/illumise/shiny.pal b/graphics/pokemon/gen_3/illumise/shiny.pal
similarity index 100%
rename from graphics/pokemon/illumise/shiny.pal
rename to graphics/pokemon/gen_3/illumise/shiny.pal
diff --git a/graphics/pokemon/jirachi/anim_front.png b/graphics/pokemon/gen_3/jirachi/anim_front.png
similarity index 100%
rename from graphics/pokemon/jirachi/anim_front.png
rename to graphics/pokemon/gen_3/jirachi/anim_front.png
diff --git a/graphics/pokemon/jirachi/back.png b/graphics/pokemon/gen_3/jirachi/back.png
similarity index 100%
rename from graphics/pokemon/jirachi/back.png
rename to graphics/pokemon/gen_3/jirachi/back.png
diff --git a/graphics/pokemon/jirachi/footprint.png b/graphics/pokemon/gen_3/jirachi/footprint.png
similarity index 100%
rename from graphics/pokemon/jirachi/footprint.png
rename to graphics/pokemon/gen_3/jirachi/footprint.png
diff --git a/graphics/pokemon/jirachi/icon.png b/graphics/pokemon/gen_3/jirachi/icon.png
similarity index 100%
rename from graphics/pokemon/jirachi/icon.png
rename to graphics/pokemon/gen_3/jirachi/icon.png
diff --git a/graphics/pokemon/jirachi/normal.pal b/graphics/pokemon/gen_3/jirachi/normal.pal
similarity index 100%
rename from graphics/pokemon/jirachi/normal.pal
rename to graphics/pokemon/gen_3/jirachi/normal.pal
diff --git a/graphics/pokemon/jirachi/shiny.pal b/graphics/pokemon/gen_3/jirachi/shiny.pal
similarity index 100%
rename from graphics/pokemon/jirachi/shiny.pal
rename to graphics/pokemon/gen_3/jirachi/shiny.pal
diff --git a/graphics/pokemon/kecleon/anim_front.png b/graphics/pokemon/gen_3/kecleon/anim_front.png
similarity index 100%
rename from graphics/pokemon/kecleon/anim_front.png
rename to graphics/pokemon/gen_3/kecleon/anim_front.png
diff --git a/graphics/pokemon/kecleon/back.png b/graphics/pokemon/gen_3/kecleon/back.png
similarity index 100%
rename from graphics/pokemon/kecleon/back.png
rename to graphics/pokemon/gen_3/kecleon/back.png
diff --git a/graphics/pokemon/kecleon/footprint.png b/graphics/pokemon/gen_3/kecleon/footprint.png
similarity index 100%
rename from graphics/pokemon/kecleon/footprint.png
rename to graphics/pokemon/gen_3/kecleon/footprint.png
diff --git a/graphics/pokemon/kecleon/icon.png b/graphics/pokemon/gen_3/kecleon/icon.png
similarity index 100%
rename from graphics/pokemon/kecleon/icon.png
rename to graphics/pokemon/gen_3/kecleon/icon.png
diff --git a/graphics/pokemon/kecleon/normal.pal b/graphics/pokemon/gen_3/kecleon/normal.pal
similarity index 100%
rename from graphics/pokemon/kecleon/normal.pal
rename to graphics/pokemon/gen_3/kecleon/normal.pal
diff --git a/graphics/pokemon/kecleon/shiny.pal b/graphics/pokemon/gen_3/kecleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/kecleon/shiny.pal
rename to graphics/pokemon/gen_3/kecleon/shiny.pal
diff --git a/graphics/pokemon/kirlia/anim_front.png b/graphics/pokemon/gen_3/kirlia/anim_front.png
similarity index 100%
rename from graphics/pokemon/kirlia/anim_front.png
rename to graphics/pokemon/gen_3/kirlia/anim_front.png
diff --git a/graphics/pokemon/kirlia/back.png b/graphics/pokemon/gen_3/kirlia/back.png
similarity index 100%
rename from graphics/pokemon/kirlia/back.png
rename to graphics/pokemon/gen_3/kirlia/back.png
diff --git a/graphics/pokemon/budew/footprint.png b/graphics/pokemon/gen_3/kirlia/footprint.png
similarity index 100%
rename from graphics/pokemon/budew/footprint.png
rename to graphics/pokemon/gen_3/kirlia/footprint.png
diff --git a/graphics/pokemon/kirlia/icon.png b/graphics/pokemon/gen_3/kirlia/icon.png
similarity index 100%
rename from graphics/pokemon/kirlia/icon.png
rename to graphics/pokemon/gen_3/kirlia/icon.png
diff --git a/graphics/pokemon/kirlia/normal.pal b/graphics/pokemon/gen_3/kirlia/normal.pal
similarity index 100%
rename from graphics/pokemon/kirlia/normal.pal
rename to graphics/pokemon/gen_3/kirlia/normal.pal
diff --git a/graphics/pokemon/kirlia/shiny.pal b/graphics/pokemon/gen_3/kirlia/shiny.pal
similarity index 100%
rename from graphics/pokemon/kirlia/shiny.pal
rename to graphics/pokemon/gen_3/kirlia/shiny.pal
diff --git a/graphics/pokemon/kyogre/anim_front.png b/graphics/pokemon/gen_3/kyogre/anim_front.png
similarity index 100%
rename from graphics/pokemon/kyogre/anim_front.png
rename to graphics/pokemon/gen_3/kyogre/anim_front.png
diff --git a/graphics/pokemon/kyogre/back.png b/graphics/pokemon/gen_3/kyogre/back.png
similarity index 100%
rename from graphics/pokemon/kyogre/back.png
rename to graphics/pokemon/gen_3/kyogre/back.png
diff --git a/graphics/pokemon/kyogre/footprint.png b/graphics/pokemon/gen_3/kyogre/footprint.png
similarity index 100%
rename from graphics/pokemon/kyogre/footprint.png
rename to graphics/pokemon/gen_3/kyogre/footprint.png
diff --git a/graphics/pokemon/kyogre/icon.png b/graphics/pokemon/gen_3/kyogre/icon.png
similarity index 100%
rename from graphics/pokemon/kyogre/icon.png
rename to graphics/pokemon/gen_3/kyogre/icon.png
diff --git a/graphics/pokemon/kyogre/normal.pal b/graphics/pokemon/gen_3/kyogre/normal.pal
similarity index 100%
rename from graphics/pokemon/kyogre/normal.pal
rename to graphics/pokemon/gen_3/kyogre/normal.pal
diff --git a/graphics/pokemon/kyogre/primal/back.png b/graphics/pokemon/gen_3/kyogre/primal/back.png
similarity index 100%
rename from graphics/pokemon/kyogre/primal/back.png
rename to graphics/pokemon/gen_3/kyogre/primal/back.png
diff --git a/graphics/pokemon/kyogre/primal/front.png b/graphics/pokemon/gen_3/kyogre/primal/front.png
similarity index 100%
rename from graphics/pokemon/kyogre/primal/front.png
rename to graphics/pokemon/gen_3/kyogre/primal/front.png
diff --git a/graphics/pokemon/kyogre/primal/icon.png b/graphics/pokemon/gen_3/kyogre/primal/icon.png
similarity index 100%
rename from graphics/pokemon/kyogre/primal/icon.png
rename to graphics/pokemon/gen_3/kyogre/primal/icon.png
diff --git a/graphics/pokemon/kyogre/primal/normal.pal b/graphics/pokemon/gen_3/kyogre/primal/normal.pal
similarity index 100%
rename from graphics/pokemon/kyogre/primal/normal.pal
rename to graphics/pokemon/gen_3/kyogre/primal/normal.pal
diff --git a/graphics/pokemon/kyogre/primal/shiny.pal b/graphics/pokemon/gen_3/kyogre/primal/shiny.pal
similarity index 100%
rename from graphics/pokemon/kyogre/primal/shiny.pal
rename to graphics/pokemon/gen_3/kyogre/primal/shiny.pal
diff --git a/graphics/pokemon/kyogre/shiny.pal b/graphics/pokemon/gen_3/kyogre/shiny.pal
similarity index 100%
rename from graphics/pokemon/kyogre/shiny.pal
rename to graphics/pokemon/gen_3/kyogre/shiny.pal
diff --git a/graphics/pokemon/lairon/anim_front.png b/graphics/pokemon/gen_3/lairon/anim_front.png
similarity index 100%
rename from graphics/pokemon/lairon/anim_front.png
rename to graphics/pokemon/gen_3/lairon/anim_front.png
diff --git a/graphics/pokemon/lairon/back.png b/graphics/pokemon/gen_3/lairon/back.png
similarity index 100%
rename from graphics/pokemon/lairon/back.png
rename to graphics/pokemon/gen_3/lairon/back.png
diff --git a/graphics/pokemon/lairon/footprint.png b/graphics/pokemon/gen_3/lairon/footprint.png
similarity index 100%
rename from graphics/pokemon/lairon/footprint.png
rename to graphics/pokemon/gen_3/lairon/footprint.png
diff --git a/graphics/pokemon/lairon/icon.png b/graphics/pokemon/gen_3/lairon/icon.png
similarity index 100%
rename from graphics/pokemon/lairon/icon.png
rename to graphics/pokemon/gen_3/lairon/icon.png
diff --git a/graphics/pokemon/lairon/normal.pal b/graphics/pokemon/gen_3/lairon/normal.pal
similarity index 100%
rename from graphics/pokemon/lairon/normal.pal
rename to graphics/pokemon/gen_3/lairon/normal.pal
diff --git a/graphics/pokemon/lairon/shiny.pal b/graphics/pokemon/gen_3/lairon/shiny.pal
similarity index 100%
rename from graphics/pokemon/lairon/shiny.pal
rename to graphics/pokemon/gen_3/lairon/shiny.pal
diff --git a/graphics/pokemon/latias/anim_front.png b/graphics/pokemon/gen_3/latias/anim_front.png
similarity index 100%
rename from graphics/pokemon/latias/anim_front.png
rename to graphics/pokemon/gen_3/latias/anim_front.png
diff --git a/graphics/pokemon/latias/back.png b/graphics/pokemon/gen_3/latias/back.png
similarity index 100%
rename from graphics/pokemon/latias/back.png
rename to graphics/pokemon/gen_3/latias/back.png
diff --git a/graphics/pokemon/latias/footprint.png b/graphics/pokemon/gen_3/latias/footprint.png
similarity index 100%
rename from graphics/pokemon/latias/footprint.png
rename to graphics/pokemon/gen_3/latias/footprint.png
diff --git a/graphics/pokemon/latias/icon.png b/graphics/pokemon/gen_3/latias/icon.png
similarity index 100%
rename from graphics/pokemon/latias/icon.png
rename to graphics/pokemon/gen_3/latias/icon.png
diff --git a/graphics/pokemon/latias/mega/back.png b/graphics/pokemon/gen_3/latias/mega/back.png
similarity index 100%
rename from graphics/pokemon/latias/mega/back.png
rename to graphics/pokemon/gen_3/latias/mega/back.png
diff --git a/graphics/pokemon/latias/mega/front.png b/graphics/pokemon/gen_3/latias/mega/front.png
similarity index 100%
rename from graphics/pokemon/latias/mega/front.png
rename to graphics/pokemon/gen_3/latias/mega/front.png
diff --git a/graphics/pokemon/latias/mega/icon.png b/graphics/pokemon/gen_3/latias/mega/icon.png
similarity index 100%
rename from graphics/pokemon/latias/mega/icon.png
rename to graphics/pokemon/gen_3/latias/mega/icon.png
diff --git a/graphics/pokemon/latias/mega/normal.pal b/graphics/pokemon/gen_3/latias/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/latias/mega/normal.pal
rename to graphics/pokemon/gen_3/latias/mega/normal.pal
diff --git a/graphics/pokemon/latias/mega/shiny.pal b/graphics/pokemon/gen_3/latias/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/latias/mega/shiny.pal
rename to graphics/pokemon/gen_3/latias/mega/shiny.pal
diff --git a/graphics/pokemon/latias/normal.pal b/graphics/pokemon/gen_3/latias/normal.pal
similarity index 100%
rename from graphics/pokemon/latias/normal.pal
rename to graphics/pokemon/gen_3/latias/normal.pal
diff --git a/graphics/pokemon/latias/shiny.pal b/graphics/pokemon/gen_3/latias/shiny.pal
similarity index 100%
rename from graphics/pokemon/latias/shiny.pal
rename to graphics/pokemon/gen_3/latias/shiny.pal
diff --git a/graphics/pokemon/latios/anim_front.png b/graphics/pokemon/gen_3/latios/anim_front.png
similarity index 100%
rename from graphics/pokemon/latios/anim_front.png
rename to graphics/pokemon/gen_3/latios/anim_front.png
diff --git a/graphics/pokemon/latios/back.png b/graphics/pokemon/gen_3/latios/back.png
similarity index 100%
rename from graphics/pokemon/latios/back.png
rename to graphics/pokemon/gen_3/latios/back.png
diff --git a/graphics/pokemon/latios/footprint.png b/graphics/pokemon/gen_3/latios/footprint.png
similarity index 100%
rename from graphics/pokemon/latios/footprint.png
rename to graphics/pokemon/gen_3/latios/footprint.png
diff --git a/graphics/pokemon/latios/icon.png b/graphics/pokemon/gen_3/latios/icon.png
similarity index 100%
rename from graphics/pokemon/latios/icon.png
rename to graphics/pokemon/gen_3/latios/icon.png
diff --git a/graphics/pokemon/latios/mega/back.png b/graphics/pokemon/gen_3/latios/mega/back.png
similarity index 100%
rename from graphics/pokemon/latios/mega/back.png
rename to graphics/pokemon/gen_3/latios/mega/back.png
diff --git a/graphics/pokemon/latios/mega/front.png b/graphics/pokemon/gen_3/latios/mega/front.png
similarity index 100%
rename from graphics/pokemon/latios/mega/front.png
rename to graphics/pokemon/gen_3/latios/mega/front.png
diff --git a/graphics/pokemon/latios/mega/icon.png b/graphics/pokemon/gen_3/latios/mega/icon.png
similarity index 100%
rename from graphics/pokemon/latios/mega/icon.png
rename to graphics/pokemon/gen_3/latios/mega/icon.png
diff --git a/graphics/pokemon/latios/mega/normal.pal b/graphics/pokemon/gen_3/latios/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/latios/mega/normal.pal
rename to graphics/pokemon/gen_3/latios/mega/normal.pal
diff --git a/graphics/pokemon/latios/mega/shiny.pal b/graphics/pokemon/gen_3/latios/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/latios/mega/shiny.pal
rename to graphics/pokemon/gen_3/latios/mega/shiny.pal
diff --git a/graphics/pokemon/latios/normal.pal b/graphics/pokemon/gen_3/latios/normal.pal
similarity index 100%
rename from graphics/pokemon/latios/normal.pal
rename to graphics/pokemon/gen_3/latios/normal.pal
diff --git a/graphics/pokemon/latios/shiny.pal b/graphics/pokemon/gen_3/latios/shiny.pal
similarity index 100%
rename from graphics/pokemon/latios/shiny.pal
rename to graphics/pokemon/gen_3/latios/shiny.pal
diff --git a/graphics/pokemon/lileep/anim_front.png b/graphics/pokemon/gen_3/lileep/anim_front.png
similarity index 100%
rename from graphics/pokemon/lileep/anim_front.png
rename to graphics/pokemon/gen_3/lileep/anim_front.png
diff --git a/graphics/pokemon/lileep/back.png b/graphics/pokemon/gen_3/lileep/back.png
similarity index 100%
rename from graphics/pokemon/lileep/back.png
rename to graphics/pokemon/gen_3/lileep/back.png
diff --git a/graphics/pokemon/lileep/footprint.png b/graphics/pokemon/gen_3/lileep/footprint.png
similarity index 100%
rename from graphics/pokemon/lileep/footprint.png
rename to graphics/pokemon/gen_3/lileep/footprint.png
diff --git a/graphics/pokemon/lileep/icon.png b/graphics/pokemon/gen_3/lileep/icon.png
similarity index 100%
rename from graphics/pokemon/lileep/icon.png
rename to graphics/pokemon/gen_3/lileep/icon.png
diff --git a/graphics/pokemon/lileep/normal.pal b/graphics/pokemon/gen_3/lileep/normal.pal
similarity index 100%
rename from graphics/pokemon/lileep/normal.pal
rename to graphics/pokemon/gen_3/lileep/normal.pal
diff --git a/graphics/pokemon/lileep/shiny.pal b/graphics/pokemon/gen_3/lileep/shiny.pal
similarity index 100%
rename from graphics/pokemon/lileep/shiny.pal
rename to graphics/pokemon/gen_3/lileep/shiny.pal
diff --git a/graphics/pokemon/linoone/anim_front.png b/graphics/pokemon/gen_3/linoone/anim_front.png
similarity index 100%
rename from graphics/pokemon/linoone/anim_front.png
rename to graphics/pokemon/gen_3/linoone/anim_front.png
diff --git a/graphics/pokemon/linoone/back.png b/graphics/pokemon/gen_3/linoone/back.png
similarity index 100%
rename from graphics/pokemon/linoone/back.png
rename to graphics/pokemon/gen_3/linoone/back.png
diff --git a/graphics/pokemon/linoone/footprint.png b/graphics/pokemon/gen_3/linoone/footprint.png
similarity index 100%
rename from graphics/pokemon/linoone/footprint.png
rename to graphics/pokemon/gen_3/linoone/footprint.png
diff --git a/graphics/pokemon/linoone/galarian/back.png b/graphics/pokemon/gen_3/linoone/galarian/back.png
similarity index 100%
rename from graphics/pokemon/linoone/galarian/back.png
rename to graphics/pokemon/gen_3/linoone/galarian/back.png
diff --git a/graphics/pokemon/linoone/galarian/front.png b/graphics/pokemon/gen_3/linoone/galarian/front.png
similarity index 100%
rename from graphics/pokemon/linoone/galarian/front.png
rename to graphics/pokemon/gen_3/linoone/galarian/front.png
diff --git a/graphics/pokemon/linoone/galarian/icon.png b/graphics/pokemon/gen_3/linoone/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/linoone/galarian/icon.png
rename to graphics/pokemon/gen_3/linoone/galarian/icon.png
diff --git a/graphics/pokemon/linoone/galarian/normal.pal b/graphics/pokemon/gen_3/linoone/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/linoone/galarian/normal.pal
rename to graphics/pokemon/gen_3/linoone/galarian/normal.pal
diff --git a/graphics/pokemon/linoone/galarian/shiny.pal b/graphics/pokemon/gen_3/linoone/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/linoone/galarian/shiny.pal
rename to graphics/pokemon/gen_3/linoone/galarian/shiny.pal
diff --git a/graphics/pokemon/linoone/icon.png b/graphics/pokemon/gen_3/linoone/icon.png
similarity index 100%
rename from graphics/pokemon/linoone/icon.png
rename to graphics/pokemon/gen_3/linoone/icon.png
diff --git a/graphics/pokemon/linoone/normal.pal b/graphics/pokemon/gen_3/linoone/normal.pal
similarity index 100%
rename from graphics/pokemon/linoone/normal.pal
rename to graphics/pokemon/gen_3/linoone/normal.pal
diff --git a/graphics/pokemon/linoone/shiny.pal b/graphics/pokemon/gen_3/linoone/shiny.pal
similarity index 100%
rename from graphics/pokemon/linoone/shiny.pal
rename to graphics/pokemon/gen_3/linoone/shiny.pal
diff --git a/graphics/pokemon/lombre/anim_front.png b/graphics/pokemon/gen_3/lombre/anim_front.png
similarity index 100%
rename from graphics/pokemon/lombre/anim_front.png
rename to graphics/pokemon/gen_3/lombre/anim_front.png
diff --git a/graphics/pokemon/lombre/back.png b/graphics/pokemon/gen_3/lombre/back.png
similarity index 100%
rename from graphics/pokemon/lombre/back.png
rename to graphics/pokemon/gen_3/lombre/back.png
diff --git a/graphics/pokemon/lombre/footprint.png b/graphics/pokemon/gen_3/lombre/footprint.png
similarity index 100%
rename from graphics/pokemon/lombre/footprint.png
rename to graphics/pokemon/gen_3/lombre/footprint.png
diff --git a/graphics/pokemon/lombre/icon.png b/graphics/pokemon/gen_3/lombre/icon.png
similarity index 100%
rename from graphics/pokemon/lombre/icon.png
rename to graphics/pokemon/gen_3/lombre/icon.png
diff --git a/graphics/pokemon/lombre/normal.pal b/graphics/pokemon/gen_3/lombre/normal.pal
similarity index 100%
rename from graphics/pokemon/lombre/normal.pal
rename to graphics/pokemon/gen_3/lombre/normal.pal
diff --git a/graphics/pokemon/lombre/shiny.pal b/graphics/pokemon/gen_3/lombre/shiny.pal
similarity index 100%
rename from graphics/pokemon/lombre/shiny.pal
rename to graphics/pokemon/gen_3/lombre/shiny.pal
diff --git a/graphics/pokemon/lotad/anim_front.png b/graphics/pokemon/gen_3/lotad/anim_front.png
similarity index 100%
rename from graphics/pokemon/lotad/anim_front.png
rename to graphics/pokemon/gen_3/lotad/anim_front.png
diff --git a/graphics/pokemon/lotad/back.png b/graphics/pokemon/gen_3/lotad/back.png
similarity index 100%
rename from graphics/pokemon/lotad/back.png
rename to graphics/pokemon/gen_3/lotad/back.png
diff --git a/graphics/pokemon/lotad/footprint.png b/graphics/pokemon/gen_3/lotad/footprint.png
similarity index 100%
rename from graphics/pokemon/lotad/footprint.png
rename to graphics/pokemon/gen_3/lotad/footprint.png
diff --git a/graphics/pokemon/lotad/icon.png b/graphics/pokemon/gen_3/lotad/icon.png
similarity index 100%
rename from graphics/pokemon/lotad/icon.png
rename to graphics/pokemon/gen_3/lotad/icon.png
diff --git a/graphics/pokemon/lotad/normal.pal b/graphics/pokemon/gen_3/lotad/normal.pal
similarity index 100%
rename from graphics/pokemon/lotad/normal.pal
rename to graphics/pokemon/gen_3/lotad/normal.pal
diff --git a/graphics/pokemon/lotad/shiny.pal b/graphics/pokemon/gen_3/lotad/shiny.pal
similarity index 100%
rename from graphics/pokemon/lotad/shiny.pal
rename to graphics/pokemon/gen_3/lotad/shiny.pal
diff --git a/graphics/pokemon/loudred/anim_front.png b/graphics/pokemon/gen_3/loudred/anim_front.png
similarity index 100%
rename from graphics/pokemon/loudred/anim_front.png
rename to graphics/pokemon/gen_3/loudred/anim_front.png
diff --git a/graphics/pokemon/loudred/back.png b/graphics/pokemon/gen_3/loudred/back.png
similarity index 100%
rename from graphics/pokemon/loudred/back.png
rename to graphics/pokemon/gen_3/loudred/back.png
diff --git a/graphics/pokemon/loudred/footprint.png b/graphics/pokemon/gen_3/loudred/footprint.png
similarity index 100%
rename from graphics/pokemon/loudred/footprint.png
rename to graphics/pokemon/gen_3/loudred/footprint.png
diff --git a/graphics/pokemon/loudred/icon.png b/graphics/pokemon/gen_3/loudred/icon.png
similarity index 100%
rename from graphics/pokemon/loudred/icon.png
rename to graphics/pokemon/gen_3/loudred/icon.png
diff --git a/graphics/pokemon/loudred/normal.pal b/graphics/pokemon/gen_3/loudred/normal.pal
similarity index 100%
rename from graphics/pokemon/loudred/normal.pal
rename to graphics/pokemon/gen_3/loudred/normal.pal
diff --git a/graphics/pokemon/loudred/shiny.pal b/graphics/pokemon/gen_3/loudred/shiny.pal
similarity index 100%
rename from graphics/pokemon/loudred/shiny.pal
rename to graphics/pokemon/gen_3/loudred/shiny.pal
diff --git a/graphics/pokemon/ludicolo/anim_front.png b/graphics/pokemon/gen_3/ludicolo/anim_front.png
similarity index 100%
rename from graphics/pokemon/ludicolo/anim_front.png
rename to graphics/pokemon/gen_3/ludicolo/anim_front.png
diff --git a/graphics/pokemon/ludicolo/anim_frontf.png b/graphics/pokemon/gen_3/ludicolo/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/ludicolo/anim_frontf.png
rename to graphics/pokemon/gen_3/ludicolo/anim_frontf.png
diff --git a/graphics/pokemon/ludicolo/back.png b/graphics/pokemon/gen_3/ludicolo/back.png
similarity index 100%
rename from graphics/pokemon/ludicolo/back.png
rename to graphics/pokemon/gen_3/ludicolo/back.png
diff --git a/graphics/pokemon/ludicolo/backf.png b/graphics/pokemon/gen_3/ludicolo/backf.png
similarity index 100%
rename from graphics/pokemon/ludicolo/backf.png
rename to graphics/pokemon/gen_3/ludicolo/backf.png
diff --git a/graphics/pokemon/ludicolo/footprint.png b/graphics/pokemon/gen_3/ludicolo/footprint.png
similarity index 100%
rename from graphics/pokemon/ludicolo/footprint.png
rename to graphics/pokemon/gen_3/ludicolo/footprint.png
diff --git a/graphics/pokemon/ludicolo/icon.png b/graphics/pokemon/gen_3/ludicolo/icon.png
similarity index 100%
rename from graphics/pokemon/ludicolo/icon.png
rename to graphics/pokemon/gen_3/ludicolo/icon.png
diff --git a/graphics/pokemon/ludicolo/normal.pal b/graphics/pokemon/gen_3/ludicolo/normal.pal
similarity index 100%
rename from graphics/pokemon/ludicolo/normal.pal
rename to graphics/pokemon/gen_3/ludicolo/normal.pal
diff --git a/graphics/pokemon/ludicolo/shiny.pal b/graphics/pokemon/gen_3/ludicolo/shiny.pal
similarity index 100%
rename from graphics/pokemon/ludicolo/shiny.pal
rename to graphics/pokemon/gen_3/ludicolo/shiny.pal
diff --git a/graphics/pokemon/lunatone/anim_front.png b/graphics/pokemon/gen_3/lunatone/anim_front.png
similarity index 100%
rename from graphics/pokemon/lunatone/anim_front.png
rename to graphics/pokemon/gen_3/lunatone/anim_front.png
diff --git a/graphics/pokemon/lunatone/back.png b/graphics/pokemon/gen_3/lunatone/back.png
similarity index 100%
rename from graphics/pokemon/lunatone/back.png
rename to graphics/pokemon/gen_3/lunatone/back.png
diff --git a/graphics/pokemon/flabebe/footprint.png b/graphics/pokemon/gen_3/lunatone/footprint.png
similarity index 100%
rename from graphics/pokemon/flabebe/footprint.png
rename to graphics/pokemon/gen_3/lunatone/footprint.png
diff --git a/graphics/pokemon/lunatone/icon.png b/graphics/pokemon/gen_3/lunatone/icon.png
similarity index 100%
rename from graphics/pokemon/lunatone/icon.png
rename to graphics/pokemon/gen_3/lunatone/icon.png
diff --git a/graphics/pokemon/lunatone/normal.pal b/graphics/pokemon/gen_3/lunatone/normal.pal
similarity index 100%
rename from graphics/pokemon/lunatone/normal.pal
rename to graphics/pokemon/gen_3/lunatone/normal.pal
diff --git a/graphics/pokemon/lunatone/shiny.pal b/graphics/pokemon/gen_3/lunatone/shiny.pal
similarity index 100%
rename from graphics/pokemon/lunatone/shiny.pal
rename to graphics/pokemon/gen_3/lunatone/shiny.pal
diff --git a/graphics/pokemon/luvdisc/anim_front.png b/graphics/pokemon/gen_3/luvdisc/anim_front.png
similarity index 100%
rename from graphics/pokemon/luvdisc/anim_front.png
rename to graphics/pokemon/gen_3/luvdisc/anim_front.png
diff --git a/graphics/pokemon/luvdisc/back.png b/graphics/pokemon/gen_3/luvdisc/back.png
similarity index 100%
rename from graphics/pokemon/luvdisc/back.png
rename to graphics/pokemon/gen_3/luvdisc/back.png
diff --git a/graphics/pokemon/flapple/footprint.png b/graphics/pokemon/gen_3/luvdisc/footprint.png
similarity index 100%
rename from graphics/pokemon/flapple/footprint.png
rename to graphics/pokemon/gen_3/luvdisc/footprint.png
diff --git a/graphics/pokemon/luvdisc/icon.png b/graphics/pokemon/gen_3/luvdisc/icon.png
similarity index 100%
rename from graphics/pokemon/luvdisc/icon.png
rename to graphics/pokemon/gen_3/luvdisc/icon.png
diff --git a/graphics/pokemon/luvdisc/normal.pal b/graphics/pokemon/gen_3/luvdisc/normal.pal
similarity index 100%
rename from graphics/pokemon/luvdisc/normal.pal
rename to graphics/pokemon/gen_3/luvdisc/normal.pal
diff --git a/graphics/pokemon/luvdisc/shiny.pal b/graphics/pokemon/gen_3/luvdisc/shiny.pal
similarity index 100%
rename from graphics/pokemon/luvdisc/shiny.pal
rename to graphics/pokemon/gen_3/luvdisc/shiny.pal
diff --git a/graphics/pokemon/makuhita/anim_front.png b/graphics/pokemon/gen_3/makuhita/anim_front.png
similarity index 100%
rename from graphics/pokemon/makuhita/anim_front.png
rename to graphics/pokemon/gen_3/makuhita/anim_front.png
diff --git a/graphics/pokemon/makuhita/back.png b/graphics/pokemon/gen_3/makuhita/back.png
similarity index 100%
rename from graphics/pokemon/makuhita/back.png
rename to graphics/pokemon/gen_3/makuhita/back.png
diff --git a/graphics/pokemon/makuhita/footprint.png b/graphics/pokemon/gen_3/makuhita/footprint.png
similarity index 100%
rename from graphics/pokemon/makuhita/footprint.png
rename to graphics/pokemon/gen_3/makuhita/footprint.png
diff --git a/graphics/pokemon/makuhita/icon.png b/graphics/pokemon/gen_3/makuhita/icon.png
similarity index 100%
rename from graphics/pokemon/makuhita/icon.png
rename to graphics/pokemon/gen_3/makuhita/icon.png
diff --git a/graphics/pokemon/makuhita/normal.pal b/graphics/pokemon/gen_3/makuhita/normal.pal
similarity index 100%
rename from graphics/pokemon/makuhita/normal.pal
rename to graphics/pokemon/gen_3/makuhita/normal.pal
diff --git a/graphics/pokemon/makuhita/shiny.pal b/graphics/pokemon/gen_3/makuhita/shiny.pal
similarity index 100%
rename from graphics/pokemon/makuhita/shiny.pal
rename to graphics/pokemon/gen_3/makuhita/shiny.pal
diff --git a/graphics/pokemon/manectric/anim_front.png b/graphics/pokemon/gen_3/manectric/anim_front.png
similarity index 100%
rename from graphics/pokemon/manectric/anim_front.png
rename to graphics/pokemon/gen_3/manectric/anim_front.png
diff --git a/graphics/pokemon/manectric/back.png b/graphics/pokemon/gen_3/manectric/back.png
similarity index 100%
rename from graphics/pokemon/manectric/back.png
rename to graphics/pokemon/gen_3/manectric/back.png
diff --git a/graphics/pokemon/manectric/footprint.png b/graphics/pokemon/gen_3/manectric/footprint.png
similarity index 100%
rename from graphics/pokemon/manectric/footprint.png
rename to graphics/pokemon/gen_3/manectric/footprint.png
diff --git a/graphics/pokemon/manectric/icon.png b/graphics/pokemon/gen_3/manectric/icon.png
similarity index 100%
rename from graphics/pokemon/manectric/icon.png
rename to graphics/pokemon/gen_3/manectric/icon.png
diff --git a/graphics/pokemon/manectric/mega/back.png b/graphics/pokemon/gen_3/manectric/mega/back.png
similarity index 100%
rename from graphics/pokemon/manectric/mega/back.png
rename to graphics/pokemon/gen_3/manectric/mega/back.png
diff --git a/graphics/pokemon/manectric/mega/front.png b/graphics/pokemon/gen_3/manectric/mega/front.png
similarity index 100%
rename from graphics/pokemon/manectric/mega/front.png
rename to graphics/pokemon/gen_3/manectric/mega/front.png
diff --git a/graphics/pokemon/manectric/mega/icon.png b/graphics/pokemon/gen_3/manectric/mega/icon.png
similarity index 100%
rename from graphics/pokemon/manectric/mega/icon.png
rename to graphics/pokemon/gen_3/manectric/mega/icon.png
diff --git a/graphics/pokemon/manectric/mega/normal.pal b/graphics/pokemon/gen_3/manectric/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/manectric/mega/normal.pal
rename to graphics/pokemon/gen_3/manectric/mega/normal.pal
diff --git a/graphics/pokemon/manectric/mega/shiny.pal b/graphics/pokemon/gen_3/manectric/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/manectric/mega/shiny.pal
rename to graphics/pokemon/gen_3/manectric/mega/shiny.pal
diff --git a/graphics/pokemon/manectric/normal.pal b/graphics/pokemon/gen_3/manectric/normal.pal
similarity index 100%
rename from graphics/pokemon/manectric/normal.pal
rename to graphics/pokemon/gen_3/manectric/normal.pal
diff --git a/graphics/pokemon/manectric/shiny.pal b/graphics/pokemon/gen_3/manectric/shiny.pal
similarity index 100%
rename from graphics/pokemon/manectric/shiny.pal
rename to graphics/pokemon/gen_3/manectric/shiny.pal
diff --git a/graphics/pokemon/marshtomp/anim_front.png b/graphics/pokemon/gen_3/marshtomp/anim_front.png
similarity index 100%
rename from graphics/pokemon/marshtomp/anim_front.png
rename to graphics/pokemon/gen_3/marshtomp/anim_front.png
diff --git a/graphics/pokemon/marshtomp/back.png b/graphics/pokemon/gen_3/marshtomp/back.png
similarity index 100%
rename from graphics/pokemon/marshtomp/back.png
rename to graphics/pokemon/gen_3/marshtomp/back.png
diff --git a/graphics/pokemon/marshtomp/footprint.png b/graphics/pokemon/gen_3/marshtomp/footprint.png
similarity index 100%
rename from graphics/pokemon/marshtomp/footprint.png
rename to graphics/pokemon/gen_3/marshtomp/footprint.png
diff --git a/graphics/pokemon/marshtomp/icon.png b/graphics/pokemon/gen_3/marshtomp/icon.png
similarity index 100%
rename from graphics/pokemon/marshtomp/icon.png
rename to graphics/pokemon/gen_3/marshtomp/icon.png
diff --git a/graphics/pokemon/marshtomp/normal.pal b/graphics/pokemon/gen_3/marshtomp/normal.pal
similarity index 100%
rename from graphics/pokemon/marshtomp/normal.pal
rename to graphics/pokemon/gen_3/marshtomp/normal.pal
diff --git a/graphics/pokemon/marshtomp/shiny.pal b/graphics/pokemon/gen_3/marshtomp/shiny.pal
similarity index 100%
rename from graphics/pokemon/marshtomp/shiny.pal
rename to graphics/pokemon/gen_3/marshtomp/shiny.pal
diff --git a/graphics/pokemon/masquerain/anim_front.png b/graphics/pokemon/gen_3/masquerain/anim_front.png
similarity index 100%
rename from graphics/pokemon/masquerain/anim_front.png
rename to graphics/pokemon/gen_3/masquerain/anim_front.png
diff --git a/graphics/pokemon/masquerain/back.png b/graphics/pokemon/gen_3/masquerain/back.png
similarity index 100%
rename from graphics/pokemon/masquerain/back.png
rename to graphics/pokemon/gen_3/masquerain/back.png
diff --git a/graphics/pokemon/floette/footprint.png b/graphics/pokemon/gen_3/masquerain/footprint.png
similarity index 100%
rename from graphics/pokemon/floette/footprint.png
rename to graphics/pokemon/gen_3/masquerain/footprint.png
diff --git a/graphics/pokemon/masquerain/icon.png b/graphics/pokemon/gen_3/masquerain/icon.png
similarity index 100%
rename from graphics/pokemon/masquerain/icon.png
rename to graphics/pokemon/gen_3/masquerain/icon.png
diff --git a/graphics/pokemon/masquerain/normal.pal b/graphics/pokemon/gen_3/masquerain/normal.pal
similarity index 100%
rename from graphics/pokemon/masquerain/normal.pal
rename to graphics/pokemon/gen_3/masquerain/normal.pal
diff --git a/graphics/pokemon/masquerain/shiny.pal b/graphics/pokemon/gen_3/masquerain/shiny.pal
similarity index 100%
rename from graphics/pokemon/masquerain/shiny.pal
rename to graphics/pokemon/gen_3/masquerain/shiny.pal
diff --git a/graphics/pokemon/mawile/anim_front.png b/graphics/pokemon/gen_3/mawile/anim_front.png
similarity index 100%
rename from graphics/pokemon/mawile/anim_front.png
rename to graphics/pokemon/gen_3/mawile/anim_front.png
diff --git a/graphics/pokemon/mawile/back.png b/graphics/pokemon/gen_3/mawile/back.png
similarity index 100%
rename from graphics/pokemon/mawile/back.png
rename to graphics/pokemon/gen_3/mawile/back.png
diff --git a/graphics/pokemon/mawile/footprint.png b/graphics/pokemon/gen_3/mawile/footprint.png
similarity index 100%
rename from graphics/pokemon/mawile/footprint.png
rename to graphics/pokemon/gen_3/mawile/footprint.png
diff --git a/graphics/pokemon/mawile/icon.png b/graphics/pokemon/gen_3/mawile/icon.png
similarity index 100%
rename from graphics/pokemon/mawile/icon.png
rename to graphics/pokemon/gen_3/mawile/icon.png
diff --git a/graphics/pokemon/mawile/mega/back.png b/graphics/pokemon/gen_3/mawile/mega/back.png
similarity index 100%
rename from graphics/pokemon/mawile/mega/back.png
rename to graphics/pokemon/gen_3/mawile/mega/back.png
diff --git a/graphics/pokemon/mawile/mega/front.png b/graphics/pokemon/gen_3/mawile/mega/front.png
similarity index 100%
rename from graphics/pokemon/mawile/mega/front.png
rename to graphics/pokemon/gen_3/mawile/mega/front.png
diff --git a/graphics/pokemon/mawile/mega/icon.png b/graphics/pokemon/gen_3/mawile/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mawile/mega/icon.png
rename to graphics/pokemon/gen_3/mawile/mega/icon.png
diff --git a/graphics/pokemon/mawile/mega/normal.pal b/graphics/pokemon/gen_3/mawile/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mawile/mega/normal.pal
rename to graphics/pokemon/gen_3/mawile/mega/normal.pal
diff --git a/graphics/pokemon/mawile/mega/shiny.pal b/graphics/pokemon/gen_3/mawile/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mawile/mega/shiny.pal
rename to graphics/pokemon/gen_3/mawile/mega/shiny.pal
diff --git a/graphics/pokemon/mawile/normal.pal b/graphics/pokemon/gen_3/mawile/normal.pal
similarity index 100%
rename from graphics/pokemon/mawile/normal.pal
rename to graphics/pokemon/gen_3/mawile/normal.pal
diff --git a/graphics/pokemon/mawile/shiny.pal b/graphics/pokemon/gen_3/mawile/shiny.pal
similarity index 100%
rename from graphics/pokemon/mawile/shiny.pal
rename to graphics/pokemon/gen_3/mawile/shiny.pal
diff --git a/graphics/pokemon/medicham/anim_front.png b/graphics/pokemon/gen_3/medicham/anim_front.png
similarity index 100%
rename from graphics/pokemon/medicham/anim_front.png
rename to graphics/pokemon/gen_3/medicham/anim_front.png
diff --git a/graphics/pokemon/medicham/anim_frontf.png b/graphics/pokemon/gen_3/medicham/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/medicham/anim_frontf.png
rename to graphics/pokemon/gen_3/medicham/anim_frontf.png
diff --git a/graphics/pokemon/medicham/back.png b/graphics/pokemon/gen_3/medicham/back.png
similarity index 100%
rename from graphics/pokemon/medicham/back.png
rename to graphics/pokemon/gen_3/medicham/back.png
diff --git a/graphics/pokemon/medicham/backf.png b/graphics/pokemon/gen_3/medicham/backf.png
similarity index 100%
rename from graphics/pokemon/medicham/backf.png
rename to graphics/pokemon/gen_3/medicham/backf.png
diff --git a/graphics/pokemon/medicham/footprint.png b/graphics/pokemon/gen_3/medicham/footprint.png
similarity index 100%
rename from graphics/pokemon/medicham/footprint.png
rename to graphics/pokemon/gen_3/medicham/footprint.png
diff --git a/graphics/pokemon/medicham/icon.png b/graphics/pokemon/gen_3/medicham/icon.png
similarity index 100%
rename from graphics/pokemon/medicham/icon.png
rename to graphics/pokemon/gen_3/medicham/icon.png
diff --git a/graphics/pokemon/medicham/mega/back.png b/graphics/pokemon/gen_3/medicham/mega/back.png
similarity index 100%
rename from graphics/pokemon/medicham/mega/back.png
rename to graphics/pokemon/gen_3/medicham/mega/back.png
diff --git a/graphics/pokemon/medicham/mega/front.png b/graphics/pokemon/gen_3/medicham/mega/front.png
similarity index 100%
rename from graphics/pokemon/medicham/mega/front.png
rename to graphics/pokemon/gen_3/medicham/mega/front.png
diff --git a/graphics/pokemon/medicham/mega/icon.png b/graphics/pokemon/gen_3/medicham/mega/icon.png
similarity index 100%
rename from graphics/pokemon/medicham/mega/icon.png
rename to graphics/pokemon/gen_3/medicham/mega/icon.png
diff --git a/graphics/pokemon/medicham/mega/normal.pal b/graphics/pokemon/gen_3/medicham/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/medicham/mega/normal.pal
rename to graphics/pokemon/gen_3/medicham/mega/normal.pal
diff --git a/graphics/pokemon/medicham/mega/shiny.pal b/graphics/pokemon/gen_3/medicham/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/medicham/mega/shiny.pal
rename to graphics/pokemon/gen_3/medicham/mega/shiny.pal
diff --git a/graphics/pokemon/medicham/normal.pal b/graphics/pokemon/gen_3/medicham/normal.pal
similarity index 100%
rename from graphics/pokemon/medicham/normal.pal
rename to graphics/pokemon/gen_3/medicham/normal.pal
diff --git a/graphics/pokemon/medicham/shiny.pal b/graphics/pokemon/gen_3/medicham/shiny.pal
similarity index 100%
rename from graphics/pokemon/medicham/shiny.pal
rename to graphics/pokemon/gen_3/medicham/shiny.pal
diff --git a/graphics/pokemon/meditite/anim_front.png b/graphics/pokemon/gen_3/meditite/anim_front.png
similarity index 100%
rename from graphics/pokemon/meditite/anim_front.png
rename to graphics/pokemon/gen_3/meditite/anim_front.png
diff --git a/graphics/pokemon/meditite/anim_frontf.png b/graphics/pokemon/gen_3/meditite/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/meditite/anim_frontf.png
rename to graphics/pokemon/gen_3/meditite/anim_frontf.png
diff --git a/graphics/pokemon/meditite/back.png b/graphics/pokemon/gen_3/meditite/back.png
similarity index 100%
rename from graphics/pokemon/meditite/back.png
rename to graphics/pokemon/gen_3/meditite/back.png
diff --git a/graphics/pokemon/meditite/backf.png b/graphics/pokemon/gen_3/meditite/backf.png
similarity index 100%
rename from graphics/pokemon/meditite/backf.png
rename to graphics/pokemon/gen_3/meditite/backf.png
diff --git a/graphics/pokemon/meditite/footprint.png b/graphics/pokemon/gen_3/meditite/footprint.png
similarity index 100%
rename from graphics/pokemon/meditite/footprint.png
rename to graphics/pokemon/gen_3/meditite/footprint.png
diff --git a/graphics/pokemon/meditite/icon.png b/graphics/pokemon/gen_3/meditite/icon.png
similarity index 100%
rename from graphics/pokemon/meditite/icon.png
rename to graphics/pokemon/gen_3/meditite/icon.png
diff --git a/graphics/pokemon/meditite/normal.pal b/graphics/pokemon/gen_3/meditite/normal.pal
similarity index 100%
rename from graphics/pokemon/meditite/normal.pal
rename to graphics/pokemon/gen_3/meditite/normal.pal
diff --git a/graphics/pokemon/meditite/shiny.pal b/graphics/pokemon/gen_3/meditite/shiny.pal
similarity index 100%
rename from graphics/pokemon/meditite/shiny.pal
rename to graphics/pokemon/gen_3/meditite/shiny.pal
diff --git a/graphics/pokemon/metagross/anim_front.png b/graphics/pokemon/gen_3/metagross/anim_front.png
similarity index 100%
rename from graphics/pokemon/metagross/anim_front.png
rename to graphics/pokemon/gen_3/metagross/anim_front.png
diff --git a/graphics/pokemon/metagross/back.png b/graphics/pokemon/gen_3/metagross/back.png
similarity index 100%
rename from graphics/pokemon/metagross/back.png
rename to graphics/pokemon/gen_3/metagross/back.png
diff --git a/graphics/pokemon/metagross/footprint.png b/graphics/pokemon/gen_3/metagross/footprint.png
similarity index 100%
rename from graphics/pokemon/metagross/footprint.png
rename to graphics/pokemon/gen_3/metagross/footprint.png
diff --git a/graphics/pokemon/metagross/icon.png b/graphics/pokemon/gen_3/metagross/icon.png
similarity index 100%
rename from graphics/pokemon/metagross/icon.png
rename to graphics/pokemon/gen_3/metagross/icon.png
diff --git a/graphics/pokemon/metagross/mega/back.png b/graphics/pokemon/gen_3/metagross/mega/back.png
similarity index 100%
rename from graphics/pokemon/metagross/mega/back.png
rename to graphics/pokemon/gen_3/metagross/mega/back.png
diff --git a/graphics/pokemon/metagross/mega/front.png b/graphics/pokemon/gen_3/metagross/mega/front.png
similarity index 100%
rename from graphics/pokemon/metagross/mega/front.png
rename to graphics/pokemon/gen_3/metagross/mega/front.png
diff --git a/graphics/pokemon/metagross/mega/icon.png b/graphics/pokemon/gen_3/metagross/mega/icon.png
similarity index 100%
rename from graphics/pokemon/metagross/mega/icon.png
rename to graphics/pokemon/gen_3/metagross/mega/icon.png
diff --git a/graphics/pokemon/metagross/mega/normal.pal b/graphics/pokemon/gen_3/metagross/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/metagross/mega/normal.pal
rename to graphics/pokemon/gen_3/metagross/mega/normal.pal
diff --git a/graphics/pokemon/metagross/mega/shiny.pal b/graphics/pokemon/gen_3/metagross/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/metagross/mega/shiny.pal
rename to graphics/pokemon/gen_3/metagross/mega/shiny.pal
diff --git a/graphics/pokemon/metagross/normal.pal b/graphics/pokemon/gen_3/metagross/normal.pal
similarity index 100%
rename from graphics/pokemon/metagross/normal.pal
rename to graphics/pokemon/gen_3/metagross/normal.pal
diff --git a/graphics/pokemon/metagross/shiny.pal b/graphics/pokemon/gen_3/metagross/shiny.pal
similarity index 100%
rename from graphics/pokemon/metagross/shiny.pal
rename to graphics/pokemon/gen_3/metagross/shiny.pal
diff --git a/graphics/pokemon/metang/anim_front.png b/graphics/pokemon/gen_3/metang/anim_front.png
similarity index 100%
rename from graphics/pokemon/metang/anim_front.png
rename to graphics/pokemon/gen_3/metang/anim_front.png
diff --git a/graphics/pokemon/metang/back.png b/graphics/pokemon/gen_3/metang/back.png
similarity index 100%
rename from graphics/pokemon/metang/back.png
rename to graphics/pokemon/gen_3/metang/back.png
diff --git a/graphics/pokemon/metang/footprint.png b/graphics/pokemon/gen_3/metang/footprint.png
similarity index 100%
rename from graphics/pokemon/metang/footprint.png
rename to graphics/pokemon/gen_3/metang/footprint.png
diff --git a/graphics/pokemon/metang/icon.png b/graphics/pokemon/gen_3/metang/icon.png
similarity index 100%
rename from graphics/pokemon/metang/icon.png
rename to graphics/pokemon/gen_3/metang/icon.png
diff --git a/graphics/pokemon/metang/normal.pal b/graphics/pokemon/gen_3/metang/normal.pal
similarity index 100%
rename from graphics/pokemon/metang/normal.pal
rename to graphics/pokemon/gen_3/metang/normal.pal
diff --git a/graphics/pokemon/metang/shiny.pal b/graphics/pokemon/gen_3/metang/shiny.pal
similarity index 100%
rename from graphics/pokemon/metang/shiny.pal
rename to graphics/pokemon/gen_3/metang/shiny.pal
diff --git a/graphics/pokemon/mightyena/anim_front.png b/graphics/pokemon/gen_3/mightyena/anim_front.png
similarity index 100%
rename from graphics/pokemon/mightyena/anim_front.png
rename to graphics/pokemon/gen_3/mightyena/anim_front.png
diff --git a/graphics/pokemon/mightyena/back.png b/graphics/pokemon/gen_3/mightyena/back.png
similarity index 100%
rename from graphics/pokemon/mightyena/back.png
rename to graphics/pokemon/gen_3/mightyena/back.png
diff --git a/graphics/pokemon/mightyena/footprint.png b/graphics/pokemon/gen_3/mightyena/footprint.png
similarity index 100%
rename from graphics/pokemon/mightyena/footprint.png
rename to graphics/pokemon/gen_3/mightyena/footprint.png
diff --git a/graphics/pokemon/mightyena/icon.png b/graphics/pokemon/gen_3/mightyena/icon.png
similarity index 100%
rename from graphics/pokemon/mightyena/icon.png
rename to graphics/pokemon/gen_3/mightyena/icon.png
diff --git a/graphics/pokemon/mightyena/normal.pal b/graphics/pokemon/gen_3/mightyena/normal.pal
similarity index 100%
rename from graphics/pokemon/mightyena/normal.pal
rename to graphics/pokemon/gen_3/mightyena/normal.pal
diff --git a/graphics/pokemon/mightyena/shiny.pal b/graphics/pokemon/gen_3/mightyena/shiny.pal
similarity index 100%
rename from graphics/pokemon/mightyena/shiny.pal
rename to graphics/pokemon/gen_3/mightyena/shiny.pal
diff --git a/graphics/pokemon/milotic/anim_front.png b/graphics/pokemon/gen_3/milotic/anim_front.png
similarity index 100%
rename from graphics/pokemon/milotic/anim_front.png
rename to graphics/pokemon/gen_3/milotic/anim_front.png
diff --git a/graphics/pokemon/milotic/anim_frontf.png b/graphics/pokemon/gen_3/milotic/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/milotic/anim_frontf.png
rename to graphics/pokemon/gen_3/milotic/anim_frontf.png
diff --git a/graphics/pokemon/milotic/back.png b/graphics/pokemon/gen_3/milotic/back.png
similarity index 100%
rename from graphics/pokemon/milotic/back.png
rename to graphics/pokemon/gen_3/milotic/back.png
diff --git a/graphics/pokemon/milotic/backf.png b/graphics/pokemon/gen_3/milotic/backf.png
similarity index 100%
rename from graphics/pokemon/milotic/backf.png
rename to graphics/pokemon/gen_3/milotic/backf.png
diff --git a/graphics/pokemon/florges/footprint.png b/graphics/pokemon/gen_3/milotic/footprint.png
similarity index 100%
rename from graphics/pokemon/florges/footprint.png
rename to graphics/pokemon/gen_3/milotic/footprint.png
diff --git a/graphics/pokemon/milotic/icon.png b/graphics/pokemon/gen_3/milotic/icon.png
similarity index 100%
rename from graphics/pokemon/milotic/icon.png
rename to graphics/pokemon/gen_3/milotic/icon.png
diff --git a/graphics/pokemon/milotic/normal.pal b/graphics/pokemon/gen_3/milotic/normal.pal
similarity index 100%
rename from graphics/pokemon/milotic/normal.pal
rename to graphics/pokemon/gen_3/milotic/normal.pal
diff --git a/graphics/pokemon/milotic/shiny.pal b/graphics/pokemon/gen_3/milotic/shiny.pal
similarity index 100%
rename from graphics/pokemon/milotic/shiny.pal
rename to graphics/pokemon/gen_3/milotic/shiny.pal
diff --git a/graphics/pokemon/minun/anim_front.png b/graphics/pokemon/gen_3/minun/anim_front.png
similarity index 100%
rename from graphics/pokemon/minun/anim_front.png
rename to graphics/pokemon/gen_3/minun/anim_front.png
diff --git a/graphics/pokemon/minun/back.png b/graphics/pokemon/gen_3/minun/back.png
similarity index 100%
rename from graphics/pokemon/minun/back.png
rename to graphics/pokemon/gen_3/minun/back.png
diff --git a/graphics/pokemon/minun/footprint.png b/graphics/pokemon/gen_3/minun/footprint.png
similarity index 100%
rename from graphics/pokemon/minun/footprint.png
rename to graphics/pokemon/gen_3/minun/footprint.png
diff --git a/graphics/pokemon/minun/icon.png b/graphics/pokemon/gen_3/minun/icon.png
similarity index 100%
rename from graphics/pokemon/minun/icon.png
rename to graphics/pokemon/gen_3/minun/icon.png
diff --git a/graphics/pokemon/minun/normal.pal b/graphics/pokemon/gen_3/minun/normal.pal
similarity index 100%
rename from graphics/pokemon/minun/normal.pal
rename to graphics/pokemon/gen_3/minun/normal.pal
diff --git a/graphics/pokemon/minun/shiny.pal b/graphics/pokemon/gen_3/minun/shiny.pal
similarity index 100%
rename from graphics/pokemon/minun/shiny.pal
rename to graphics/pokemon/gen_3/minun/shiny.pal
diff --git a/graphics/pokemon/mudkip/anim_front.png b/graphics/pokemon/gen_3/mudkip/anim_front.png
similarity index 100%
rename from graphics/pokemon/mudkip/anim_front.png
rename to graphics/pokemon/gen_3/mudkip/anim_front.png
diff --git a/graphics/pokemon/mudkip/back.png b/graphics/pokemon/gen_3/mudkip/back.png
similarity index 100%
rename from graphics/pokemon/mudkip/back.png
rename to graphics/pokemon/gen_3/mudkip/back.png
diff --git a/graphics/pokemon/mudkip/footprint.png b/graphics/pokemon/gen_3/mudkip/footprint.png
similarity index 100%
rename from graphics/pokemon/mudkip/footprint.png
rename to graphics/pokemon/gen_3/mudkip/footprint.png
diff --git a/graphics/pokemon/mudkip/icon.png b/graphics/pokemon/gen_3/mudkip/icon.png
similarity index 100%
rename from graphics/pokemon/mudkip/icon.png
rename to graphics/pokemon/gen_3/mudkip/icon.png
diff --git a/graphics/pokemon/mudkip/normal.pal b/graphics/pokemon/gen_3/mudkip/normal.pal
similarity index 100%
rename from graphics/pokemon/mudkip/normal.pal
rename to graphics/pokemon/gen_3/mudkip/normal.pal
diff --git a/graphics/pokemon/mudkip/shiny.pal b/graphics/pokemon/gen_3/mudkip/shiny.pal
similarity index 100%
rename from graphics/pokemon/mudkip/shiny.pal
rename to graphics/pokemon/gen_3/mudkip/shiny.pal
diff --git a/graphics/pokemon/nincada/anim_front.png b/graphics/pokemon/gen_3/nincada/anim_front.png
similarity index 100%
rename from graphics/pokemon/nincada/anim_front.png
rename to graphics/pokemon/gen_3/nincada/anim_front.png
diff --git a/graphics/pokemon/nincada/back.png b/graphics/pokemon/gen_3/nincada/back.png
similarity index 100%
rename from graphics/pokemon/nincada/back.png
rename to graphics/pokemon/gen_3/nincada/back.png
diff --git a/graphics/pokemon/nincada/footprint.png b/graphics/pokemon/gen_3/nincada/footprint.png
similarity index 100%
rename from graphics/pokemon/nincada/footprint.png
rename to graphics/pokemon/gen_3/nincada/footprint.png
diff --git a/graphics/pokemon/nincada/icon.png b/graphics/pokemon/gen_3/nincada/icon.png
similarity index 100%
rename from graphics/pokemon/nincada/icon.png
rename to graphics/pokemon/gen_3/nincada/icon.png
diff --git a/graphics/pokemon/nincada/normal.pal b/graphics/pokemon/gen_3/nincada/normal.pal
similarity index 100%
rename from graphics/pokemon/nincada/normal.pal
rename to graphics/pokemon/gen_3/nincada/normal.pal
diff --git a/graphics/pokemon/nincada/shiny.pal b/graphics/pokemon/gen_3/nincada/shiny.pal
similarity index 100%
rename from graphics/pokemon/nincada/shiny.pal
rename to graphics/pokemon/gen_3/nincada/shiny.pal
diff --git a/graphics/pokemon/ninjask/anim_front.png b/graphics/pokemon/gen_3/ninjask/anim_front.png
similarity index 100%
rename from graphics/pokemon/ninjask/anim_front.png
rename to graphics/pokemon/gen_3/ninjask/anim_front.png
diff --git a/graphics/pokemon/ninjask/back.png b/graphics/pokemon/gen_3/ninjask/back.png
similarity index 100%
rename from graphics/pokemon/ninjask/back.png
rename to graphics/pokemon/gen_3/ninjask/back.png
diff --git a/graphics/pokemon/ninjask/footprint.png b/graphics/pokemon/gen_3/ninjask/footprint.png
similarity index 100%
rename from graphics/pokemon/ninjask/footprint.png
rename to graphics/pokemon/gen_3/ninjask/footprint.png
diff --git a/graphics/pokemon/ninjask/icon.png b/graphics/pokemon/gen_3/ninjask/icon.png
similarity index 100%
rename from graphics/pokemon/ninjask/icon.png
rename to graphics/pokemon/gen_3/ninjask/icon.png
diff --git a/graphics/pokemon/ninjask/normal.pal b/graphics/pokemon/gen_3/ninjask/normal.pal
similarity index 100%
rename from graphics/pokemon/ninjask/normal.pal
rename to graphics/pokemon/gen_3/ninjask/normal.pal
diff --git a/graphics/pokemon/ninjask/shiny.pal b/graphics/pokemon/gen_3/ninjask/shiny.pal
similarity index 100%
rename from graphics/pokemon/ninjask/shiny.pal
rename to graphics/pokemon/gen_3/ninjask/shiny.pal
diff --git a/graphics/pokemon/nosepass/anim_front.png b/graphics/pokemon/gen_3/nosepass/anim_front.png
similarity index 100%
rename from graphics/pokemon/nosepass/anim_front.png
rename to graphics/pokemon/gen_3/nosepass/anim_front.png
diff --git a/graphics/pokemon/nosepass/back.png b/graphics/pokemon/gen_3/nosepass/back.png
similarity index 100%
rename from graphics/pokemon/nosepass/back.png
rename to graphics/pokemon/gen_3/nosepass/back.png
diff --git a/graphics/pokemon/nosepass/footprint.png b/graphics/pokemon/gen_3/nosepass/footprint.png
similarity index 100%
rename from graphics/pokemon/nosepass/footprint.png
rename to graphics/pokemon/gen_3/nosepass/footprint.png
diff --git a/graphics/pokemon/nosepass/icon.png b/graphics/pokemon/gen_3/nosepass/icon.png
similarity index 100%
rename from graphics/pokemon/nosepass/icon.png
rename to graphics/pokemon/gen_3/nosepass/icon.png
diff --git a/graphics/pokemon/nosepass/normal.pal b/graphics/pokemon/gen_3/nosepass/normal.pal
similarity index 100%
rename from graphics/pokemon/nosepass/normal.pal
rename to graphics/pokemon/gen_3/nosepass/normal.pal
diff --git a/graphics/pokemon/nosepass/shiny.pal b/graphics/pokemon/gen_3/nosepass/shiny.pal
similarity index 100%
rename from graphics/pokemon/nosepass/shiny.pal
rename to graphics/pokemon/gen_3/nosepass/shiny.pal
diff --git a/graphics/pokemon/numel/anim_front.png b/graphics/pokemon/gen_3/numel/anim_front.png
similarity index 100%
rename from graphics/pokemon/numel/anim_front.png
rename to graphics/pokemon/gen_3/numel/anim_front.png
diff --git a/graphics/pokemon/numel/anim_frontf.png b/graphics/pokemon/gen_3/numel/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/numel/anim_frontf.png
rename to graphics/pokemon/gen_3/numel/anim_frontf.png
diff --git a/graphics/pokemon/numel/back.png b/graphics/pokemon/gen_3/numel/back.png
similarity index 100%
rename from graphics/pokemon/numel/back.png
rename to graphics/pokemon/gen_3/numel/back.png
diff --git a/graphics/pokemon/numel/backf.png b/graphics/pokemon/gen_3/numel/backf.png
similarity index 100%
rename from graphics/pokemon/numel/backf.png
rename to graphics/pokemon/gen_3/numel/backf.png
diff --git a/graphics/pokemon/numel/footprint.png b/graphics/pokemon/gen_3/numel/footprint.png
similarity index 100%
rename from graphics/pokemon/numel/footprint.png
rename to graphics/pokemon/gen_3/numel/footprint.png
diff --git a/graphics/pokemon/numel/icon.png b/graphics/pokemon/gen_3/numel/icon.png
similarity index 100%
rename from graphics/pokemon/numel/icon.png
rename to graphics/pokemon/gen_3/numel/icon.png
diff --git a/graphics/pokemon/numel/normal.pal b/graphics/pokemon/gen_3/numel/normal.pal
similarity index 100%
rename from graphics/pokemon/numel/normal.pal
rename to graphics/pokemon/gen_3/numel/normal.pal
diff --git a/graphics/pokemon/numel/shiny.pal b/graphics/pokemon/gen_3/numel/shiny.pal
similarity index 100%
rename from graphics/pokemon/numel/shiny.pal
rename to graphics/pokemon/gen_3/numel/shiny.pal
diff --git a/graphics/pokemon/nuzleaf/anim_front.png b/graphics/pokemon/gen_3/nuzleaf/anim_front.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/anim_front.png
rename to graphics/pokemon/gen_3/nuzleaf/anim_front.png
diff --git a/graphics/pokemon/nuzleaf/anim_frontf.png b/graphics/pokemon/gen_3/nuzleaf/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/anim_frontf.png
rename to graphics/pokemon/gen_3/nuzleaf/anim_frontf.png
diff --git a/graphics/pokemon/nuzleaf/back.png b/graphics/pokemon/gen_3/nuzleaf/back.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/back.png
rename to graphics/pokemon/gen_3/nuzleaf/back.png
diff --git a/graphics/pokemon/nuzleaf/backf.png b/graphics/pokemon/gen_3/nuzleaf/backf.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/backf.png
rename to graphics/pokemon/gen_3/nuzleaf/backf.png
diff --git a/graphics/pokemon/nuzleaf/footprint.png b/graphics/pokemon/gen_3/nuzleaf/footprint.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/footprint.png
rename to graphics/pokemon/gen_3/nuzleaf/footprint.png
diff --git a/graphics/pokemon/nuzleaf/icon.png b/graphics/pokemon/gen_3/nuzleaf/icon.png
similarity index 100%
rename from graphics/pokemon/nuzleaf/icon.png
rename to graphics/pokemon/gen_3/nuzleaf/icon.png
diff --git a/graphics/pokemon/nuzleaf/normal.pal b/graphics/pokemon/gen_3/nuzleaf/normal.pal
similarity index 100%
rename from graphics/pokemon/nuzleaf/normal.pal
rename to graphics/pokemon/gen_3/nuzleaf/normal.pal
diff --git a/graphics/pokemon/nuzleaf/shiny.pal b/graphics/pokemon/gen_3/nuzleaf/shiny.pal
similarity index 100%
rename from graphics/pokemon/nuzleaf/shiny.pal
rename to graphics/pokemon/gen_3/nuzleaf/shiny.pal
diff --git a/graphics/pokemon/pelipper/anim_front.png b/graphics/pokemon/gen_3/pelipper/anim_front.png
similarity index 100%
rename from graphics/pokemon/pelipper/anim_front.png
rename to graphics/pokemon/gen_3/pelipper/anim_front.png
diff --git a/graphics/pokemon/pelipper/back.png b/graphics/pokemon/gen_3/pelipper/back.png
similarity index 100%
rename from graphics/pokemon/pelipper/back.png
rename to graphics/pokemon/gen_3/pelipper/back.png
diff --git a/graphics/pokemon/pelipper/footprint.png b/graphics/pokemon/gen_3/pelipper/footprint.png
similarity index 100%
rename from graphics/pokemon/pelipper/footprint.png
rename to graphics/pokemon/gen_3/pelipper/footprint.png
diff --git a/graphics/pokemon/pelipper/icon.png b/graphics/pokemon/gen_3/pelipper/icon.png
similarity index 100%
rename from graphics/pokemon/pelipper/icon.png
rename to graphics/pokemon/gen_3/pelipper/icon.png
diff --git a/graphics/pokemon/pelipper/normal.pal b/graphics/pokemon/gen_3/pelipper/normal.pal
similarity index 100%
rename from graphics/pokemon/pelipper/normal.pal
rename to graphics/pokemon/gen_3/pelipper/normal.pal
diff --git a/graphics/pokemon/pelipper/shiny.pal b/graphics/pokemon/gen_3/pelipper/shiny.pal
similarity index 100%
rename from graphics/pokemon/pelipper/shiny.pal
rename to graphics/pokemon/gen_3/pelipper/shiny.pal
diff --git a/graphics/pokemon/plusle/anim_front.png b/graphics/pokemon/gen_3/plusle/anim_front.png
similarity index 100%
rename from graphics/pokemon/plusle/anim_front.png
rename to graphics/pokemon/gen_3/plusle/anim_front.png
diff --git a/graphics/pokemon/plusle/back.png b/graphics/pokemon/gen_3/plusle/back.png
similarity index 100%
rename from graphics/pokemon/plusle/back.png
rename to graphics/pokemon/gen_3/plusle/back.png
diff --git a/graphics/pokemon/plusle/footprint.png b/graphics/pokemon/gen_3/plusle/footprint.png
similarity index 100%
rename from graphics/pokemon/plusle/footprint.png
rename to graphics/pokemon/gen_3/plusle/footprint.png
diff --git a/graphics/pokemon/plusle/icon.png b/graphics/pokemon/gen_3/plusle/icon.png
similarity index 100%
rename from graphics/pokemon/plusle/icon.png
rename to graphics/pokemon/gen_3/plusle/icon.png
diff --git a/graphics/pokemon/plusle/normal.pal b/graphics/pokemon/gen_3/plusle/normal.pal
similarity index 100%
rename from graphics/pokemon/plusle/normal.pal
rename to graphics/pokemon/gen_3/plusle/normal.pal
diff --git a/graphics/pokemon/plusle/shiny.pal b/graphics/pokemon/gen_3/plusle/shiny.pal
similarity index 100%
rename from graphics/pokemon/plusle/shiny.pal
rename to graphics/pokemon/gen_3/plusle/shiny.pal
diff --git a/graphics/pokemon/poochyena/anim_front.png b/graphics/pokemon/gen_3/poochyena/anim_front.png
similarity index 100%
rename from graphics/pokemon/poochyena/anim_front.png
rename to graphics/pokemon/gen_3/poochyena/anim_front.png
diff --git a/graphics/pokemon/poochyena/back.png b/graphics/pokemon/gen_3/poochyena/back.png
similarity index 100%
rename from graphics/pokemon/poochyena/back.png
rename to graphics/pokemon/gen_3/poochyena/back.png
diff --git a/graphics/pokemon/poochyena/footprint.png b/graphics/pokemon/gen_3/poochyena/footprint.png
similarity index 100%
rename from graphics/pokemon/poochyena/footprint.png
rename to graphics/pokemon/gen_3/poochyena/footprint.png
diff --git a/graphics/pokemon/poochyena/icon.png b/graphics/pokemon/gen_3/poochyena/icon.png
similarity index 100%
rename from graphics/pokemon/poochyena/icon.png
rename to graphics/pokemon/gen_3/poochyena/icon.png
diff --git a/graphics/pokemon/poochyena/normal.pal b/graphics/pokemon/gen_3/poochyena/normal.pal
similarity index 100%
rename from graphics/pokemon/poochyena/normal.pal
rename to graphics/pokemon/gen_3/poochyena/normal.pal
diff --git a/graphics/pokemon/poochyena/shiny.pal b/graphics/pokemon/gen_3/poochyena/shiny.pal
similarity index 100%
rename from graphics/pokemon/poochyena/shiny.pal
rename to graphics/pokemon/gen_3/poochyena/shiny.pal
diff --git a/graphics/pokemon/ralts/anim_front.png b/graphics/pokemon/gen_3/ralts/anim_front.png
similarity index 100%
rename from graphics/pokemon/ralts/anim_front.png
rename to graphics/pokemon/gen_3/ralts/anim_front.png
diff --git a/graphics/pokemon/ralts/back.png b/graphics/pokemon/gen_3/ralts/back.png
similarity index 100%
rename from graphics/pokemon/ralts/back.png
rename to graphics/pokemon/gen_3/ralts/back.png
diff --git a/graphics/pokemon/durant/footprint.png b/graphics/pokemon/gen_3/ralts/footprint.png
similarity index 100%
rename from graphics/pokemon/durant/footprint.png
rename to graphics/pokemon/gen_3/ralts/footprint.png
diff --git a/graphics/pokemon/ralts/icon.png b/graphics/pokemon/gen_3/ralts/icon.png
similarity index 100%
rename from graphics/pokemon/ralts/icon.png
rename to graphics/pokemon/gen_3/ralts/icon.png
diff --git a/graphics/pokemon/ralts/normal.pal b/graphics/pokemon/gen_3/ralts/normal.pal
similarity index 100%
rename from graphics/pokemon/ralts/normal.pal
rename to graphics/pokemon/gen_3/ralts/normal.pal
diff --git a/graphics/pokemon/ralts/shiny.pal b/graphics/pokemon/gen_3/ralts/shiny.pal
similarity index 100%
rename from graphics/pokemon/ralts/shiny.pal
rename to graphics/pokemon/gen_3/ralts/shiny.pal
diff --git a/graphics/pokemon/rayquaza/anim_front.png b/graphics/pokemon/gen_3/rayquaza/anim_front.png
similarity index 100%
rename from graphics/pokemon/rayquaza/anim_front.png
rename to graphics/pokemon/gen_3/rayquaza/anim_front.png
diff --git a/graphics/pokemon/rayquaza/back.png b/graphics/pokemon/gen_3/rayquaza/back.png
similarity index 100%
rename from graphics/pokemon/rayquaza/back.png
rename to graphics/pokemon/gen_3/rayquaza/back.png
diff --git a/graphics/pokemon/foongus/footprint.png b/graphics/pokemon/gen_3/rayquaza/footprint.png
similarity index 100%
rename from graphics/pokemon/foongus/footprint.png
rename to graphics/pokemon/gen_3/rayquaza/footprint.png
diff --git a/graphics/pokemon/rayquaza/icon.png b/graphics/pokemon/gen_3/rayquaza/icon.png
similarity index 100%
rename from graphics/pokemon/rayquaza/icon.png
rename to graphics/pokemon/gen_3/rayquaza/icon.png
diff --git a/graphics/pokemon/rayquaza/mega/back.png b/graphics/pokemon/gen_3/rayquaza/mega/back.png
similarity index 100%
rename from graphics/pokemon/rayquaza/mega/back.png
rename to graphics/pokemon/gen_3/rayquaza/mega/back.png
diff --git a/graphics/pokemon/rayquaza/mega/front.png b/graphics/pokemon/gen_3/rayquaza/mega/front.png
similarity index 100%
rename from graphics/pokemon/rayquaza/mega/front.png
rename to graphics/pokemon/gen_3/rayquaza/mega/front.png
diff --git a/graphics/pokemon/rayquaza/mega/icon.png b/graphics/pokemon/gen_3/rayquaza/mega/icon.png
similarity index 100%
rename from graphics/pokemon/rayquaza/mega/icon.png
rename to graphics/pokemon/gen_3/rayquaza/mega/icon.png
diff --git a/graphics/pokemon/rayquaza/mega/normal.pal b/graphics/pokemon/gen_3/rayquaza/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/rayquaza/mega/normal.pal
rename to graphics/pokemon/gen_3/rayquaza/mega/normal.pal
diff --git a/graphics/pokemon/rayquaza/mega/shiny.pal b/graphics/pokemon/gen_3/rayquaza/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/rayquaza/mega/shiny.pal
rename to graphics/pokemon/gen_3/rayquaza/mega/shiny.pal
diff --git a/graphics/pokemon/rayquaza/normal.pal b/graphics/pokemon/gen_3/rayquaza/normal.pal
similarity index 100%
rename from graphics/pokemon/rayquaza/normal.pal
rename to graphics/pokemon/gen_3/rayquaza/normal.pal
diff --git a/graphics/pokemon/rayquaza/shiny.pal b/graphics/pokemon/gen_3/rayquaza/shiny.pal
similarity index 100%
rename from graphics/pokemon/rayquaza/shiny.pal
rename to graphics/pokemon/gen_3/rayquaza/shiny.pal
diff --git a/graphics/pokemon/regice/anim_front.png b/graphics/pokemon/gen_3/regice/anim_front.png
similarity index 100%
rename from graphics/pokemon/regice/anim_front.png
rename to graphics/pokemon/gen_3/regice/anim_front.png
diff --git a/graphics/pokemon/regice/back.png b/graphics/pokemon/gen_3/regice/back.png
similarity index 100%
rename from graphics/pokemon/regice/back.png
rename to graphics/pokemon/gen_3/regice/back.png
diff --git a/graphics/pokemon/dwebble/footprint.png b/graphics/pokemon/gen_3/regice/footprint.png
similarity index 100%
rename from graphics/pokemon/dwebble/footprint.png
rename to graphics/pokemon/gen_3/regice/footprint.png
diff --git a/graphics/pokemon/regice/icon.png b/graphics/pokemon/gen_3/regice/icon.png
similarity index 100%
rename from graphics/pokemon/regice/icon.png
rename to graphics/pokemon/gen_3/regice/icon.png
diff --git a/graphics/pokemon/regice/normal.pal b/graphics/pokemon/gen_3/regice/normal.pal
similarity index 100%
rename from graphics/pokemon/regice/normal.pal
rename to graphics/pokemon/gen_3/regice/normal.pal
diff --git a/graphics/pokemon/regice/shiny.pal b/graphics/pokemon/gen_3/regice/shiny.pal
similarity index 100%
rename from graphics/pokemon/regice/shiny.pal
rename to graphics/pokemon/gen_3/regice/shiny.pal
diff --git a/graphics/pokemon/regirock/anim_front.png b/graphics/pokemon/gen_3/regirock/anim_front.png
similarity index 100%
rename from graphics/pokemon/regirock/anim_front.png
rename to graphics/pokemon/gen_3/regirock/anim_front.png
diff --git a/graphics/pokemon/regirock/back.png b/graphics/pokemon/gen_3/regirock/back.png
similarity index 100%
rename from graphics/pokemon/regirock/back.png
rename to graphics/pokemon/gen_3/regirock/back.png
diff --git a/graphics/pokemon/regirock/footprint.png b/graphics/pokemon/gen_3/regirock/footprint.png
similarity index 100%
rename from graphics/pokemon/regirock/footprint.png
rename to graphics/pokemon/gen_3/regirock/footprint.png
diff --git a/graphics/pokemon/regirock/icon.png b/graphics/pokemon/gen_3/regirock/icon.png
similarity index 100%
rename from graphics/pokemon/regirock/icon.png
rename to graphics/pokemon/gen_3/regirock/icon.png
diff --git a/graphics/pokemon/regirock/normal.pal b/graphics/pokemon/gen_3/regirock/normal.pal
similarity index 100%
rename from graphics/pokemon/regirock/normal.pal
rename to graphics/pokemon/gen_3/regirock/normal.pal
diff --git a/graphics/pokemon/regirock/shiny.pal b/graphics/pokemon/gen_3/regirock/shiny.pal
similarity index 100%
rename from graphics/pokemon/regirock/shiny.pal
rename to graphics/pokemon/gen_3/regirock/shiny.pal
diff --git a/graphics/pokemon/registeel/anim_front.png b/graphics/pokemon/gen_3/registeel/anim_front.png
similarity index 100%
rename from graphics/pokemon/registeel/anim_front.png
rename to graphics/pokemon/gen_3/registeel/anim_front.png
diff --git a/graphics/pokemon/registeel/back.png b/graphics/pokemon/gen_3/registeel/back.png
similarity index 100%
rename from graphics/pokemon/registeel/back.png
rename to graphics/pokemon/gen_3/registeel/back.png
diff --git a/graphics/pokemon/registeel/footprint.png b/graphics/pokemon/gen_3/registeel/footprint.png
similarity index 100%
rename from graphics/pokemon/registeel/footprint.png
rename to graphics/pokemon/gen_3/registeel/footprint.png
diff --git a/graphics/pokemon/registeel/icon.png b/graphics/pokemon/gen_3/registeel/icon.png
similarity index 100%
rename from graphics/pokemon/registeel/icon.png
rename to graphics/pokemon/gen_3/registeel/icon.png
diff --git a/graphics/pokemon/registeel/normal.pal b/graphics/pokemon/gen_3/registeel/normal.pal
similarity index 100%
rename from graphics/pokemon/registeel/normal.pal
rename to graphics/pokemon/gen_3/registeel/normal.pal
diff --git a/graphics/pokemon/registeel/shiny.pal b/graphics/pokemon/gen_3/registeel/shiny.pal
similarity index 100%
rename from graphics/pokemon/registeel/shiny.pal
rename to graphics/pokemon/gen_3/registeel/shiny.pal
diff --git a/graphics/pokemon/relicanth/anim_front.png b/graphics/pokemon/gen_3/relicanth/anim_front.png
similarity index 100%
rename from graphics/pokemon/relicanth/anim_front.png
rename to graphics/pokemon/gen_3/relicanth/anim_front.png
diff --git a/graphics/pokemon/relicanth/anim_frontf.png b/graphics/pokemon/gen_3/relicanth/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/relicanth/anim_frontf.png
rename to graphics/pokemon/gen_3/relicanth/anim_frontf.png
diff --git a/graphics/pokemon/relicanth/back.png b/graphics/pokemon/gen_3/relicanth/back.png
similarity index 100%
rename from graphics/pokemon/relicanth/back.png
rename to graphics/pokemon/gen_3/relicanth/back.png
diff --git a/graphics/pokemon/relicanth/backf.png b/graphics/pokemon/gen_3/relicanth/backf.png
similarity index 100%
rename from graphics/pokemon/relicanth/backf.png
rename to graphics/pokemon/gen_3/relicanth/backf.png
diff --git a/graphics/pokemon/forretress/footprint.png b/graphics/pokemon/gen_3/relicanth/footprint.png
similarity index 100%
rename from graphics/pokemon/forretress/footprint.png
rename to graphics/pokemon/gen_3/relicanth/footprint.png
diff --git a/graphics/pokemon/relicanth/icon.png b/graphics/pokemon/gen_3/relicanth/icon.png
similarity index 100%
rename from graphics/pokemon/relicanth/icon.png
rename to graphics/pokemon/gen_3/relicanth/icon.png
diff --git a/graphics/pokemon/relicanth/normal.pal b/graphics/pokemon/gen_3/relicanth/normal.pal
similarity index 100%
rename from graphics/pokemon/relicanth/normal.pal
rename to graphics/pokemon/gen_3/relicanth/normal.pal
diff --git a/graphics/pokemon/relicanth/shiny.pal b/graphics/pokemon/gen_3/relicanth/shiny.pal
similarity index 100%
rename from graphics/pokemon/relicanth/shiny.pal
rename to graphics/pokemon/gen_3/relicanth/shiny.pal
diff --git a/graphics/pokemon/roselia/anim_front.png b/graphics/pokemon/gen_3/roselia/anim_front.png
similarity index 100%
rename from graphics/pokemon/roselia/anim_front.png
rename to graphics/pokemon/gen_3/roselia/anim_front.png
diff --git a/graphics/pokemon/roselia/anim_frontf.png b/graphics/pokemon/gen_3/roselia/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/roselia/anim_frontf.png
rename to graphics/pokemon/gen_3/roselia/anim_frontf.png
diff --git a/graphics/pokemon/roselia/back.png b/graphics/pokemon/gen_3/roselia/back.png
similarity index 100%
rename from graphics/pokemon/roselia/back.png
rename to graphics/pokemon/gen_3/roselia/back.png
diff --git a/graphics/pokemon/roselia/backf.png b/graphics/pokemon/gen_3/roselia/backf.png
similarity index 100%
rename from graphics/pokemon/roselia/backf.png
rename to graphics/pokemon/gen_3/roselia/backf.png
diff --git a/graphics/pokemon/roselia/footprint.png b/graphics/pokemon/gen_3/roselia/footprint.png
similarity index 100%
rename from graphics/pokemon/roselia/footprint.png
rename to graphics/pokemon/gen_3/roselia/footprint.png
diff --git a/graphics/pokemon/roselia/icon.png b/graphics/pokemon/gen_3/roselia/icon.png
similarity index 100%
rename from graphics/pokemon/roselia/icon.png
rename to graphics/pokemon/gen_3/roselia/icon.png
diff --git a/graphics/pokemon/roselia/normal.pal b/graphics/pokemon/gen_3/roselia/normal.pal
similarity index 100%
rename from graphics/pokemon/roselia/normal.pal
rename to graphics/pokemon/gen_3/roselia/normal.pal
diff --git a/graphics/pokemon/roselia/shiny.pal b/graphics/pokemon/gen_3/roselia/shiny.pal
similarity index 100%
rename from graphics/pokemon/roselia/shiny.pal
rename to graphics/pokemon/gen_3/roselia/shiny.pal
diff --git a/graphics/pokemon/sableye/anim_front.png b/graphics/pokemon/gen_3/sableye/anim_front.png
similarity index 100%
rename from graphics/pokemon/sableye/anim_front.png
rename to graphics/pokemon/gen_3/sableye/anim_front.png
diff --git a/graphics/pokemon/sableye/back.png b/graphics/pokemon/gen_3/sableye/back.png
similarity index 100%
rename from graphics/pokemon/sableye/back.png
rename to graphics/pokemon/gen_3/sableye/back.png
diff --git a/graphics/pokemon/sableye/footprint.png b/graphics/pokemon/gen_3/sableye/footprint.png
similarity index 100%
rename from graphics/pokemon/sableye/footprint.png
rename to graphics/pokemon/gen_3/sableye/footprint.png
diff --git a/graphics/pokemon/sableye/icon.png b/graphics/pokemon/gen_3/sableye/icon.png
similarity index 100%
rename from graphics/pokemon/sableye/icon.png
rename to graphics/pokemon/gen_3/sableye/icon.png
diff --git a/graphics/pokemon/sableye/mega/back.png b/graphics/pokemon/gen_3/sableye/mega/back.png
similarity index 100%
rename from graphics/pokemon/sableye/mega/back.png
rename to graphics/pokemon/gen_3/sableye/mega/back.png
diff --git a/graphics/pokemon/sableye/mega/front.png b/graphics/pokemon/gen_3/sableye/mega/front.png
similarity index 100%
rename from graphics/pokemon/sableye/mega/front.png
rename to graphics/pokemon/gen_3/sableye/mega/front.png
diff --git a/graphics/pokemon/sableye/mega/icon.png b/graphics/pokemon/gen_3/sableye/mega/icon.png
similarity index 100%
rename from graphics/pokemon/sableye/mega/icon.png
rename to graphics/pokemon/gen_3/sableye/mega/icon.png
diff --git a/graphics/pokemon/sableye/mega/normal.pal b/graphics/pokemon/gen_3/sableye/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/sableye/mega/normal.pal
rename to graphics/pokemon/gen_3/sableye/mega/normal.pal
diff --git a/graphics/pokemon/sableye/mega/shiny.pal b/graphics/pokemon/gen_3/sableye/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/sableye/mega/shiny.pal
rename to graphics/pokemon/gen_3/sableye/mega/shiny.pal
diff --git a/graphics/pokemon/sableye/normal.pal b/graphics/pokemon/gen_3/sableye/normal.pal
similarity index 100%
rename from graphics/pokemon/sableye/normal.pal
rename to graphics/pokemon/gen_3/sableye/normal.pal
diff --git a/graphics/pokemon/sableye/shiny.pal b/graphics/pokemon/gen_3/sableye/shiny.pal
similarity index 100%
rename from graphics/pokemon/sableye/shiny.pal
rename to graphics/pokemon/gen_3/sableye/shiny.pal
diff --git a/graphics/pokemon/salamence/anim_front.png b/graphics/pokemon/gen_3/salamence/anim_front.png
similarity index 100%
rename from graphics/pokemon/salamence/anim_front.png
rename to graphics/pokemon/gen_3/salamence/anim_front.png
diff --git a/graphics/pokemon/salamence/back.png b/graphics/pokemon/gen_3/salamence/back.png
similarity index 100%
rename from graphics/pokemon/salamence/back.png
rename to graphics/pokemon/gen_3/salamence/back.png
diff --git a/graphics/pokemon/salamence/footprint.png b/graphics/pokemon/gen_3/salamence/footprint.png
similarity index 100%
rename from graphics/pokemon/salamence/footprint.png
rename to graphics/pokemon/gen_3/salamence/footprint.png
diff --git a/graphics/pokemon/salamence/icon.png b/graphics/pokemon/gen_3/salamence/icon.png
similarity index 100%
rename from graphics/pokemon/salamence/icon.png
rename to graphics/pokemon/gen_3/salamence/icon.png
diff --git a/graphics/pokemon/salamence/mega/back.png b/graphics/pokemon/gen_3/salamence/mega/back.png
similarity index 100%
rename from graphics/pokemon/salamence/mega/back.png
rename to graphics/pokemon/gen_3/salamence/mega/back.png
diff --git a/graphics/pokemon/salamence/mega/front.png b/graphics/pokemon/gen_3/salamence/mega/front.png
similarity index 100%
rename from graphics/pokemon/salamence/mega/front.png
rename to graphics/pokemon/gen_3/salamence/mega/front.png
diff --git a/graphics/pokemon/salamence/mega/icon.png b/graphics/pokemon/gen_3/salamence/mega/icon.png
similarity index 100%
rename from graphics/pokemon/salamence/mega/icon.png
rename to graphics/pokemon/gen_3/salamence/mega/icon.png
diff --git a/graphics/pokemon/salamence/mega/normal.pal b/graphics/pokemon/gen_3/salamence/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/salamence/mega/normal.pal
rename to graphics/pokemon/gen_3/salamence/mega/normal.pal
diff --git a/graphics/pokemon/salamence/mega/shiny.pal b/graphics/pokemon/gen_3/salamence/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/salamence/mega/shiny.pal
rename to graphics/pokemon/gen_3/salamence/mega/shiny.pal
diff --git a/graphics/pokemon/salamence/normal.pal b/graphics/pokemon/gen_3/salamence/normal.pal
similarity index 100%
rename from graphics/pokemon/salamence/normal.pal
rename to graphics/pokemon/gen_3/salamence/normal.pal
diff --git a/graphics/pokemon/salamence/shiny.pal b/graphics/pokemon/gen_3/salamence/shiny.pal
similarity index 100%
rename from graphics/pokemon/salamence/shiny.pal
rename to graphics/pokemon/gen_3/salamence/shiny.pal
diff --git a/graphics/pokemon/sceptile/anim_front.png b/graphics/pokemon/gen_3/sceptile/anim_front.png
similarity index 100%
rename from graphics/pokemon/sceptile/anim_front.png
rename to graphics/pokemon/gen_3/sceptile/anim_front.png
diff --git a/graphics/pokemon/sceptile/back.png b/graphics/pokemon/gen_3/sceptile/back.png
similarity index 100%
rename from graphics/pokemon/sceptile/back.png
rename to graphics/pokemon/gen_3/sceptile/back.png
diff --git a/graphics/pokemon/sceptile/footprint.png b/graphics/pokemon/gen_3/sceptile/footprint.png
similarity index 100%
rename from graphics/pokemon/sceptile/footprint.png
rename to graphics/pokemon/gen_3/sceptile/footprint.png
diff --git a/graphics/pokemon/sceptile/icon.png b/graphics/pokemon/gen_3/sceptile/icon.png
similarity index 100%
rename from graphics/pokemon/sceptile/icon.png
rename to graphics/pokemon/gen_3/sceptile/icon.png
diff --git a/graphics/pokemon/sceptile/mega/back.png b/graphics/pokemon/gen_3/sceptile/mega/back.png
similarity index 100%
rename from graphics/pokemon/sceptile/mega/back.png
rename to graphics/pokemon/gen_3/sceptile/mega/back.png
diff --git a/graphics/pokemon/sceptile/mega/front.png b/graphics/pokemon/gen_3/sceptile/mega/front.png
similarity index 100%
rename from graphics/pokemon/sceptile/mega/front.png
rename to graphics/pokemon/gen_3/sceptile/mega/front.png
diff --git a/graphics/pokemon/sceptile/mega/icon.png b/graphics/pokemon/gen_3/sceptile/mega/icon.png
similarity index 100%
rename from graphics/pokemon/sceptile/mega/icon.png
rename to graphics/pokemon/gen_3/sceptile/mega/icon.png
diff --git a/graphics/pokemon/sceptile/mega/normal.pal b/graphics/pokemon/gen_3/sceptile/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/sceptile/mega/normal.pal
rename to graphics/pokemon/gen_3/sceptile/mega/normal.pal
diff --git a/graphics/pokemon/sceptile/mega/shiny.pal b/graphics/pokemon/gen_3/sceptile/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/sceptile/mega/shiny.pal
rename to graphics/pokemon/gen_3/sceptile/mega/shiny.pal
diff --git a/graphics/pokemon/sceptile/normal.pal b/graphics/pokemon/gen_3/sceptile/normal.pal
similarity index 100%
rename from graphics/pokemon/sceptile/normal.pal
rename to graphics/pokemon/gen_3/sceptile/normal.pal
diff --git a/graphics/pokemon/sceptile/shiny.pal b/graphics/pokemon/gen_3/sceptile/shiny.pal
similarity index 100%
rename from graphics/pokemon/sceptile/shiny.pal
rename to graphics/pokemon/gen_3/sceptile/shiny.pal
diff --git a/graphics/pokemon/sealeo/anim_front.png b/graphics/pokemon/gen_3/sealeo/anim_front.png
similarity index 100%
rename from graphics/pokemon/sealeo/anim_front.png
rename to graphics/pokemon/gen_3/sealeo/anim_front.png
diff --git a/graphics/pokemon/sealeo/back.png b/graphics/pokemon/gen_3/sealeo/back.png
similarity index 100%
rename from graphics/pokemon/sealeo/back.png
rename to graphics/pokemon/gen_3/sealeo/back.png
diff --git a/graphics/pokemon/frillish/footprint.png b/graphics/pokemon/gen_3/sealeo/footprint.png
similarity index 100%
rename from graphics/pokemon/frillish/footprint.png
rename to graphics/pokemon/gen_3/sealeo/footprint.png
diff --git a/graphics/pokemon/sealeo/icon.png b/graphics/pokemon/gen_3/sealeo/icon.png
similarity index 100%
rename from graphics/pokemon/sealeo/icon.png
rename to graphics/pokemon/gen_3/sealeo/icon.png
diff --git a/graphics/pokemon/sealeo/normal.pal b/graphics/pokemon/gen_3/sealeo/normal.pal
similarity index 100%
rename from graphics/pokemon/sealeo/normal.pal
rename to graphics/pokemon/gen_3/sealeo/normal.pal
diff --git a/graphics/pokemon/sealeo/shiny.pal b/graphics/pokemon/gen_3/sealeo/shiny.pal
similarity index 100%
rename from graphics/pokemon/sealeo/shiny.pal
rename to graphics/pokemon/gen_3/sealeo/shiny.pal
diff --git a/graphics/pokemon/seedot/anim_front.png b/graphics/pokemon/gen_3/seedot/anim_front.png
similarity index 100%
rename from graphics/pokemon/seedot/anim_front.png
rename to graphics/pokemon/gen_3/seedot/anim_front.png
diff --git a/graphics/pokemon/seedot/back.png b/graphics/pokemon/gen_3/seedot/back.png
similarity index 100%
rename from graphics/pokemon/seedot/back.png
rename to graphics/pokemon/gen_3/seedot/back.png
diff --git a/graphics/pokemon/seedot/footprint.png b/graphics/pokemon/gen_3/seedot/footprint.png
similarity index 100%
rename from graphics/pokemon/seedot/footprint.png
rename to graphics/pokemon/gen_3/seedot/footprint.png
diff --git a/graphics/pokemon/seedot/icon.png b/graphics/pokemon/gen_3/seedot/icon.png
similarity index 100%
rename from graphics/pokemon/seedot/icon.png
rename to graphics/pokemon/gen_3/seedot/icon.png
diff --git a/graphics/pokemon/seedot/normal.pal b/graphics/pokemon/gen_3/seedot/normal.pal
similarity index 100%
rename from graphics/pokemon/seedot/normal.pal
rename to graphics/pokemon/gen_3/seedot/normal.pal
diff --git a/graphics/pokemon/seedot/shiny.pal b/graphics/pokemon/gen_3/seedot/shiny.pal
similarity index 100%
rename from graphics/pokemon/seedot/shiny.pal
rename to graphics/pokemon/gen_3/seedot/shiny.pal
diff --git a/graphics/pokemon/seviper/anim_front.png b/graphics/pokemon/gen_3/seviper/anim_front.png
similarity index 100%
rename from graphics/pokemon/seviper/anim_front.png
rename to graphics/pokemon/gen_3/seviper/anim_front.png
diff --git a/graphics/pokemon/seviper/back.png b/graphics/pokemon/gen_3/seviper/back.png
similarity index 100%
rename from graphics/pokemon/seviper/back.png
rename to graphics/pokemon/gen_3/seviper/back.png
diff --git a/graphics/pokemon/froslass/footprint.png b/graphics/pokemon/gen_3/seviper/footprint.png
similarity index 100%
rename from graphics/pokemon/froslass/footprint.png
rename to graphics/pokemon/gen_3/seviper/footprint.png
diff --git a/graphics/pokemon/seviper/icon.png b/graphics/pokemon/gen_3/seviper/icon.png
similarity index 100%
rename from graphics/pokemon/seviper/icon.png
rename to graphics/pokemon/gen_3/seviper/icon.png
diff --git a/graphics/pokemon/seviper/normal.pal b/graphics/pokemon/gen_3/seviper/normal.pal
similarity index 100%
rename from graphics/pokemon/seviper/normal.pal
rename to graphics/pokemon/gen_3/seviper/normal.pal
diff --git a/graphics/pokemon/seviper/shiny.pal b/graphics/pokemon/gen_3/seviper/shiny.pal
similarity index 100%
rename from graphics/pokemon/seviper/shiny.pal
rename to graphics/pokemon/gen_3/seviper/shiny.pal
diff --git a/graphics/pokemon/sharpedo/anim_front.png b/graphics/pokemon/gen_3/sharpedo/anim_front.png
similarity index 100%
rename from graphics/pokemon/sharpedo/anim_front.png
rename to graphics/pokemon/gen_3/sharpedo/anim_front.png
diff --git a/graphics/pokemon/sharpedo/back.png b/graphics/pokemon/gen_3/sharpedo/back.png
similarity index 100%
rename from graphics/pokemon/sharpedo/back.png
rename to graphics/pokemon/gen_3/sharpedo/back.png
diff --git a/graphics/pokemon/frosmoth/footprint.png b/graphics/pokemon/gen_3/sharpedo/footprint.png
similarity index 100%
rename from graphics/pokemon/frosmoth/footprint.png
rename to graphics/pokemon/gen_3/sharpedo/footprint.png
diff --git a/graphics/pokemon/sharpedo/icon.png b/graphics/pokemon/gen_3/sharpedo/icon.png
similarity index 100%
rename from graphics/pokemon/sharpedo/icon.png
rename to graphics/pokemon/gen_3/sharpedo/icon.png
diff --git a/graphics/pokemon/sharpedo/mega/back.png b/graphics/pokemon/gen_3/sharpedo/mega/back.png
similarity index 100%
rename from graphics/pokemon/sharpedo/mega/back.png
rename to graphics/pokemon/gen_3/sharpedo/mega/back.png
diff --git a/graphics/pokemon/sharpedo/mega/front.png b/graphics/pokemon/gen_3/sharpedo/mega/front.png
similarity index 100%
rename from graphics/pokemon/sharpedo/mega/front.png
rename to graphics/pokemon/gen_3/sharpedo/mega/front.png
diff --git a/graphics/pokemon/sharpedo/mega/icon.png b/graphics/pokemon/gen_3/sharpedo/mega/icon.png
similarity index 100%
rename from graphics/pokemon/sharpedo/mega/icon.png
rename to graphics/pokemon/gen_3/sharpedo/mega/icon.png
diff --git a/graphics/pokemon/sharpedo/mega/normal.pal b/graphics/pokemon/gen_3/sharpedo/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/sharpedo/mega/normal.pal
rename to graphics/pokemon/gen_3/sharpedo/mega/normal.pal
diff --git a/graphics/pokemon/sharpedo/mega/shiny.pal b/graphics/pokemon/gen_3/sharpedo/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/sharpedo/mega/shiny.pal
rename to graphics/pokemon/gen_3/sharpedo/mega/shiny.pal
diff --git a/graphics/pokemon/sharpedo/normal.pal b/graphics/pokemon/gen_3/sharpedo/normal.pal
similarity index 100%
rename from graphics/pokemon/sharpedo/normal.pal
rename to graphics/pokemon/gen_3/sharpedo/normal.pal
diff --git a/graphics/pokemon/sharpedo/shiny.pal b/graphics/pokemon/gen_3/sharpedo/shiny.pal
similarity index 100%
rename from graphics/pokemon/sharpedo/shiny.pal
rename to graphics/pokemon/gen_3/sharpedo/shiny.pal
diff --git a/graphics/pokemon/shedinja/anim_front.png b/graphics/pokemon/gen_3/shedinja/anim_front.png
similarity index 100%
rename from graphics/pokemon/shedinja/anim_front.png
rename to graphics/pokemon/gen_3/shedinja/anim_front.png
diff --git a/graphics/pokemon/shedinja/back.png b/graphics/pokemon/gen_3/shedinja/back.png
similarity index 100%
rename from graphics/pokemon/shedinja/back.png
rename to graphics/pokemon/gen_3/shedinja/back.png
diff --git a/graphics/pokemon/shedinja/footprint.png b/graphics/pokemon/gen_3/shedinja/footprint.png
similarity index 100%
rename from graphics/pokemon/shedinja/footprint.png
rename to graphics/pokemon/gen_3/shedinja/footprint.png
diff --git a/graphics/pokemon/shedinja/icon.png b/graphics/pokemon/gen_3/shedinja/icon.png
similarity index 100%
rename from graphics/pokemon/shedinja/icon.png
rename to graphics/pokemon/gen_3/shedinja/icon.png
diff --git a/graphics/pokemon/shedinja/normal.pal b/graphics/pokemon/gen_3/shedinja/normal.pal
similarity index 100%
rename from graphics/pokemon/shedinja/normal.pal
rename to graphics/pokemon/gen_3/shedinja/normal.pal
diff --git a/graphics/pokemon/shedinja/shiny.pal b/graphics/pokemon/gen_3/shedinja/shiny.pal
similarity index 100%
rename from graphics/pokemon/shedinja/shiny.pal
rename to graphics/pokemon/gen_3/shedinja/shiny.pal
diff --git a/graphics/pokemon/shelgon/anim_front.png b/graphics/pokemon/gen_3/shelgon/anim_front.png
similarity index 100%
rename from graphics/pokemon/shelgon/anim_front.png
rename to graphics/pokemon/gen_3/shelgon/anim_front.png
diff --git a/graphics/pokemon/shelgon/back.png b/graphics/pokemon/gen_3/shelgon/back.png
similarity index 100%
rename from graphics/pokemon/shelgon/back.png
rename to graphics/pokemon/gen_3/shelgon/back.png
diff --git a/graphics/pokemon/shelgon/footprint.png b/graphics/pokemon/gen_3/shelgon/footprint.png
similarity index 100%
rename from graphics/pokemon/shelgon/footprint.png
rename to graphics/pokemon/gen_3/shelgon/footprint.png
diff --git a/graphics/pokemon/shelgon/icon.png b/graphics/pokemon/gen_3/shelgon/icon.png
similarity index 100%
rename from graphics/pokemon/shelgon/icon.png
rename to graphics/pokemon/gen_3/shelgon/icon.png
diff --git a/graphics/pokemon/shelgon/normal.pal b/graphics/pokemon/gen_3/shelgon/normal.pal
similarity index 100%
rename from graphics/pokemon/shelgon/normal.pal
rename to graphics/pokemon/gen_3/shelgon/normal.pal
diff --git a/graphics/pokemon/shelgon/shiny.pal b/graphics/pokemon/gen_3/shelgon/shiny.pal
similarity index 100%
rename from graphics/pokemon/shelgon/shiny.pal
rename to graphics/pokemon/gen_3/shelgon/shiny.pal
diff --git a/graphics/pokemon/shiftry/anim_front.png b/graphics/pokemon/gen_3/shiftry/anim_front.png
similarity index 100%
rename from graphics/pokemon/shiftry/anim_front.png
rename to graphics/pokemon/gen_3/shiftry/anim_front.png
diff --git a/graphics/pokemon/shiftry/anim_frontf.png b/graphics/pokemon/gen_3/shiftry/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/shiftry/anim_frontf.png
rename to graphics/pokemon/gen_3/shiftry/anim_frontf.png
diff --git a/graphics/pokemon/shiftry/back.png b/graphics/pokemon/gen_3/shiftry/back.png
similarity index 100%
rename from graphics/pokemon/shiftry/back.png
rename to graphics/pokemon/gen_3/shiftry/back.png
diff --git a/graphics/pokemon/shiftry/backf.png b/graphics/pokemon/gen_3/shiftry/backf.png
similarity index 100%
rename from graphics/pokemon/shiftry/backf.png
rename to graphics/pokemon/gen_3/shiftry/backf.png
diff --git a/graphics/pokemon/shiftry/footprint.png b/graphics/pokemon/gen_3/shiftry/footprint.png
similarity index 100%
rename from graphics/pokemon/shiftry/footprint.png
rename to graphics/pokemon/gen_3/shiftry/footprint.png
diff --git a/graphics/pokemon/shiftry/icon.png b/graphics/pokemon/gen_3/shiftry/icon.png
similarity index 100%
rename from graphics/pokemon/shiftry/icon.png
rename to graphics/pokemon/gen_3/shiftry/icon.png
diff --git a/graphics/pokemon/shiftry/normal.pal b/graphics/pokemon/gen_3/shiftry/normal.pal
similarity index 100%
rename from graphics/pokemon/shiftry/normal.pal
rename to graphics/pokemon/gen_3/shiftry/normal.pal
diff --git a/graphics/pokemon/shiftry/shiny.pal b/graphics/pokemon/gen_3/shiftry/shiny.pal
similarity index 100%
rename from graphics/pokemon/shiftry/shiny.pal
rename to graphics/pokemon/gen_3/shiftry/shiny.pal
diff --git a/graphics/pokemon/shroomish/anim_front.png b/graphics/pokemon/gen_3/shroomish/anim_front.png
similarity index 100%
rename from graphics/pokemon/shroomish/anim_front.png
rename to graphics/pokemon/gen_3/shroomish/anim_front.png
diff --git a/graphics/pokemon/shroomish/back.png b/graphics/pokemon/gen_3/shroomish/back.png
similarity index 100%
rename from graphics/pokemon/shroomish/back.png
rename to graphics/pokemon/gen_3/shroomish/back.png
diff --git a/graphics/pokemon/shroomish/footprint.png b/graphics/pokemon/gen_3/shroomish/footprint.png
similarity index 100%
rename from graphics/pokemon/shroomish/footprint.png
rename to graphics/pokemon/gen_3/shroomish/footprint.png
diff --git a/graphics/pokemon/shroomish/icon.png b/graphics/pokemon/gen_3/shroomish/icon.png
similarity index 100%
rename from graphics/pokemon/shroomish/icon.png
rename to graphics/pokemon/gen_3/shroomish/icon.png
diff --git a/graphics/pokemon/shroomish/normal.pal b/graphics/pokemon/gen_3/shroomish/normal.pal
similarity index 100%
rename from graphics/pokemon/shroomish/normal.pal
rename to graphics/pokemon/gen_3/shroomish/normal.pal
diff --git a/graphics/pokemon/shroomish/shiny.pal b/graphics/pokemon/gen_3/shroomish/shiny.pal
similarity index 100%
rename from graphics/pokemon/shroomish/shiny.pal
rename to graphics/pokemon/gen_3/shroomish/shiny.pal
diff --git a/graphics/pokemon/shuppet/anim_front.png b/graphics/pokemon/gen_3/shuppet/anim_front.png
similarity index 100%
rename from graphics/pokemon/shuppet/anim_front.png
rename to graphics/pokemon/gen_3/shuppet/anim_front.png
diff --git a/graphics/pokemon/shuppet/back.png b/graphics/pokemon/gen_3/shuppet/back.png
similarity index 100%
rename from graphics/pokemon/shuppet/back.png
rename to graphics/pokemon/gen_3/shuppet/back.png
diff --git a/graphics/pokemon/gastly/footprint.png b/graphics/pokemon/gen_3/shuppet/footprint.png
similarity index 100%
rename from graphics/pokemon/gastly/footprint.png
rename to graphics/pokemon/gen_3/shuppet/footprint.png
diff --git a/graphics/pokemon/shuppet/icon.png b/graphics/pokemon/gen_3/shuppet/icon.png
similarity index 100%
rename from graphics/pokemon/shuppet/icon.png
rename to graphics/pokemon/gen_3/shuppet/icon.png
diff --git a/graphics/pokemon/shuppet/normal.pal b/graphics/pokemon/gen_3/shuppet/normal.pal
similarity index 100%
rename from graphics/pokemon/shuppet/normal.pal
rename to graphics/pokemon/gen_3/shuppet/normal.pal
diff --git a/graphics/pokemon/shuppet/shiny.pal b/graphics/pokemon/gen_3/shuppet/shiny.pal
similarity index 100%
rename from graphics/pokemon/shuppet/shiny.pal
rename to graphics/pokemon/gen_3/shuppet/shiny.pal
diff --git a/graphics/pokemon/silcoon/anim_front.png b/graphics/pokemon/gen_3/silcoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/silcoon/anim_front.png
rename to graphics/pokemon/gen_3/silcoon/anim_front.png
diff --git a/graphics/pokemon/silcoon/back.png b/graphics/pokemon/gen_3/silcoon/back.png
similarity index 100%
rename from graphics/pokemon/silcoon/back.png
rename to graphics/pokemon/gen_3/silcoon/back.png
diff --git a/graphics/pokemon/geodude/footprint.png b/graphics/pokemon/gen_3/silcoon/footprint.png
similarity index 100%
rename from graphics/pokemon/geodude/footprint.png
rename to graphics/pokemon/gen_3/silcoon/footprint.png
diff --git a/graphics/pokemon/silcoon/icon.png b/graphics/pokemon/gen_3/silcoon/icon.png
similarity index 100%
rename from graphics/pokemon/silcoon/icon.png
rename to graphics/pokemon/gen_3/silcoon/icon.png
diff --git a/graphics/pokemon/silcoon/normal.pal b/graphics/pokemon/gen_3/silcoon/normal.pal
similarity index 100%
rename from graphics/pokemon/silcoon/normal.pal
rename to graphics/pokemon/gen_3/silcoon/normal.pal
diff --git a/graphics/pokemon/silcoon/shiny.pal b/graphics/pokemon/gen_3/silcoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/silcoon/shiny.pal
rename to graphics/pokemon/gen_3/silcoon/shiny.pal
diff --git a/graphics/pokemon/skitty/anim_front.png b/graphics/pokemon/gen_3/skitty/anim_front.png
similarity index 100%
rename from graphics/pokemon/skitty/anim_front.png
rename to graphics/pokemon/gen_3/skitty/anim_front.png
diff --git a/graphics/pokemon/skitty/back.png b/graphics/pokemon/gen_3/skitty/back.png
similarity index 100%
rename from graphics/pokemon/skitty/back.png
rename to graphics/pokemon/gen_3/skitty/back.png
diff --git a/graphics/pokemon/skitty/footprint.png b/graphics/pokemon/gen_3/skitty/footprint.png
similarity index 100%
rename from graphics/pokemon/skitty/footprint.png
rename to graphics/pokemon/gen_3/skitty/footprint.png
diff --git a/graphics/pokemon/skitty/icon.png b/graphics/pokemon/gen_3/skitty/icon.png
similarity index 100%
rename from graphics/pokemon/skitty/icon.png
rename to graphics/pokemon/gen_3/skitty/icon.png
diff --git a/graphics/pokemon/skitty/normal.pal b/graphics/pokemon/gen_3/skitty/normal.pal
similarity index 100%
rename from graphics/pokemon/skitty/normal.pal
rename to graphics/pokemon/gen_3/skitty/normal.pal
diff --git a/graphics/pokemon/skitty/shiny.pal b/graphics/pokemon/gen_3/skitty/shiny.pal
similarity index 100%
rename from graphics/pokemon/skitty/shiny.pal
rename to graphics/pokemon/gen_3/skitty/shiny.pal
diff --git a/graphics/pokemon/slaking/anim_front.png b/graphics/pokemon/gen_3/slaking/anim_front.png
similarity index 100%
rename from graphics/pokemon/slaking/anim_front.png
rename to graphics/pokemon/gen_3/slaking/anim_front.png
diff --git a/graphics/pokemon/slaking/back.png b/graphics/pokemon/gen_3/slaking/back.png
similarity index 100%
rename from graphics/pokemon/slaking/back.png
rename to graphics/pokemon/gen_3/slaking/back.png
diff --git a/graphics/pokemon/slaking/footprint.png b/graphics/pokemon/gen_3/slaking/footprint.png
similarity index 100%
rename from graphics/pokemon/slaking/footprint.png
rename to graphics/pokemon/gen_3/slaking/footprint.png
diff --git a/graphics/pokemon/slaking/icon.png b/graphics/pokemon/gen_3/slaking/icon.png
similarity index 100%
rename from graphics/pokemon/slaking/icon.png
rename to graphics/pokemon/gen_3/slaking/icon.png
diff --git a/graphics/pokemon/slaking/normal.pal b/graphics/pokemon/gen_3/slaking/normal.pal
similarity index 100%
rename from graphics/pokemon/slaking/normal.pal
rename to graphics/pokemon/gen_3/slaking/normal.pal
diff --git a/graphics/pokemon/slaking/shiny.pal b/graphics/pokemon/gen_3/slaking/shiny.pal
similarity index 100%
rename from graphics/pokemon/slaking/shiny.pal
rename to graphics/pokemon/gen_3/slaking/shiny.pal
diff --git a/graphics/pokemon/slakoth/anim_front.png b/graphics/pokemon/gen_3/slakoth/anim_front.png
similarity index 100%
rename from graphics/pokemon/slakoth/anim_front.png
rename to graphics/pokemon/gen_3/slakoth/anim_front.png
diff --git a/graphics/pokemon/slakoth/back.png b/graphics/pokemon/gen_3/slakoth/back.png
similarity index 100%
rename from graphics/pokemon/slakoth/back.png
rename to graphics/pokemon/gen_3/slakoth/back.png
diff --git a/graphics/pokemon/slakoth/footprint.png b/graphics/pokemon/gen_3/slakoth/footprint.png
similarity index 100%
rename from graphics/pokemon/slakoth/footprint.png
rename to graphics/pokemon/gen_3/slakoth/footprint.png
diff --git a/graphics/pokemon/slakoth/icon.png b/graphics/pokemon/gen_3/slakoth/icon.png
similarity index 100%
rename from graphics/pokemon/slakoth/icon.png
rename to graphics/pokemon/gen_3/slakoth/icon.png
diff --git a/graphics/pokemon/slakoth/normal.pal b/graphics/pokemon/gen_3/slakoth/normal.pal
similarity index 100%
rename from graphics/pokemon/slakoth/normal.pal
rename to graphics/pokemon/gen_3/slakoth/normal.pal
diff --git a/graphics/pokemon/slakoth/shiny.pal b/graphics/pokemon/gen_3/slakoth/shiny.pal
similarity index 100%
rename from graphics/pokemon/slakoth/shiny.pal
rename to graphics/pokemon/gen_3/slakoth/shiny.pal
diff --git a/graphics/pokemon/snorunt/anim_front.png b/graphics/pokemon/gen_3/snorunt/anim_front.png
similarity index 100%
rename from graphics/pokemon/snorunt/anim_front.png
rename to graphics/pokemon/gen_3/snorunt/anim_front.png
diff --git a/graphics/pokemon/snorunt/back.png b/graphics/pokemon/gen_3/snorunt/back.png
similarity index 100%
rename from graphics/pokemon/snorunt/back.png
rename to graphics/pokemon/gen_3/snorunt/back.png
diff --git a/graphics/pokemon/snorunt/footprint.png b/graphics/pokemon/gen_3/snorunt/footprint.png
similarity index 100%
rename from graphics/pokemon/snorunt/footprint.png
rename to graphics/pokemon/gen_3/snorunt/footprint.png
diff --git a/graphics/pokemon/snorunt/icon.png b/graphics/pokemon/gen_3/snorunt/icon.png
similarity index 100%
rename from graphics/pokemon/snorunt/icon.png
rename to graphics/pokemon/gen_3/snorunt/icon.png
diff --git a/graphics/pokemon/snorunt/normal.pal b/graphics/pokemon/gen_3/snorunt/normal.pal
similarity index 100%
rename from graphics/pokemon/snorunt/normal.pal
rename to graphics/pokemon/gen_3/snorunt/normal.pal
diff --git a/graphics/pokemon/snorunt/shiny.pal b/graphics/pokemon/gen_3/snorunt/shiny.pal
similarity index 100%
rename from graphics/pokemon/snorunt/shiny.pal
rename to graphics/pokemon/gen_3/snorunt/shiny.pal
diff --git a/graphics/pokemon/solrock/anim_front.png b/graphics/pokemon/gen_3/solrock/anim_front.png
similarity index 100%
rename from graphics/pokemon/solrock/anim_front.png
rename to graphics/pokemon/gen_3/solrock/anim_front.png
diff --git a/graphics/pokemon/solrock/back.png b/graphics/pokemon/gen_3/solrock/back.png
similarity index 100%
rename from graphics/pokemon/solrock/back.png
rename to graphics/pokemon/gen_3/solrock/back.png
diff --git a/graphics/pokemon/glalie/footprint.png b/graphics/pokemon/gen_3/solrock/footprint.png
similarity index 100%
rename from graphics/pokemon/glalie/footprint.png
rename to graphics/pokemon/gen_3/solrock/footprint.png
diff --git a/graphics/pokemon/solrock/icon.png b/graphics/pokemon/gen_3/solrock/icon.png
similarity index 100%
rename from graphics/pokemon/solrock/icon.png
rename to graphics/pokemon/gen_3/solrock/icon.png
diff --git a/graphics/pokemon/solrock/normal.pal b/graphics/pokemon/gen_3/solrock/normal.pal
similarity index 100%
rename from graphics/pokemon/solrock/normal.pal
rename to graphics/pokemon/gen_3/solrock/normal.pal
diff --git a/graphics/pokemon/solrock/shiny.pal b/graphics/pokemon/gen_3/solrock/shiny.pal
similarity index 100%
rename from graphics/pokemon/solrock/shiny.pal
rename to graphics/pokemon/gen_3/solrock/shiny.pal
diff --git a/graphics/pokemon/spheal/anim_front.png b/graphics/pokemon/gen_3/spheal/anim_front.png
similarity index 100%
rename from graphics/pokemon/spheal/anim_front.png
rename to graphics/pokemon/gen_3/spheal/anim_front.png
diff --git a/graphics/pokemon/spheal/back.png b/graphics/pokemon/gen_3/spheal/back.png
similarity index 100%
rename from graphics/pokemon/spheal/back.png
rename to graphics/pokemon/gen_3/spheal/back.png
diff --git a/graphics/pokemon/goldeen/footprint.png b/graphics/pokemon/gen_3/spheal/footprint.png
similarity index 100%
rename from graphics/pokemon/goldeen/footprint.png
rename to graphics/pokemon/gen_3/spheal/footprint.png
diff --git a/graphics/pokemon/spheal/icon.png b/graphics/pokemon/gen_3/spheal/icon.png
similarity index 100%
rename from graphics/pokemon/spheal/icon.png
rename to graphics/pokemon/gen_3/spheal/icon.png
diff --git a/graphics/pokemon/spheal/normal.pal b/graphics/pokemon/gen_3/spheal/normal.pal
similarity index 100%
rename from graphics/pokemon/spheal/normal.pal
rename to graphics/pokemon/gen_3/spheal/normal.pal
diff --git a/graphics/pokemon/spheal/shiny.pal b/graphics/pokemon/gen_3/spheal/shiny.pal
similarity index 100%
rename from graphics/pokemon/spheal/shiny.pal
rename to graphics/pokemon/gen_3/spheal/shiny.pal
diff --git a/graphics/pokemon/spinda/anim_front.png b/graphics/pokemon/gen_3/spinda/anim_front.png
similarity index 100%
rename from graphics/pokemon/spinda/anim_front.png
rename to graphics/pokemon/gen_3/spinda/anim_front.png
diff --git a/graphics/pokemon/spinda/back.png b/graphics/pokemon/gen_3/spinda/back.png
similarity index 100%
rename from graphics/pokemon/spinda/back.png
rename to graphics/pokemon/gen_3/spinda/back.png
diff --git a/graphics/pokemon/spinda/footprint.png b/graphics/pokemon/gen_3/spinda/footprint.png
similarity index 100%
rename from graphics/pokemon/spinda/footprint.png
rename to graphics/pokemon/gen_3/spinda/footprint.png
diff --git a/graphics/pokemon/spinda/icon.png b/graphics/pokemon/gen_3/spinda/icon.png
similarity index 100%
rename from graphics/pokemon/spinda/icon.png
rename to graphics/pokemon/gen_3/spinda/icon.png
diff --git a/graphics/pokemon/spinda/normal.pal b/graphics/pokemon/gen_3/spinda/normal.pal
similarity index 100%
rename from graphics/pokemon/spinda/normal.pal
rename to graphics/pokemon/gen_3/spinda/normal.pal
diff --git a/graphics/pokemon/spinda/shiny.pal b/graphics/pokemon/gen_3/spinda/shiny.pal
similarity index 100%
rename from graphics/pokemon/spinda/shiny.pal
rename to graphics/pokemon/gen_3/spinda/shiny.pal
diff --git a/graphics/pokemon/spinda/spots/spot_0.png b/graphics/pokemon/gen_3/spinda/spots/spot_0.png
similarity index 100%
rename from graphics/pokemon/spinda/spots/spot_0.png
rename to graphics/pokemon/gen_3/spinda/spots/spot_0.png
diff --git a/graphics/pokemon/spinda/spots/spot_1.png b/graphics/pokemon/gen_3/spinda/spots/spot_1.png
similarity index 100%
rename from graphics/pokemon/spinda/spots/spot_1.png
rename to graphics/pokemon/gen_3/spinda/spots/spot_1.png
diff --git a/graphics/pokemon/spinda/spots/spot_2.png b/graphics/pokemon/gen_3/spinda/spots/spot_2.png
similarity index 100%
rename from graphics/pokemon/spinda/spots/spot_2.png
rename to graphics/pokemon/gen_3/spinda/spots/spot_2.png
diff --git a/graphics/pokemon/spinda/spots/spot_3.png b/graphics/pokemon/gen_3/spinda/spots/spot_3.png
similarity index 100%
rename from graphics/pokemon/spinda/spots/spot_3.png
rename to graphics/pokemon/gen_3/spinda/spots/spot_3.png
diff --git a/graphics/pokemon/spoink/anim_front.png b/graphics/pokemon/gen_3/spoink/anim_front.png
similarity index 100%
rename from graphics/pokemon/spoink/anim_front.png
rename to graphics/pokemon/gen_3/spoink/anim_front.png
diff --git a/graphics/pokemon/spoink/back.png b/graphics/pokemon/gen_3/spoink/back.png
similarity index 100%
rename from graphics/pokemon/spoink/back.png
rename to graphics/pokemon/gen_3/spoink/back.png
diff --git a/graphics/pokemon/goomy/footprint.png b/graphics/pokemon/gen_3/spoink/footprint.png
similarity index 100%
rename from graphics/pokemon/goomy/footprint.png
rename to graphics/pokemon/gen_3/spoink/footprint.png
diff --git a/graphics/pokemon/spoink/icon.png b/graphics/pokemon/gen_3/spoink/icon.png
similarity index 100%
rename from graphics/pokemon/spoink/icon.png
rename to graphics/pokemon/gen_3/spoink/icon.png
diff --git a/graphics/pokemon/spoink/normal.pal b/graphics/pokemon/gen_3/spoink/normal.pal
similarity index 100%
rename from graphics/pokemon/spoink/normal.pal
rename to graphics/pokemon/gen_3/spoink/normal.pal
diff --git a/graphics/pokemon/spoink/shiny.pal b/graphics/pokemon/gen_3/spoink/shiny.pal
similarity index 100%
rename from graphics/pokemon/spoink/shiny.pal
rename to graphics/pokemon/gen_3/spoink/shiny.pal
diff --git a/graphics/pokemon/surskit/anim_front.png b/graphics/pokemon/gen_3/surskit/anim_front.png
similarity index 100%
rename from graphics/pokemon/surskit/anim_front.png
rename to graphics/pokemon/gen_3/surskit/anim_front.png
diff --git a/graphics/pokemon/surskit/back.png b/graphics/pokemon/gen_3/surskit/back.png
similarity index 100%
rename from graphics/pokemon/surskit/back.png
rename to graphics/pokemon/gen_3/surskit/back.png
diff --git a/graphics/pokemon/surskit/footprint.png b/graphics/pokemon/gen_3/surskit/footprint.png
similarity index 100%
rename from graphics/pokemon/surskit/footprint.png
rename to graphics/pokemon/gen_3/surskit/footprint.png
diff --git a/graphics/pokemon/surskit/icon.png b/graphics/pokemon/gen_3/surskit/icon.png
similarity index 100%
rename from graphics/pokemon/surskit/icon.png
rename to graphics/pokemon/gen_3/surskit/icon.png
diff --git a/graphics/pokemon/surskit/normal.pal b/graphics/pokemon/gen_3/surskit/normal.pal
similarity index 100%
rename from graphics/pokemon/surskit/normal.pal
rename to graphics/pokemon/gen_3/surskit/normal.pal
diff --git a/graphics/pokemon/surskit/shiny.pal b/graphics/pokemon/gen_3/surskit/shiny.pal
similarity index 100%
rename from graphics/pokemon/surskit/shiny.pal
rename to graphics/pokemon/gen_3/surskit/shiny.pal
diff --git a/graphics/pokemon/swablu/anim_front.png b/graphics/pokemon/gen_3/swablu/anim_front.png
similarity index 100%
rename from graphics/pokemon/swablu/anim_front.png
rename to graphics/pokemon/gen_3/swablu/anim_front.png
diff --git a/graphics/pokemon/swablu/back.png b/graphics/pokemon/gen_3/swablu/back.png
similarity index 100%
rename from graphics/pokemon/swablu/back.png
rename to graphics/pokemon/gen_3/swablu/back.png
diff --git a/graphics/pokemon/swablu/footprint.png b/graphics/pokemon/gen_3/swablu/footprint.png
similarity index 100%
rename from graphics/pokemon/swablu/footprint.png
rename to graphics/pokemon/gen_3/swablu/footprint.png
diff --git a/graphics/pokemon/swablu/icon.png b/graphics/pokemon/gen_3/swablu/icon.png
similarity index 100%
rename from graphics/pokemon/swablu/icon.png
rename to graphics/pokemon/gen_3/swablu/icon.png
diff --git a/graphics/pokemon/swablu/normal.pal b/graphics/pokemon/gen_3/swablu/normal.pal
similarity index 100%
rename from graphics/pokemon/swablu/normal.pal
rename to graphics/pokemon/gen_3/swablu/normal.pal
diff --git a/graphics/pokemon/swablu/shiny.pal b/graphics/pokemon/gen_3/swablu/shiny.pal
similarity index 100%
rename from graphics/pokemon/swablu/shiny.pal
rename to graphics/pokemon/gen_3/swablu/shiny.pal
diff --git a/graphics/pokemon/swalot/anim_front.png b/graphics/pokemon/gen_3/swalot/anim_front.png
similarity index 100%
rename from graphics/pokemon/swalot/anim_front.png
rename to graphics/pokemon/gen_3/swalot/anim_front.png
diff --git a/graphics/pokemon/swalot/anim_frontf.png b/graphics/pokemon/gen_3/swalot/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/swalot/anim_frontf.png
rename to graphics/pokemon/gen_3/swalot/anim_frontf.png
diff --git a/graphics/pokemon/swalot/back.png b/graphics/pokemon/gen_3/swalot/back.png
similarity index 100%
rename from graphics/pokemon/swalot/back.png
rename to graphics/pokemon/gen_3/swalot/back.png
diff --git a/graphics/pokemon/swalot/backf.png b/graphics/pokemon/gen_3/swalot/backf.png
similarity index 100%
rename from graphics/pokemon/swalot/backf.png
rename to graphics/pokemon/gen_3/swalot/backf.png
diff --git a/graphics/pokemon/gorebyss/footprint.png b/graphics/pokemon/gen_3/swalot/footprint.png
similarity index 100%
rename from graphics/pokemon/gorebyss/footprint.png
rename to graphics/pokemon/gen_3/swalot/footprint.png
diff --git a/graphics/pokemon/swalot/icon.png b/graphics/pokemon/gen_3/swalot/icon.png
similarity index 100%
rename from graphics/pokemon/swalot/icon.png
rename to graphics/pokemon/gen_3/swalot/icon.png
diff --git a/graphics/pokemon/swalot/normal.pal b/graphics/pokemon/gen_3/swalot/normal.pal
similarity index 100%
rename from graphics/pokemon/swalot/normal.pal
rename to graphics/pokemon/gen_3/swalot/normal.pal
diff --git a/graphics/pokemon/swalot/shiny.pal b/graphics/pokemon/gen_3/swalot/shiny.pal
similarity index 100%
rename from graphics/pokemon/swalot/shiny.pal
rename to graphics/pokemon/gen_3/swalot/shiny.pal
diff --git a/graphics/pokemon/swampert/anim_front.png b/graphics/pokemon/gen_3/swampert/anim_front.png
similarity index 100%
rename from graphics/pokemon/swampert/anim_front.png
rename to graphics/pokemon/gen_3/swampert/anim_front.png
diff --git a/graphics/pokemon/swampert/back.png b/graphics/pokemon/gen_3/swampert/back.png
similarity index 100%
rename from graphics/pokemon/swampert/back.png
rename to graphics/pokemon/gen_3/swampert/back.png
diff --git a/graphics/pokemon/swampert/footprint.png b/graphics/pokemon/gen_3/swampert/footprint.png
similarity index 100%
rename from graphics/pokemon/swampert/footprint.png
rename to graphics/pokemon/gen_3/swampert/footprint.png
diff --git a/graphics/pokemon/swampert/icon.png b/graphics/pokemon/gen_3/swampert/icon.png
similarity index 100%
rename from graphics/pokemon/swampert/icon.png
rename to graphics/pokemon/gen_3/swampert/icon.png
diff --git a/graphics/pokemon/swampert/mega/back.png b/graphics/pokemon/gen_3/swampert/mega/back.png
similarity index 100%
rename from graphics/pokemon/swampert/mega/back.png
rename to graphics/pokemon/gen_3/swampert/mega/back.png
diff --git a/graphics/pokemon/swampert/mega/front.png b/graphics/pokemon/gen_3/swampert/mega/front.png
similarity index 100%
rename from graphics/pokemon/swampert/mega/front.png
rename to graphics/pokemon/gen_3/swampert/mega/front.png
diff --git a/graphics/pokemon/swampert/mega/icon.png b/graphics/pokemon/gen_3/swampert/mega/icon.png
similarity index 100%
rename from graphics/pokemon/swampert/mega/icon.png
rename to graphics/pokemon/gen_3/swampert/mega/icon.png
diff --git a/graphics/pokemon/swampert/mega/normal.pal b/graphics/pokemon/gen_3/swampert/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/swampert/mega/normal.pal
rename to graphics/pokemon/gen_3/swampert/mega/normal.pal
diff --git a/graphics/pokemon/swampert/mega/shiny.pal b/graphics/pokemon/gen_3/swampert/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/swampert/mega/shiny.pal
rename to graphics/pokemon/gen_3/swampert/mega/shiny.pal
diff --git a/graphics/pokemon/swampert/normal.pal b/graphics/pokemon/gen_3/swampert/normal.pal
similarity index 100%
rename from graphics/pokemon/swampert/normal.pal
rename to graphics/pokemon/gen_3/swampert/normal.pal
diff --git a/graphics/pokemon/swampert/shiny.pal b/graphics/pokemon/gen_3/swampert/shiny.pal
similarity index 100%
rename from graphics/pokemon/swampert/shiny.pal
rename to graphics/pokemon/gen_3/swampert/shiny.pal
diff --git a/graphics/pokemon/swellow/anim_front.png b/graphics/pokemon/gen_3/swellow/anim_front.png
similarity index 100%
rename from graphics/pokemon/swellow/anim_front.png
rename to graphics/pokemon/gen_3/swellow/anim_front.png
diff --git a/graphics/pokemon/swellow/back.png b/graphics/pokemon/gen_3/swellow/back.png
similarity index 100%
rename from graphics/pokemon/swellow/back.png
rename to graphics/pokemon/gen_3/swellow/back.png
diff --git a/graphics/pokemon/swellow/footprint.png b/graphics/pokemon/gen_3/swellow/footprint.png
similarity index 100%
rename from graphics/pokemon/swellow/footprint.png
rename to graphics/pokemon/gen_3/swellow/footprint.png
diff --git a/graphics/pokemon/swellow/icon.png b/graphics/pokemon/gen_3/swellow/icon.png
similarity index 100%
rename from graphics/pokemon/swellow/icon.png
rename to graphics/pokemon/gen_3/swellow/icon.png
diff --git a/graphics/pokemon/swellow/normal.pal b/graphics/pokemon/gen_3/swellow/normal.pal
similarity index 100%
rename from graphics/pokemon/swellow/normal.pal
rename to graphics/pokemon/gen_3/swellow/normal.pal
diff --git a/graphics/pokemon/swellow/shiny.pal b/graphics/pokemon/gen_3/swellow/shiny.pal
similarity index 100%
rename from graphics/pokemon/swellow/shiny.pal
rename to graphics/pokemon/gen_3/swellow/shiny.pal
diff --git a/graphics/pokemon/taillow/anim_front.png b/graphics/pokemon/gen_3/taillow/anim_front.png
similarity index 100%
rename from graphics/pokemon/taillow/anim_front.png
rename to graphics/pokemon/gen_3/taillow/anim_front.png
diff --git a/graphics/pokemon/taillow/back.png b/graphics/pokemon/gen_3/taillow/back.png
similarity index 100%
rename from graphics/pokemon/taillow/back.png
rename to graphics/pokemon/gen_3/taillow/back.png
diff --git a/graphics/pokemon/taillow/footprint.png b/graphics/pokemon/gen_3/taillow/footprint.png
similarity index 100%
rename from graphics/pokemon/taillow/footprint.png
rename to graphics/pokemon/gen_3/taillow/footprint.png
diff --git a/graphics/pokemon/taillow/icon.png b/graphics/pokemon/gen_3/taillow/icon.png
similarity index 100%
rename from graphics/pokemon/taillow/icon.png
rename to graphics/pokemon/gen_3/taillow/icon.png
diff --git a/graphics/pokemon/taillow/normal.pal b/graphics/pokemon/gen_3/taillow/normal.pal
similarity index 100%
rename from graphics/pokemon/taillow/normal.pal
rename to graphics/pokemon/gen_3/taillow/normal.pal
diff --git a/graphics/pokemon/taillow/shiny.pal b/graphics/pokemon/gen_3/taillow/shiny.pal
similarity index 100%
rename from graphics/pokemon/taillow/shiny.pal
rename to graphics/pokemon/gen_3/taillow/shiny.pal
diff --git a/graphics/pokemon/torchic/anim_front.png b/graphics/pokemon/gen_3/torchic/anim_front.png
similarity index 100%
rename from graphics/pokemon/torchic/anim_front.png
rename to graphics/pokemon/gen_3/torchic/anim_front.png
diff --git a/graphics/pokemon/torchic/back.png b/graphics/pokemon/gen_3/torchic/back.png
similarity index 100%
rename from graphics/pokemon/torchic/back.png
rename to graphics/pokemon/gen_3/torchic/back.png
diff --git a/graphics/pokemon/torchic/backf.png b/graphics/pokemon/gen_3/torchic/backf.png
similarity index 100%
rename from graphics/pokemon/torchic/backf.png
rename to graphics/pokemon/gen_3/torchic/backf.png
diff --git a/graphics/pokemon/torchic/footprint.png b/graphics/pokemon/gen_3/torchic/footprint.png
similarity index 100%
rename from graphics/pokemon/torchic/footprint.png
rename to graphics/pokemon/gen_3/torchic/footprint.png
diff --git a/graphics/pokemon/torchic/icon.png b/graphics/pokemon/gen_3/torchic/icon.png
similarity index 100%
rename from graphics/pokemon/torchic/icon.png
rename to graphics/pokemon/gen_3/torchic/icon.png
diff --git a/graphics/pokemon/torchic/normal.pal b/graphics/pokemon/gen_3/torchic/normal.pal
similarity index 100%
rename from graphics/pokemon/torchic/normal.pal
rename to graphics/pokemon/gen_3/torchic/normal.pal
diff --git a/graphics/pokemon/torchic/shiny.pal b/graphics/pokemon/gen_3/torchic/shiny.pal
similarity index 100%
rename from graphics/pokemon/torchic/shiny.pal
rename to graphics/pokemon/gen_3/torchic/shiny.pal
diff --git a/graphics/pokemon/torkoal/anim_front.png b/graphics/pokemon/gen_3/torkoal/anim_front.png
similarity index 100%
rename from graphics/pokemon/torkoal/anim_front.png
rename to graphics/pokemon/gen_3/torkoal/anim_front.png
diff --git a/graphics/pokemon/torkoal/back.png b/graphics/pokemon/gen_3/torkoal/back.png
similarity index 100%
rename from graphics/pokemon/torkoal/back.png
rename to graphics/pokemon/gen_3/torkoal/back.png
diff --git a/graphics/pokemon/torkoal/footprint.png b/graphics/pokemon/gen_3/torkoal/footprint.png
similarity index 100%
rename from graphics/pokemon/torkoal/footprint.png
rename to graphics/pokemon/gen_3/torkoal/footprint.png
diff --git a/graphics/pokemon/torkoal/icon.png b/graphics/pokemon/gen_3/torkoal/icon.png
similarity index 100%
rename from graphics/pokemon/torkoal/icon.png
rename to graphics/pokemon/gen_3/torkoal/icon.png
diff --git a/graphics/pokemon/torkoal/normal.pal b/graphics/pokemon/gen_3/torkoal/normal.pal
similarity index 100%
rename from graphics/pokemon/torkoal/normal.pal
rename to graphics/pokemon/gen_3/torkoal/normal.pal
diff --git a/graphics/pokemon/torkoal/shiny.pal b/graphics/pokemon/gen_3/torkoal/shiny.pal
similarity index 100%
rename from graphics/pokemon/torkoal/shiny.pal
rename to graphics/pokemon/gen_3/torkoal/shiny.pal
diff --git a/graphics/pokemon/trapinch/anim_front.png b/graphics/pokemon/gen_3/trapinch/anim_front.png
similarity index 100%
rename from graphics/pokemon/trapinch/anim_front.png
rename to graphics/pokemon/gen_3/trapinch/anim_front.png
diff --git a/graphics/pokemon/trapinch/back.png b/graphics/pokemon/gen_3/trapinch/back.png
similarity index 100%
rename from graphics/pokemon/trapinch/back.png
rename to graphics/pokemon/gen_3/trapinch/back.png
diff --git a/graphics/pokemon/trapinch/footprint.png b/graphics/pokemon/gen_3/trapinch/footprint.png
similarity index 100%
rename from graphics/pokemon/trapinch/footprint.png
rename to graphics/pokemon/gen_3/trapinch/footprint.png
diff --git a/graphics/pokemon/trapinch/icon.png b/graphics/pokemon/gen_3/trapinch/icon.png
similarity index 100%
rename from graphics/pokemon/trapinch/icon.png
rename to graphics/pokemon/gen_3/trapinch/icon.png
diff --git a/graphics/pokemon/trapinch/normal.pal b/graphics/pokemon/gen_3/trapinch/normal.pal
similarity index 100%
rename from graphics/pokemon/trapinch/normal.pal
rename to graphics/pokemon/gen_3/trapinch/normal.pal
diff --git a/graphics/pokemon/trapinch/shiny.pal b/graphics/pokemon/gen_3/trapinch/shiny.pal
similarity index 100%
rename from graphics/pokemon/trapinch/shiny.pal
rename to graphics/pokemon/gen_3/trapinch/shiny.pal
diff --git a/graphics/pokemon/treecko/anim_front.png b/graphics/pokemon/gen_3/treecko/anim_front.png
similarity index 100%
rename from graphics/pokemon/treecko/anim_front.png
rename to graphics/pokemon/gen_3/treecko/anim_front.png
diff --git a/graphics/pokemon/treecko/back.png b/graphics/pokemon/gen_3/treecko/back.png
similarity index 100%
rename from graphics/pokemon/treecko/back.png
rename to graphics/pokemon/gen_3/treecko/back.png
diff --git a/graphics/pokemon/treecko/footprint.png b/graphics/pokemon/gen_3/treecko/footprint.png
similarity index 100%
rename from graphics/pokemon/treecko/footprint.png
rename to graphics/pokemon/gen_3/treecko/footprint.png
diff --git a/graphics/pokemon/treecko/icon.png b/graphics/pokemon/gen_3/treecko/icon.png
similarity index 100%
rename from graphics/pokemon/treecko/icon.png
rename to graphics/pokemon/gen_3/treecko/icon.png
diff --git a/graphics/pokemon/treecko/normal.pal b/graphics/pokemon/gen_3/treecko/normal.pal
similarity index 100%
rename from graphics/pokemon/treecko/normal.pal
rename to graphics/pokemon/gen_3/treecko/normal.pal
diff --git a/graphics/pokemon/treecko/shiny.pal b/graphics/pokemon/gen_3/treecko/shiny.pal
similarity index 100%
rename from graphics/pokemon/treecko/shiny.pal
rename to graphics/pokemon/gen_3/treecko/shiny.pal
diff --git a/graphics/pokemon/tropius/anim_front.png b/graphics/pokemon/gen_3/tropius/anim_front.png
similarity index 100%
rename from graphics/pokemon/tropius/anim_front.png
rename to graphics/pokemon/gen_3/tropius/anim_front.png
diff --git a/graphics/pokemon/tropius/back.png b/graphics/pokemon/gen_3/tropius/back.png
similarity index 100%
rename from graphics/pokemon/tropius/back.png
rename to graphics/pokemon/gen_3/tropius/back.png
diff --git a/graphics/pokemon/tropius/footprint.png b/graphics/pokemon/gen_3/tropius/footprint.png
similarity index 100%
rename from graphics/pokemon/tropius/footprint.png
rename to graphics/pokemon/gen_3/tropius/footprint.png
diff --git a/graphics/pokemon/tropius/icon.png b/graphics/pokemon/gen_3/tropius/icon.png
similarity index 100%
rename from graphics/pokemon/tropius/icon.png
rename to graphics/pokemon/gen_3/tropius/icon.png
diff --git a/graphics/pokemon/tropius/normal.pal b/graphics/pokemon/gen_3/tropius/normal.pal
similarity index 100%
rename from graphics/pokemon/tropius/normal.pal
rename to graphics/pokemon/gen_3/tropius/normal.pal
diff --git a/graphics/pokemon/tropius/shiny.pal b/graphics/pokemon/gen_3/tropius/shiny.pal
similarity index 100%
rename from graphics/pokemon/tropius/shiny.pal
rename to graphics/pokemon/gen_3/tropius/shiny.pal
diff --git a/graphics/pokemon/vibrava/anim_front.png b/graphics/pokemon/gen_3/vibrava/anim_front.png
similarity index 100%
rename from graphics/pokemon/vibrava/anim_front.png
rename to graphics/pokemon/gen_3/vibrava/anim_front.png
diff --git a/graphics/pokemon/vibrava/back.png b/graphics/pokemon/gen_3/vibrava/back.png
similarity index 100%
rename from graphics/pokemon/vibrava/back.png
rename to graphics/pokemon/gen_3/vibrava/back.png
diff --git a/graphics/pokemon/vibrava/footprint.png b/graphics/pokemon/gen_3/vibrava/footprint.png
similarity index 100%
rename from graphics/pokemon/vibrava/footprint.png
rename to graphics/pokemon/gen_3/vibrava/footprint.png
diff --git a/graphics/pokemon/vibrava/icon.png b/graphics/pokemon/gen_3/vibrava/icon.png
similarity index 100%
rename from graphics/pokemon/vibrava/icon.png
rename to graphics/pokemon/gen_3/vibrava/icon.png
diff --git a/graphics/pokemon/vibrava/normal.pal b/graphics/pokemon/gen_3/vibrava/normal.pal
similarity index 100%
rename from graphics/pokemon/vibrava/normal.pal
rename to graphics/pokemon/gen_3/vibrava/normal.pal
diff --git a/graphics/pokemon/vibrava/shiny.pal b/graphics/pokemon/gen_3/vibrava/shiny.pal
similarity index 100%
rename from graphics/pokemon/vibrava/shiny.pal
rename to graphics/pokemon/gen_3/vibrava/shiny.pal
diff --git a/graphics/pokemon/vigoroth/anim_front.png b/graphics/pokemon/gen_3/vigoroth/anim_front.png
similarity index 100%
rename from graphics/pokemon/vigoroth/anim_front.png
rename to graphics/pokemon/gen_3/vigoroth/anim_front.png
diff --git a/graphics/pokemon/vigoroth/back.png b/graphics/pokemon/gen_3/vigoroth/back.png
similarity index 100%
rename from graphics/pokemon/vigoroth/back.png
rename to graphics/pokemon/gen_3/vigoroth/back.png
diff --git a/graphics/pokemon/vigoroth/footprint.png b/graphics/pokemon/gen_3/vigoroth/footprint.png
similarity index 100%
rename from graphics/pokemon/vigoroth/footprint.png
rename to graphics/pokemon/gen_3/vigoroth/footprint.png
diff --git a/graphics/pokemon/vigoroth/icon.png b/graphics/pokemon/gen_3/vigoroth/icon.png
similarity index 100%
rename from graphics/pokemon/vigoroth/icon.png
rename to graphics/pokemon/gen_3/vigoroth/icon.png
diff --git a/graphics/pokemon/vigoroth/normal.pal b/graphics/pokemon/gen_3/vigoroth/normal.pal
similarity index 100%
rename from graphics/pokemon/vigoroth/normal.pal
rename to graphics/pokemon/gen_3/vigoroth/normal.pal
diff --git a/graphics/pokemon/vigoroth/shiny.pal b/graphics/pokemon/gen_3/vigoroth/shiny.pal
similarity index 100%
rename from graphics/pokemon/vigoroth/shiny.pal
rename to graphics/pokemon/gen_3/vigoroth/shiny.pal
diff --git a/graphics/pokemon/volbeat/anim_front.png b/graphics/pokemon/gen_3/volbeat/anim_front.png
similarity index 100%
rename from graphics/pokemon/volbeat/anim_front.png
rename to graphics/pokemon/gen_3/volbeat/anim_front.png
diff --git a/graphics/pokemon/volbeat/back.png b/graphics/pokemon/gen_3/volbeat/back.png
similarity index 100%
rename from graphics/pokemon/volbeat/back.png
rename to graphics/pokemon/gen_3/volbeat/back.png
diff --git a/graphics/pokemon/volbeat/footprint.png b/graphics/pokemon/gen_3/volbeat/footprint.png
similarity index 100%
rename from graphics/pokemon/volbeat/footprint.png
rename to graphics/pokemon/gen_3/volbeat/footprint.png
diff --git a/graphics/pokemon/volbeat/icon.png b/graphics/pokemon/gen_3/volbeat/icon.png
similarity index 100%
rename from graphics/pokemon/volbeat/icon.png
rename to graphics/pokemon/gen_3/volbeat/icon.png
diff --git a/graphics/pokemon/volbeat/normal.pal b/graphics/pokemon/gen_3/volbeat/normal.pal
similarity index 100%
rename from graphics/pokemon/volbeat/normal.pal
rename to graphics/pokemon/gen_3/volbeat/normal.pal
diff --git a/graphics/pokemon/volbeat/shiny.pal b/graphics/pokemon/gen_3/volbeat/shiny.pal
similarity index 100%
rename from graphics/pokemon/volbeat/shiny.pal
rename to graphics/pokemon/gen_3/volbeat/shiny.pal
diff --git a/graphics/pokemon/wailmer/anim_front.png b/graphics/pokemon/gen_3/wailmer/anim_front.png
similarity index 100%
rename from graphics/pokemon/wailmer/anim_front.png
rename to graphics/pokemon/gen_3/wailmer/anim_front.png
diff --git a/graphics/pokemon/wailmer/back.png b/graphics/pokemon/gen_3/wailmer/back.png
similarity index 100%
rename from graphics/pokemon/wailmer/back.png
rename to graphics/pokemon/gen_3/wailmer/back.png
diff --git a/graphics/pokemon/grimer/footprint.png b/graphics/pokemon/gen_3/wailmer/footprint.png
similarity index 100%
rename from graphics/pokemon/grimer/footprint.png
rename to graphics/pokemon/gen_3/wailmer/footprint.png
diff --git a/graphics/pokemon/wailmer/icon.png b/graphics/pokemon/gen_3/wailmer/icon.png
similarity index 100%
rename from graphics/pokemon/wailmer/icon.png
rename to graphics/pokemon/gen_3/wailmer/icon.png
diff --git a/graphics/pokemon/wailmer/normal.pal b/graphics/pokemon/gen_3/wailmer/normal.pal
similarity index 100%
rename from graphics/pokemon/wailmer/normal.pal
rename to graphics/pokemon/gen_3/wailmer/normal.pal
diff --git a/graphics/pokemon/wailmer/shiny.pal b/graphics/pokemon/gen_3/wailmer/shiny.pal
similarity index 100%
rename from graphics/pokemon/wailmer/shiny.pal
rename to graphics/pokemon/gen_3/wailmer/shiny.pal
diff --git a/graphics/pokemon/wailord/anim_front.png b/graphics/pokemon/gen_3/wailord/anim_front.png
similarity index 100%
rename from graphics/pokemon/wailord/anim_front.png
rename to graphics/pokemon/gen_3/wailord/anim_front.png
diff --git a/graphics/pokemon/wailord/back.png b/graphics/pokemon/gen_3/wailord/back.png
similarity index 100%
rename from graphics/pokemon/wailord/back.png
rename to graphics/pokemon/gen_3/wailord/back.png
diff --git a/graphics/pokemon/gulpin/footprint.png b/graphics/pokemon/gen_3/wailord/footprint.png
similarity index 100%
rename from graphics/pokemon/gulpin/footprint.png
rename to graphics/pokemon/gen_3/wailord/footprint.png
diff --git a/graphics/pokemon/wailord/icon.png b/graphics/pokemon/gen_3/wailord/icon.png
similarity index 100%
rename from graphics/pokemon/wailord/icon.png
rename to graphics/pokemon/gen_3/wailord/icon.png
diff --git a/graphics/pokemon/wailord/normal.pal b/graphics/pokemon/gen_3/wailord/normal.pal
similarity index 100%
rename from graphics/pokemon/wailord/normal.pal
rename to graphics/pokemon/gen_3/wailord/normal.pal
diff --git a/graphics/pokemon/wailord/shiny.pal b/graphics/pokemon/gen_3/wailord/shiny.pal
similarity index 100%
rename from graphics/pokemon/wailord/shiny.pal
rename to graphics/pokemon/gen_3/wailord/shiny.pal
diff --git a/graphics/pokemon/walrein/anim_front.png b/graphics/pokemon/gen_3/walrein/anim_front.png
similarity index 100%
rename from graphics/pokemon/walrein/anim_front.png
rename to graphics/pokemon/gen_3/walrein/anim_front.png
diff --git a/graphics/pokemon/walrein/back.png b/graphics/pokemon/gen_3/walrein/back.png
similarity index 100%
rename from graphics/pokemon/walrein/back.png
rename to graphics/pokemon/gen_3/walrein/back.png
diff --git a/graphics/pokemon/gyarados/footprint.png b/graphics/pokemon/gen_3/walrein/footprint.png
similarity index 100%
rename from graphics/pokemon/gyarados/footprint.png
rename to graphics/pokemon/gen_3/walrein/footprint.png
diff --git a/graphics/pokemon/walrein/icon.png b/graphics/pokemon/gen_3/walrein/icon.png
similarity index 100%
rename from graphics/pokemon/walrein/icon.png
rename to graphics/pokemon/gen_3/walrein/icon.png
diff --git a/graphics/pokemon/walrein/normal.pal b/graphics/pokemon/gen_3/walrein/normal.pal
similarity index 100%
rename from graphics/pokemon/walrein/normal.pal
rename to graphics/pokemon/gen_3/walrein/normal.pal
diff --git a/graphics/pokemon/walrein/shiny.pal b/graphics/pokemon/gen_3/walrein/shiny.pal
similarity index 100%
rename from graphics/pokemon/walrein/shiny.pal
rename to graphics/pokemon/gen_3/walrein/shiny.pal
diff --git a/graphics/pokemon/whiscash/anim_front.png b/graphics/pokemon/gen_3/whiscash/anim_front.png
similarity index 100%
rename from graphics/pokemon/whiscash/anim_front.png
rename to graphics/pokemon/gen_3/whiscash/anim_front.png
diff --git a/graphics/pokemon/whiscash/back.png b/graphics/pokemon/gen_3/whiscash/back.png
similarity index 100%
rename from graphics/pokemon/whiscash/back.png
rename to graphics/pokemon/gen_3/whiscash/back.png
diff --git a/graphics/pokemon/hatterene/footprint.png b/graphics/pokemon/gen_3/whiscash/footprint.png
similarity index 100%
rename from graphics/pokemon/hatterene/footprint.png
rename to graphics/pokemon/gen_3/whiscash/footprint.png
diff --git a/graphics/pokemon/whiscash/icon.png b/graphics/pokemon/gen_3/whiscash/icon.png
similarity index 100%
rename from graphics/pokemon/whiscash/icon.png
rename to graphics/pokemon/gen_3/whiscash/icon.png
diff --git a/graphics/pokemon/whiscash/normal.pal b/graphics/pokemon/gen_3/whiscash/normal.pal
similarity index 100%
rename from graphics/pokemon/whiscash/normal.pal
rename to graphics/pokemon/gen_3/whiscash/normal.pal
diff --git a/graphics/pokemon/whiscash/shiny.pal b/graphics/pokemon/gen_3/whiscash/shiny.pal
similarity index 100%
rename from graphics/pokemon/whiscash/shiny.pal
rename to graphics/pokemon/gen_3/whiscash/shiny.pal
diff --git a/graphics/pokemon/whismur/anim_front.png b/graphics/pokemon/gen_3/whismur/anim_front.png
similarity index 100%
rename from graphics/pokemon/whismur/anim_front.png
rename to graphics/pokemon/gen_3/whismur/anim_front.png
diff --git a/graphics/pokemon/whismur/back.png b/graphics/pokemon/gen_3/whismur/back.png
similarity index 100%
rename from graphics/pokemon/whismur/back.png
rename to graphics/pokemon/gen_3/whismur/back.png
diff --git a/graphics/pokemon/whismur/footprint.png b/graphics/pokemon/gen_3/whismur/footprint.png
similarity index 100%
rename from graphics/pokemon/whismur/footprint.png
rename to graphics/pokemon/gen_3/whismur/footprint.png
diff --git a/graphics/pokemon/whismur/icon.png b/graphics/pokemon/gen_3/whismur/icon.png
similarity index 100%
rename from graphics/pokemon/whismur/icon.png
rename to graphics/pokemon/gen_3/whismur/icon.png
diff --git a/graphics/pokemon/whismur/normal.pal b/graphics/pokemon/gen_3/whismur/normal.pal
similarity index 100%
rename from graphics/pokemon/whismur/normal.pal
rename to graphics/pokemon/gen_3/whismur/normal.pal
diff --git a/graphics/pokemon/whismur/shiny.pal b/graphics/pokemon/gen_3/whismur/shiny.pal
similarity index 100%
rename from graphics/pokemon/whismur/shiny.pal
rename to graphics/pokemon/gen_3/whismur/shiny.pal
diff --git a/graphics/pokemon/wingull/anim_front.png b/graphics/pokemon/gen_3/wingull/anim_front.png
similarity index 100%
rename from graphics/pokemon/wingull/anim_front.png
rename to graphics/pokemon/gen_3/wingull/anim_front.png
diff --git a/graphics/pokemon/wingull/back.png b/graphics/pokemon/gen_3/wingull/back.png
similarity index 100%
rename from graphics/pokemon/wingull/back.png
rename to graphics/pokemon/gen_3/wingull/back.png
diff --git a/graphics/pokemon/wingull/footprint.png b/graphics/pokemon/gen_3/wingull/footprint.png
similarity index 100%
rename from graphics/pokemon/wingull/footprint.png
rename to graphics/pokemon/gen_3/wingull/footprint.png
diff --git a/graphics/pokemon/wingull/icon.png b/graphics/pokemon/gen_3/wingull/icon.png
similarity index 100%
rename from graphics/pokemon/wingull/icon.png
rename to graphics/pokemon/gen_3/wingull/icon.png
diff --git a/graphics/pokemon/wingull/normal.pal b/graphics/pokemon/gen_3/wingull/normal.pal
similarity index 100%
rename from graphics/pokemon/wingull/normal.pal
rename to graphics/pokemon/gen_3/wingull/normal.pal
diff --git a/graphics/pokemon/wingull/shiny.pal b/graphics/pokemon/gen_3/wingull/shiny.pal
similarity index 100%
rename from graphics/pokemon/wingull/shiny.pal
rename to graphics/pokemon/gen_3/wingull/shiny.pal
diff --git a/graphics/pokemon/wurmple/anim_front.png b/graphics/pokemon/gen_3/wurmple/anim_front.png
similarity index 100%
rename from graphics/pokemon/wurmple/anim_front.png
rename to graphics/pokemon/gen_3/wurmple/anim_front.png
diff --git a/graphics/pokemon/wurmple/back.png b/graphics/pokemon/gen_3/wurmple/back.png
similarity index 100%
rename from graphics/pokemon/wurmple/back.png
rename to graphics/pokemon/gen_3/wurmple/back.png
diff --git a/graphics/pokemon/wurmple/footprint.png b/graphics/pokemon/gen_3/wurmple/footprint.png
similarity index 100%
rename from graphics/pokemon/wurmple/footprint.png
rename to graphics/pokemon/gen_3/wurmple/footprint.png
diff --git a/graphics/pokemon/wurmple/icon.png b/graphics/pokemon/gen_3/wurmple/icon.png
similarity index 100%
rename from graphics/pokemon/wurmple/icon.png
rename to graphics/pokemon/gen_3/wurmple/icon.png
diff --git a/graphics/pokemon/wurmple/normal.pal b/graphics/pokemon/gen_3/wurmple/normal.pal
similarity index 100%
rename from graphics/pokemon/wurmple/normal.pal
rename to graphics/pokemon/gen_3/wurmple/normal.pal
diff --git a/graphics/pokemon/wurmple/shiny.pal b/graphics/pokemon/gen_3/wurmple/shiny.pal
similarity index 100%
rename from graphics/pokemon/wurmple/shiny.pal
rename to graphics/pokemon/gen_3/wurmple/shiny.pal
diff --git a/graphics/pokemon/wynaut/anim_front.png b/graphics/pokemon/gen_3/wynaut/anim_front.png
similarity index 100%
rename from graphics/pokemon/wynaut/anim_front.png
rename to graphics/pokemon/gen_3/wynaut/anim_front.png
diff --git a/graphics/pokemon/wynaut/back.png b/graphics/pokemon/gen_3/wynaut/back.png
similarity index 100%
rename from graphics/pokemon/wynaut/back.png
rename to graphics/pokemon/gen_3/wynaut/back.png
diff --git a/graphics/pokemon/wynaut/footprint.png b/graphics/pokemon/gen_3/wynaut/footprint.png
similarity index 100%
rename from graphics/pokemon/wynaut/footprint.png
rename to graphics/pokemon/gen_3/wynaut/footprint.png
diff --git a/graphics/pokemon/wynaut/icon.png b/graphics/pokemon/gen_3/wynaut/icon.png
similarity index 100%
rename from graphics/pokemon/wynaut/icon.png
rename to graphics/pokemon/gen_3/wynaut/icon.png
diff --git a/graphics/pokemon/wynaut/normal.pal b/graphics/pokemon/gen_3/wynaut/normal.pal
similarity index 100%
rename from graphics/pokemon/wynaut/normal.pal
rename to graphics/pokemon/gen_3/wynaut/normal.pal
diff --git a/graphics/pokemon/wynaut/shiny.pal b/graphics/pokemon/gen_3/wynaut/shiny.pal
similarity index 100%
rename from graphics/pokemon/wynaut/shiny.pal
rename to graphics/pokemon/gen_3/wynaut/shiny.pal
diff --git a/graphics/pokemon/zangoose/anim_front.png b/graphics/pokemon/gen_3/zangoose/anim_front.png
similarity index 100%
rename from graphics/pokemon/zangoose/anim_front.png
rename to graphics/pokemon/gen_3/zangoose/anim_front.png
diff --git a/graphics/pokemon/zangoose/back.png b/graphics/pokemon/gen_3/zangoose/back.png
similarity index 100%
rename from graphics/pokemon/zangoose/back.png
rename to graphics/pokemon/gen_3/zangoose/back.png
diff --git a/graphics/pokemon/zangoose/footprint.png b/graphics/pokemon/gen_3/zangoose/footprint.png
similarity index 100%
rename from graphics/pokemon/zangoose/footprint.png
rename to graphics/pokemon/gen_3/zangoose/footprint.png
diff --git a/graphics/pokemon/zangoose/icon.png b/graphics/pokemon/gen_3/zangoose/icon.png
similarity index 100%
rename from graphics/pokemon/zangoose/icon.png
rename to graphics/pokemon/gen_3/zangoose/icon.png
diff --git a/graphics/pokemon/zangoose/normal.pal b/graphics/pokemon/gen_3/zangoose/normal.pal
similarity index 100%
rename from graphics/pokemon/zangoose/normal.pal
rename to graphics/pokemon/gen_3/zangoose/normal.pal
diff --git a/graphics/pokemon/zangoose/shiny.pal b/graphics/pokemon/gen_3/zangoose/shiny.pal
similarity index 100%
rename from graphics/pokemon/zangoose/shiny.pal
rename to graphics/pokemon/gen_3/zangoose/shiny.pal
diff --git a/graphics/pokemon/zigzagoon/anim_front.png b/graphics/pokemon/gen_3/zigzagoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/anim_front.png
rename to graphics/pokemon/gen_3/zigzagoon/anim_front.png
diff --git a/graphics/pokemon/zigzagoon/back.png b/graphics/pokemon/gen_3/zigzagoon/back.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/back.png
rename to graphics/pokemon/gen_3/zigzagoon/back.png
diff --git a/graphics/pokemon/zigzagoon/footprint.png b/graphics/pokemon/gen_3/zigzagoon/footprint.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/footprint.png
rename to graphics/pokemon/gen_3/zigzagoon/footprint.png
diff --git a/graphics/pokemon/zigzagoon/galarian/back.png b/graphics/pokemon/gen_3/zigzagoon/galarian/back.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/galarian/back.png
rename to graphics/pokemon/gen_3/zigzagoon/galarian/back.png
diff --git a/graphics/pokemon/zigzagoon/galarian/front.png b/graphics/pokemon/gen_3/zigzagoon/galarian/front.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/galarian/front.png
rename to graphics/pokemon/gen_3/zigzagoon/galarian/front.png
diff --git a/graphics/pokemon/zigzagoon/galarian/icon.png b/graphics/pokemon/gen_3/zigzagoon/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/galarian/icon.png
rename to graphics/pokemon/gen_3/zigzagoon/galarian/icon.png
diff --git a/graphics/pokemon/zigzagoon/galarian/normal.pal b/graphics/pokemon/gen_3/zigzagoon/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/zigzagoon/galarian/normal.pal
rename to graphics/pokemon/gen_3/zigzagoon/galarian/normal.pal
diff --git a/graphics/pokemon/zigzagoon/galarian/shiny.pal b/graphics/pokemon/gen_3/zigzagoon/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/zigzagoon/galarian/shiny.pal
rename to graphics/pokemon/gen_3/zigzagoon/galarian/shiny.pal
diff --git a/graphics/pokemon/zigzagoon/icon.png b/graphics/pokemon/gen_3/zigzagoon/icon.png
similarity index 100%
rename from graphics/pokemon/zigzagoon/icon.png
rename to graphics/pokemon/gen_3/zigzagoon/icon.png
diff --git a/graphics/pokemon/zigzagoon/normal.pal b/graphics/pokemon/gen_3/zigzagoon/normal.pal
similarity index 100%
rename from graphics/pokemon/zigzagoon/normal.pal
rename to graphics/pokemon/gen_3/zigzagoon/normal.pal
diff --git a/graphics/pokemon/zigzagoon/shiny.pal b/graphics/pokemon/gen_3/zigzagoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/zigzagoon/shiny.pal
rename to graphics/pokemon/gen_3/zigzagoon/shiny.pal
diff --git a/graphics/pokemon/abomasnow/anim_front.png b/graphics/pokemon/gen_4/abomasnow/anim_front.png
similarity index 100%
rename from graphics/pokemon/abomasnow/anim_front.png
rename to graphics/pokemon/gen_4/abomasnow/anim_front.png
diff --git a/graphics/pokemon/abomasnow/anim_frontf.png b/graphics/pokemon/gen_4/abomasnow/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/abomasnow/anim_frontf.png
rename to graphics/pokemon/gen_4/abomasnow/anim_frontf.png
diff --git a/graphics/pokemon/abomasnow/back.png b/graphics/pokemon/gen_4/abomasnow/back.png
similarity index 100%
rename from graphics/pokemon/abomasnow/back.png
rename to graphics/pokemon/gen_4/abomasnow/back.png
diff --git a/graphics/pokemon/abomasnow/footprint.png b/graphics/pokemon/gen_4/abomasnow/footprint.png
similarity index 100%
rename from graphics/pokemon/abomasnow/footprint.png
rename to graphics/pokemon/gen_4/abomasnow/footprint.png
diff --git a/graphics/pokemon/abomasnow/icon.png b/graphics/pokemon/gen_4/abomasnow/icon.png
similarity index 100%
rename from graphics/pokemon/abomasnow/icon.png
rename to graphics/pokemon/gen_4/abomasnow/icon.png
diff --git a/graphics/pokemon/abomasnow/mega/back.png b/graphics/pokemon/gen_4/abomasnow/mega/back.png
similarity index 100%
rename from graphics/pokemon/abomasnow/mega/back.png
rename to graphics/pokemon/gen_4/abomasnow/mega/back.png
diff --git a/graphics/pokemon/abomasnow/mega/front.png b/graphics/pokemon/gen_4/abomasnow/mega/front.png
similarity index 100%
rename from graphics/pokemon/abomasnow/mega/front.png
rename to graphics/pokemon/gen_4/abomasnow/mega/front.png
diff --git a/graphics/pokemon/abomasnow/mega/icon.png b/graphics/pokemon/gen_4/abomasnow/mega/icon.png
similarity index 100%
rename from graphics/pokemon/abomasnow/mega/icon.png
rename to graphics/pokemon/gen_4/abomasnow/mega/icon.png
diff --git a/graphics/pokemon/abomasnow/mega/normal.pal b/graphics/pokemon/gen_4/abomasnow/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/abomasnow/mega/normal.pal
rename to graphics/pokemon/gen_4/abomasnow/mega/normal.pal
diff --git a/graphics/pokemon/abomasnow/mega/shiny.pal b/graphics/pokemon/gen_4/abomasnow/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/abomasnow/mega/shiny.pal
rename to graphics/pokemon/gen_4/abomasnow/mega/shiny.pal
diff --git a/graphics/pokemon/abomasnow/normal.pal b/graphics/pokemon/gen_4/abomasnow/normal.pal
similarity index 100%
rename from graphics/pokemon/abomasnow/normal.pal
rename to graphics/pokemon/gen_4/abomasnow/normal.pal
diff --git a/graphics/pokemon/abomasnow/shiny.pal b/graphics/pokemon/gen_4/abomasnow/shiny.pal
similarity index 100%
rename from graphics/pokemon/abomasnow/shiny.pal
rename to graphics/pokemon/gen_4/abomasnow/shiny.pal
diff --git a/graphics/pokemon/ambipom/anim_front.png b/graphics/pokemon/gen_4/ambipom/anim_front.png
similarity index 100%
rename from graphics/pokemon/ambipom/anim_front.png
rename to graphics/pokemon/gen_4/ambipom/anim_front.png
diff --git a/graphics/pokemon/ambipom/anim_frontf.png b/graphics/pokemon/gen_4/ambipom/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/ambipom/anim_frontf.png
rename to graphics/pokemon/gen_4/ambipom/anim_frontf.png
diff --git a/graphics/pokemon/ambipom/back.png b/graphics/pokemon/gen_4/ambipom/back.png
similarity index 100%
rename from graphics/pokemon/ambipom/back.png
rename to graphics/pokemon/gen_4/ambipom/back.png
diff --git a/graphics/pokemon/ambipom/backf.png b/graphics/pokemon/gen_4/ambipom/backf.png
similarity index 100%
rename from graphics/pokemon/ambipom/backf.png
rename to graphics/pokemon/gen_4/ambipom/backf.png
diff --git a/graphics/pokemon/ambipom/footprint.png b/graphics/pokemon/gen_4/ambipom/footprint.png
similarity index 100%
rename from graphics/pokemon/ambipom/footprint.png
rename to graphics/pokemon/gen_4/ambipom/footprint.png
diff --git a/graphics/pokemon/ambipom/icon.png b/graphics/pokemon/gen_4/ambipom/icon.png
similarity index 100%
rename from graphics/pokemon/ambipom/icon.png
rename to graphics/pokemon/gen_4/ambipom/icon.png
diff --git a/graphics/pokemon/ambipom/normal.pal b/graphics/pokemon/gen_4/ambipom/normal.pal
similarity index 100%
rename from graphics/pokemon/ambipom/normal.pal
rename to graphics/pokemon/gen_4/ambipom/normal.pal
diff --git a/graphics/pokemon/ambipom/shiny.pal b/graphics/pokemon/gen_4/ambipom/shiny.pal
similarity index 100%
rename from graphics/pokemon/ambipom/shiny.pal
rename to graphics/pokemon/gen_4/ambipom/shiny.pal
diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/gen_4/arceus/anim_front.png
similarity index 100%
rename from graphics/pokemon/arceus/anim_front.png
rename to graphics/pokemon/gen_4/arceus/anim_front.png
diff --git a/graphics/pokemon/arceus/back.png b/graphics/pokemon/gen_4/arceus/back.png
similarity index 100%
rename from graphics/pokemon/arceus/back.png
rename to graphics/pokemon/gen_4/arceus/back.png
diff --git a/graphics/pokemon/arceus/bug/normal.pal b/graphics/pokemon/gen_4/arceus/bug/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/bug/normal.pal
rename to graphics/pokemon/gen_4/arceus/bug/normal.pal
diff --git a/graphics/pokemon/arceus/bug/shiny.pal b/graphics/pokemon/gen_4/arceus/bug/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/bug/shiny.pal
rename to graphics/pokemon/gen_4/arceus/bug/shiny.pal
diff --git a/graphics/pokemon/arceus/dark/normal.pal b/graphics/pokemon/gen_4/arceus/dark/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/dark/normal.pal
rename to graphics/pokemon/gen_4/arceus/dark/normal.pal
diff --git a/graphics/pokemon/arceus/dark/shiny.pal b/graphics/pokemon/gen_4/arceus/dark/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/dark/shiny.pal
rename to graphics/pokemon/gen_4/arceus/dark/shiny.pal
diff --git a/graphics/pokemon/arceus/dragon/normal.pal b/graphics/pokemon/gen_4/arceus/dragon/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/dragon/normal.pal
rename to graphics/pokemon/gen_4/arceus/dragon/normal.pal
diff --git a/graphics/pokemon/arceus/dragon/shiny.pal b/graphics/pokemon/gen_4/arceus/dragon/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/dragon/shiny.pal
rename to graphics/pokemon/gen_4/arceus/dragon/shiny.pal
diff --git a/graphics/pokemon/arceus/electric/normal.pal b/graphics/pokemon/gen_4/arceus/electric/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/electric/normal.pal
rename to graphics/pokemon/gen_4/arceus/electric/normal.pal
diff --git a/graphics/pokemon/arceus/electric/shiny.pal b/graphics/pokemon/gen_4/arceus/electric/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/electric/shiny.pal
rename to graphics/pokemon/gen_4/arceus/electric/shiny.pal
diff --git a/graphics/pokemon/arceus/fairy/normal.pal b/graphics/pokemon/gen_4/arceus/fairy/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/fairy/normal.pal
rename to graphics/pokemon/gen_4/arceus/fairy/normal.pal
diff --git a/graphics/pokemon/arceus/fairy/shiny.pal b/graphics/pokemon/gen_4/arceus/fairy/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/fairy/shiny.pal
rename to graphics/pokemon/gen_4/arceus/fairy/shiny.pal
diff --git a/graphics/pokemon/arceus/fighting/normal.pal b/graphics/pokemon/gen_4/arceus/fighting/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/fighting/normal.pal
rename to graphics/pokemon/gen_4/arceus/fighting/normal.pal
diff --git a/graphics/pokemon/arceus/fighting/shiny.pal b/graphics/pokemon/gen_4/arceus/fighting/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/fighting/shiny.pal
rename to graphics/pokemon/gen_4/arceus/fighting/shiny.pal
diff --git a/graphics/pokemon/arceus/fire/normal.pal b/graphics/pokemon/gen_4/arceus/fire/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/fire/normal.pal
rename to graphics/pokemon/gen_4/arceus/fire/normal.pal
diff --git a/graphics/pokemon/arceus/fire/shiny.pal b/graphics/pokemon/gen_4/arceus/fire/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/fire/shiny.pal
rename to graphics/pokemon/gen_4/arceus/fire/shiny.pal
diff --git a/graphics/pokemon/arceus/flying/normal.pal b/graphics/pokemon/gen_4/arceus/flying/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/flying/normal.pal
rename to graphics/pokemon/gen_4/arceus/flying/normal.pal
diff --git a/graphics/pokemon/arceus/flying/shiny.pal b/graphics/pokemon/gen_4/arceus/flying/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/flying/shiny.pal
rename to graphics/pokemon/gen_4/arceus/flying/shiny.pal
diff --git a/graphics/pokemon/arceus/footprint.png b/graphics/pokemon/gen_4/arceus/footprint.png
similarity index 100%
rename from graphics/pokemon/arceus/footprint.png
rename to graphics/pokemon/gen_4/arceus/footprint.png
diff --git a/graphics/pokemon/arceus/ghost/normal.pal b/graphics/pokemon/gen_4/arceus/ghost/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/ghost/normal.pal
rename to graphics/pokemon/gen_4/arceus/ghost/normal.pal
diff --git a/graphics/pokemon/arceus/ghost/shiny.pal b/graphics/pokemon/gen_4/arceus/ghost/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/ghost/shiny.pal
rename to graphics/pokemon/gen_4/arceus/ghost/shiny.pal
diff --git a/graphics/pokemon/arceus/grass/normal.pal b/graphics/pokemon/gen_4/arceus/grass/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/grass/normal.pal
rename to graphics/pokemon/gen_4/arceus/grass/normal.pal
diff --git a/graphics/pokemon/arceus/grass/shiny.pal b/graphics/pokemon/gen_4/arceus/grass/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/grass/shiny.pal
rename to graphics/pokemon/gen_4/arceus/grass/shiny.pal
diff --git a/graphics/pokemon/arceus/ground/normal.pal b/graphics/pokemon/gen_4/arceus/ground/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/ground/normal.pal
rename to graphics/pokemon/gen_4/arceus/ground/normal.pal
diff --git a/graphics/pokemon/arceus/ground/shiny.pal b/graphics/pokemon/gen_4/arceus/ground/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/ground/shiny.pal
rename to graphics/pokemon/gen_4/arceus/ground/shiny.pal
diff --git a/graphics/pokemon/arceus/ice/normal.pal b/graphics/pokemon/gen_4/arceus/ice/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/ice/normal.pal
rename to graphics/pokemon/gen_4/arceus/ice/normal.pal
diff --git a/graphics/pokemon/arceus/ice/shiny.pal b/graphics/pokemon/gen_4/arceus/ice/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/ice/shiny.pal
rename to graphics/pokemon/gen_4/arceus/ice/shiny.pal
diff --git a/graphics/pokemon/arceus/icon.png b/graphics/pokemon/gen_4/arceus/icon.png
similarity index 100%
rename from graphics/pokemon/arceus/icon.png
rename to graphics/pokemon/gen_4/arceus/icon.png
diff --git a/graphics/pokemon/arceus/normal.pal b/graphics/pokemon/gen_4/arceus/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/normal.pal
rename to graphics/pokemon/gen_4/arceus/normal.pal
diff --git a/graphics/pokemon/arceus/poison/normal.pal b/graphics/pokemon/gen_4/arceus/poison/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/poison/normal.pal
rename to graphics/pokemon/gen_4/arceus/poison/normal.pal
diff --git a/graphics/pokemon/arceus/poison/shiny.pal b/graphics/pokemon/gen_4/arceus/poison/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/poison/shiny.pal
rename to graphics/pokemon/gen_4/arceus/poison/shiny.pal
diff --git a/graphics/pokemon/arceus/psychic/normal.pal b/graphics/pokemon/gen_4/arceus/psychic/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/psychic/normal.pal
rename to graphics/pokemon/gen_4/arceus/psychic/normal.pal
diff --git a/graphics/pokemon/arceus/psychic/shiny.pal b/graphics/pokemon/gen_4/arceus/psychic/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/psychic/shiny.pal
rename to graphics/pokemon/gen_4/arceus/psychic/shiny.pal
diff --git a/graphics/pokemon/arceus/rock/normal.pal b/graphics/pokemon/gen_4/arceus/rock/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/rock/normal.pal
rename to graphics/pokemon/gen_4/arceus/rock/normal.pal
diff --git a/graphics/pokemon/arceus/rock/shiny.pal b/graphics/pokemon/gen_4/arceus/rock/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/rock/shiny.pal
rename to graphics/pokemon/gen_4/arceus/rock/shiny.pal
diff --git a/graphics/pokemon/arceus/shiny.pal b/graphics/pokemon/gen_4/arceus/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/shiny.pal
rename to graphics/pokemon/gen_4/arceus/shiny.pal
diff --git a/graphics/pokemon/arceus/steel/normal.pal b/graphics/pokemon/gen_4/arceus/steel/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/steel/normal.pal
rename to graphics/pokemon/gen_4/arceus/steel/normal.pal
diff --git a/graphics/pokemon/arceus/steel/shiny.pal b/graphics/pokemon/gen_4/arceus/steel/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/steel/shiny.pal
rename to graphics/pokemon/gen_4/arceus/steel/shiny.pal
diff --git a/graphics/pokemon/arceus/water/normal.pal b/graphics/pokemon/gen_4/arceus/water/normal.pal
similarity index 100%
rename from graphics/pokemon/arceus/water/normal.pal
rename to graphics/pokemon/gen_4/arceus/water/normal.pal
diff --git a/graphics/pokemon/arceus/water/shiny.pal b/graphics/pokemon/gen_4/arceus/water/shiny.pal
similarity index 100%
rename from graphics/pokemon/arceus/water/shiny.pal
rename to graphics/pokemon/gen_4/arceus/water/shiny.pal
diff --git a/graphics/pokemon/azelf/anim_front.png b/graphics/pokemon/gen_4/azelf/anim_front.png
similarity index 100%
rename from graphics/pokemon/azelf/anim_front.png
rename to graphics/pokemon/gen_4/azelf/anim_front.png
diff --git a/graphics/pokemon/azelf/back.png b/graphics/pokemon/gen_4/azelf/back.png
similarity index 100%
rename from graphics/pokemon/azelf/back.png
rename to graphics/pokemon/gen_4/azelf/back.png
diff --git a/graphics/pokemon/azelf/footprint.png b/graphics/pokemon/gen_4/azelf/footprint.png
similarity index 100%
rename from graphics/pokemon/azelf/footprint.png
rename to graphics/pokemon/gen_4/azelf/footprint.png
diff --git a/graphics/pokemon/azelf/icon.png b/graphics/pokemon/gen_4/azelf/icon.png
similarity index 100%
rename from graphics/pokemon/azelf/icon.png
rename to graphics/pokemon/gen_4/azelf/icon.png
diff --git a/graphics/pokemon/azelf/normal.pal b/graphics/pokemon/gen_4/azelf/normal.pal
similarity index 100%
rename from graphics/pokemon/azelf/normal.pal
rename to graphics/pokemon/gen_4/azelf/normal.pal
diff --git a/graphics/pokemon/azelf/shiny.pal b/graphics/pokemon/gen_4/azelf/shiny.pal
similarity index 100%
rename from graphics/pokemon/azelf/shiny.pal
rename to graphics/pokemon/gen_4/azelf/shiny.pal
diff --git a/graphics/pokemon/bastiodon/anim_front.png b/graphics/pokemon/gen_4/bastiodon/anim_front.png
similarity index 100%
rename from graphics/pokemon/bastiodon/anim_front.png
rename to graphics/pokemon/gen_4/bastiodon/anim_front.png
diff --git a/graphics/pokemon/bastiodon/back.png b/graphics/pokemon/gen_4/bastiodon/back.png
similarity index 100%
rename from graphics/pokemon/bastiodon/back.png
rename to graphics/pokemon/gen_4/bastiodon/back.png
diff --git a/graphics/pokemon/bastiodon/footprint.png b/graphics/pokemon/gen_4/bastiodon/footprint.png
similarity index 100%
rename from graphics/pokemon/bastiodon/footprint.png
rename to graphics/pokemon/gen_4/bastiodon/footprint.png
diff --git a/graphics/pokemon/bastiodon/icon.png b/graphics/pokemon/gen_4/bastiodon/icon.png
similarity index 100%
rename from graphics/pokemon/bastiodon/icon.png
rename to graphics/pokemon/gen_4/bastiodon/icon.png
diff --git a/graphics/pokemon/bastiodon/normal.pal b/graphics/pokemon/gen_4/bastiodon/normal.pal
similarity index 100%
rename from graphics/pokemon/bastiodon/normal.pal
rename to graphics/pokemon/gen_4/bastiodon/normal.pal
diff --git a/graphics/pokemon/bastiodon/shiny.pal b/graphics/pokemon/gen_4/bastiodon/shiny.pal
similarity index 100%
rename from graphics/pokemon/bastiodon/shiny.pal
rename to graphics/pokemon/gen_4/bastiodon/shiny.pal
diff --git a/graphics/pokemon/bibarel/anim_front.png b/graphics/pokemon/gen_4/bibarel/anim_front.png
similarity index 100%
rename from graphics/pokemon/bibarel/anim_front.png
rename to graphics/pokemon/gen_4/bibarel/anim_front.png
diff --git a/graphics/pokemon/bibarel/anim_frontf.png b/graphics/pokemon/gen_4/bibarel/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/bibarel/anim_frontf.png
rename to graphics/pokemon/gen_4/bibarel/anim_frontf.png
diff --git a/graphics/pokemon/bibarel/back.png b/graphics/pokemon/gen_4/bibarel/back.png
similarity index 100%
rename from graphics/pokemon/bibarel/back.png
rename to graphics/pokemon/gen_4/bibarel/back.png
diff --git a/graphics/pokemon/bibarel/footprint.png b/graphics/pokemon/gen_4/bibarel/footprint.png
similarity index 100%
rename from graphics/pokemon/bibarel/footprint.png
rename to graphics/pokemon/gen_4/bibarel/footprint.png
diff --git a/graphics/pokemon/bibarel/icon.png b/graphics/pokemon/gen_4/bibarel/icon.png
similarity index 100%
rename from graphics/pokemon/bibarel/icon.png
rename to graphics/pokemon/gen_4/bibarel/icon.png
diff --git a/graphics/pokemon/bibarel/normal.pal b/graphics/pokemon/gen_4/bibarel/normal.pal
similarity index 100%
rename from graphics/pokemon/bibarel/normal.pal
rename to graphics/pokemon/gen_4/bibarel/normal.pal
diff --git a/graphics/pokemon/bibarel/shiny.pal b/graphics/pokemon/gen_4/bibarel/shiny.pal
similarity index 100%
rename from graphics/pokemon/bibarel/shiny.pal
rename to graphics/pokemon/gen_4/bibarel/shiny.pal
diff --git a/graphics/pokemon/bidoof/anim_front.png b/graphics/pokemon/gen_4/bidoof/anim_front.png
similarity index 100%
rename from graphics/pokemon/bidoof/anim_front.png
rename to graphics/pokemon/gen_4/bidoof/anim_front.png
diff --git a/graphics/pokemon/bidoof/anim_frontf.png b/graphics/pokemon/gen_4/bidoof/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/bidoof/anim_frontf.png
rename to graphics/pokemon/gen_4/bidoof/anim_frontf.png
diff --git a/graphics/pokemon/bidoof/back.png b/graphics/pokemon/gen_4/bidoof/back.png
similarity index 100%
rename from graphics/pokemon/bidoof/back.png
rename to graphics/pokemon/gen_4/bidoof/back.png
diff --git a/graphics/pokemon/bidoof/backf.png b/graphics/pokemon/gen_4/bidoof/backf.png
similarity index 100%
rename from graphics/pokemon/bidoof/backf.png
rename to graphics/pokemon/gen_4/bidoof/backf.png
diff --git a/graphics/pokemon/bidoof/footprint.png b/graphics/pokemon/gen_4/bidoof/footprint.png
similarity index 100%
rename from graphics/pokemon/bidoof/footprint.png
rename to graphics/pokemon/gen_4/bidoof/footprint.png
diff --git a/graphics/pokemon/bidoof/icon.png b/graphics/pokemon/gen_4/bidoof/icon.png
similarity index 100%
rename from graphics/pokemon/bidoof/icon.png
rename to graphics/pokemon/gen_4/bidoof/icon.png
diff --git a/graphics/pokemon/bidoof/normal.pal b/graphics/pokemon/gen_4/bidoof/normal.pal
similarity index 100%
rename from graphics/pokemon/bidoof/normal.pal
rename to graphics/pokemon/gen_4/bidoof/normal.pal
diff --git a/graphics/pokemon/bidoof/shiny.pal b/graphics/pokemon/gen_4/bidoof/shiny.pal
similarity index 100%
rename from graphics/pokemon/bidoof/shiny.pal
rename to graphics/pokemon/gen_4/bidoof/shiny.pal
diff --git a/graphics/pokemon/bonsly/anim_front.png b/graphics/pokemon/gen_4/bonsly/anim_front.png
similarity index 100%
rename from graphics/pokemon/bonsly/anim_front.png
rename to graphics/pokemon/gen_4/bonsly/anim_front.png
diff --git a/graphics/pokemon/bonsly/back.png b/graphics/pokemon/gen_4/bonsly/back.png
similarity index 100%
rename from graphics/pokemon/bonsly/back.png
rename to graphics/pokemon/gen_4/bonsly/back.png
diff --git a/graphics/pokemon/bonsly/footprint.png b/graphics/pokemon/gen_4/bonsly/footprint.png
similarity index 100%
rename from graphics/pokemon/bonsly/footprint.png
rename to graphics/pokemon/gen_4/bonsly/footprint.png
diff --git a/graphics/pokemon/bonsly/icon.png b/graphics/pokemon/gen_4/bonsly/icon.png
similarity index 100%
rename from graphics/pokemon/bonsly/icon.png
rename to graphics/pokemon/gen_4/bonsly/icon.png
diff --git a/graphics/pokemon/bonsly/normal.pal b/graphics/pokemon/gen_4/bonsly/normal.pal
similarity index 100%
rename from graphics/pokemon/bonsly/normal.pal
rename to graphics/pokemon/gen_4/bonsly/normal.pal
diff --git a/graphics/pokemon/bonsly/shiny.pal b/graphics/pokemon/gen_4/bonsly/shiny.pal
similarity index 100%
rename from graphics/pokemon/bonsly/shiny.pal
rename to graphics/pokemon/gen_4/bonsly/shiny.pal
diff --git a/graphics/pokemon/bronzong/anim_front.png b/graphics/pokemon/gen_4/bronzong/anim_front.png
similarity index 100%
rename from graphics/pokemon/bronzong/anim_front.png
rename to graphics/pokemon/gen_4/bronzong/anim_front.png
diff --git a/graphics/pokemon/bronzong/back.png b/graphics/pokemon/gen_4/bronzong/back.png
similarity index 100%
rename from graphics/pokemon/bronzong/back.png
rename to graphics/pokemon/gen_4/bronzong/back.png
diff --git a/graphics/pokemon/haunter/footprint.png b/graphics/pokemon/gen_4/bronzong/footprint.png
similarity index 100%
rename from graphics/pokemon/haunter/footprint.png
rename to graphics/pokemon/gen_4/bronzong/footprint.png
diff --git a/graphics/pokemon/bronzong/icon.png b/graphics/pokemon/gen_4/bronzong/icon.png
similarity index 100%
rename from graphics/pokemon/bronzong/icon.png
rename to graphics/pokemon/gen_4/bronzong/icon.png
diff --git a/graphics/pokemon/bronzong/normal.pal b/graphics/pokemon/gen_4/bronzong/normal.pal
similarity index 100%
rename from graphics/pokemon/bronzong/normal.pal
rename to graphics/pokemon/gen_4/bronzong/normal.pal
diff --git a/graphics/pokemon/bronzong/shiny.pal b/graphics/pokemon/gen_4/bronzong/shiny.pal
similarity index 100%
rename from graphics/pokemon/bronzong/shiny.pal
rename to graphics/pokemon/gen_4/bronzong/shiny.pal
diff --git a/graphics/pokemon/bronzor/anim_front.png b/graphics/pokemon/gen_4/bronzor/anim_front.png
similarity index 100%
rename from graphics/pokemon/bronzor/anim_front.png
rename to graphics/pokemon/gen_4/bronzor/anim_front.png
diff --git a/graphics/pokemon/bronzor/back.png b/graphics/pokemon/gen_4/bronzor/back.png
similarity index 100%
rename from graphics/pokemon/bronzor/back.png
rename to graphics/pokemon/gen_4/bronzor/back.png
diff --git a/graphics/pokemon/honedge/footprint.png b/graphics/pokemon/gen_4/bronzor/footprint.png
similarity index 100%
rename from graphics/pokemon/honedge/footprint.png
rename to graphics/pokemon/gen_4/bronzor/footprint.png
diff --git a/graphics/pokemon/bronzor/icon.png b/graphics/pokemon/gen_4/bronzor/icon.png
similarity index 100%
rename from graphics/pokemon/bronzor/icon.png
rename to graphics/pokemon/gen_4/bronzor/icon.png
diff --git a/graphics/pokemon/bronzor/normal.pal b/graphics/pokemon/gen_4/bronzor/normal.pal
similarity index 100%
rename from graphics/pokemon/bronzor/normal.pal
rename to graphics/pokemon/gen_4/bronzor/normal.pal
diff --git a/graphics/pokemon/bronzor/shiny.pal b/graphics/pokemon/gen_4/bronzor/shiny.pal
similarity index 100%
rename from graphics/pokemon/bronzor/shiny.pal
rename to graphics/pokemon/gen_4/bronzor/shiny.pal
diff --git a/graphics/pokemon/budew/anim_front.png b/graphics/pokemon/gen_4/budew/anim_front.png
similarity index 100%
rename from graphics/pokemon/budew/anim_front.png
rename to graphics/pokemon/gen_4/budew/anim_front.png
diff --git a/graphics/pokemon/budew/back.png b/graphics/pokemon/gen_4/budew/back.png
similarity index 100%
rename from graphics/pokemon/budew/back.png
rename to graphics/pokemon/gen_4/budew/back.png
diff --git a/graphics/pokemon/buzzwole/footprint.png b/graphics/pokemon/gen_4/budew/footprint.png
similarity index 100%
rename from graphics/pokemon/buzzwole/footprint.png
rename to graphics/pokemon/gen_4/budew/footprint.png
diff --git a/graphics/pokemon/budew/icon.png b/graphics/pokemon/gen_4/budew/icon.png
similarity index 100%
rename from graphics/pokemon/budew/icon.png
rename to graphics/pokemon/gen_4/budew/icon.png
diff --git a/graphics/pokemon/budew/normal.pal b/graphics/pokemon/gen_4/budew/normal.pal
similarity index 100%
rename from graphics/pokemon/budew/normal.pal
rename to graphics/pokemon/gen_4/budew/normal.pal
diff --git a/graphics/pokemon/budew/shiny.pal b/graphics/pokemon/gen_4/budew/shiny.pal
similarity index 100%
rename from graphics/pokemon/budew/shiny.pal
rename to graphics/pokemon/gen_4/budew/shiny.pal
diff --git a/graphics/pokemon/buizel/anim_front.png b/graphics/pokemon/gen_4/buizel/anim_front.png
similarity index 100%
rename from graphics/pokemon/buizel/anim_front.png
rename to graphics/pokemon/gen_4/buizel/anim_front.png
diff --git a/graphics/pokemon/buizel/back.png b/graphics/pokemon/gen_4/buizel/back.png
similarity index 100%
rename from graphics/pokemon/buizel/back.png
rename to graphics/pokemon/gen_4/buizel/back.png
diff --git a/graphics/pokemon/buizel/backf.png b/graphics/pokemon/gen_4/buizel/backf.png
similarity index 100%
rename from graphics/pokemon/buizel/backf.png
rename to graphics/pokemon/gen_4/buizel/backf.png
diff --git a/graphics/pokemon/buizel/footprint.png b/graphics/pokemon/gen_4/buizel/footprint.png
similarity index 100%
rename from graphics/pokemon/buizel/footprint.png
rename to graphics/pokemon/gen_4/buizel/footprint.png
diff --git a/graphics/pokemon/buizel/icon.png b/graphics/pokemon/gen_4/buizel/icon.png
similarity index 100%
rename from graphics/pokemon/buizel/icon.png
rename to graphics/pokemon/gen_4/buizel/icon.png
diff --git a/graphics/pokemon/buizel/normal.pal b/graphics/pokemon/gen_4/buizel/normal.pal
similarity index 100%
rename from graphics/pokemon/buizel/normal.pal
rename to graphics/pokemon/gen_4/buizel/normal.pal
diff --git a/graphics/pokemon/buizel/shiny.pal b/graphics/pokemon/gen_4/buizel/shiny.pal
similarity index 100%
rename from graphics/pokemon/buizel/shiny.pal
rename to graphics/pokemon/gen_4/buizel/shiny.pal
diff --git a/graphics/pokemon/buneary/anim_front.png b/graphics/pokemon/gen_4/buneary/anim_front.png
similarity index 100%
rename from graphics/pokemon/buneary/anim_front.png
rename to graphics/pokemon/gen_4/buneary/anim_front.png
diff --git a/graphics/pokemon/buneary/back.png b/graphics/pokemon/gen_4/buneary/back.png
similarity index 100%
rename from graphics/pokemon/buneary/back.png
rename to graphics/pokemon/gen_4/buneary/back.png
diff --git a/graphics/pokemon/buneary/footprint.png b/graphics/pokemon/gen_4/buneary/footprint.png
similarity index 100%
rename from graphics/pokemon/buneary/footprint.png
rename to graphics/pokemon/gen_4/buneary/footprint.png
diff --git a/graphics/pokemon/buneary/icon.png b/graphics/pokemon/gen_4/buneary/icon.png
similarity index 100%
rename from graphics/pokemon/buneary/icon.png
rename to graphics/pokemon/gen_4/buneary/icon.png
diff --git a/graphics/pokemon/buneary/normal.pal b/graphics/pokemon/gen_4/buneary/normal.pal
similarity index 100%
rename from graphics/pokemon/buneary/normal.pal
rename to graphics/pokemon/gen_4/buneary/normal.pal
diff --git a/graphics/pokemon/buneary/shiny.pal b/graphics/pokemon/gen_4/buneary/shiny.pal
similarity index 100%
rename from graphics/pokemon/buneary/shiny.pal
rename to graphics/pokemon/gen_4/buneary/shiny.pal
diff --git a/graphics/pokemon/burmy/anim_front.png b/graphics/pokemon/gen_4/burmy/anim_front.png
similarity index 100%
rename from graphics/pokemon/burmy/anim_front.png
rename to graphics/pokemon/gen_4/burmy/anim_front.png
diff --git a/graphics/pokemon/burmy/back.png b/graphics/pokemon/gen_4/burmy/back.png
similarity index 100%
rename from graphics/pokemon/burmy/back.png
rename to graphics/pokemon/gen_4/burmy/back.png
diff --git a/graphics/pokemon/burmy/icon.png b/graphics/pokemon/gen_4/burmy/icon.png
similarity index 100%
rename from graphics/pokemon/burmy/icon.png
rename to graphics/pokemon/gen_4/burmy/icon.png
diff --git a/graphics/pokemon/burmy/normal.pal b/graphics/pokemon/gen_4/burmy/normal.pal
similarity index 100%
rename from graphics/pokemon/burmy/normal.pal
rename to graphics/pokemon/gen_4/burmy/normal.pal
diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/gen_4/burmy/plant/footprint.png
similarity index 100%
rename from graphics/pokemon/hoopa/footprint.png
rename to graphics/pokemon/gen_4/burmy/plant/footprint.png
diff --git a/graphics/pokemon/burmy/sandy_cloak/anim_front.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.png
similarity index 100%
rename from graphics/pokemon/burmy/sandy_cloak/anim_front.png
rename to graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.png
diff --git a/graphics/pokemon/burmy/sandy_cloak/back.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/back.png
similarity index 100%
rename from graphics/pokemon/burmy/sandy_cloak/back.png
rename to graphics/pokemon/gen_4/burmy/sandy_cloak/back.png
diff --git a/graphics/pokemon/burmy/sandy_cloak/icon.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/icon.png
similarity index 100%
rename from graphics/pokemon/burmy/sandy_cloak/icon.png
rename to graphics/pokemon/gen_4/burmy/sandy_cloak/icon.png
diff --git a/graphics/pokemon/burmy/sandy_cloak/normal.pal b/graphics/pokemon/gen_4/burmy/sandy_cloak/normal.pal
similarity index 100%
rename from graphics/pokemon/burmy/sandy_cloak/normal.pal
rename to graphics/pokemon/gen_4/burmy/sandy_cloak/normal.pal
diff --git a/graphics/pokemon/burmy/sandy_cloak/shiny.pal b/graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.pal
similarity index 100%
rename from graphics/pokemon/burmy/sandy_cloak/shiny.pal
rename to graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.pal
diff --git a/graphics/pokemon/burmy/shiny.pal b/graphics/pokemon/gen_4/burmy/shiny.pal
similarity index 100%
rename from graphics/pokemon/burmy/shiny.pal
rename to graphics/pokemon/gen_4/burmy/shiny.pal
diff --git a/graphics/pokemon/burmy/trash_cloak/anim_front.png b/graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.png
similarity index 100%
rename from graphics/pokemon/burmy/trash_cloak/anim_front.png
rename to graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.png
diff --git a/graphics/pokemon/burmy/trash_cloak/back.png b/graphics/pokemon/gen_4/burmy/trash_cloak/back.png
similarity index 100%
rename from graphics/pokemon/burmy/trash_cloak/back.png
rename to graphics/pokemon/gen_4/burmy/trash_cloak/back.png
diff --git a/graphics/pokemon/burmy/trash_cloak/icon.png b/graphics/pokemon/gen_4/burmy/trash_cloak/icon.png
similarity index 100%
rename from graphics/pokemon/burmy/trash_cloak/icon.png
rename to graphics/pokemon/gen_4/burmy/trash_cloak/icon.png
diff --git a/graphics/pokemon/burmy/trash_cloak/normal.pal b/graphics/pokemon/gen_4/burmy/trash_cloak/normal.pal
similarity index 100%
rename from graphics/pokemon/burmy/trash_cloak/normal.pal
rename to graphics/pokemon/gen_4/burmy/trash_cloak/normal.pal
diff --git a/graphics/pokemon/burmy/trash_cloak/shiny.pal b/graphics/pokemon/gen_4/burmy/trash_cloak/shiny.pal
similarity index 100%
rename from graphics/pokemon/burmy/trash_cloak/shiny.pal
rename to graphics/pokemon/gen_4/burmy/trash_cloak/shiny.pal
diff --git a/graphics/pokemon/carnivine/anim_front.png b/graphics/pokemon/gen_4/carnivine/anim_front.png
similarity index 100%
rename from graphics/pokemon/carnivine/anim_front.png
rename to graphics/pokemon/gen_4/carnivine/anim_front.png
diff --git a/graphics/pokemon/carnivine/back.png b/graphics/pokemon/gen_4/carnivine/back.png
similarity index 100%
rename from graphics/pokemon/carnivine/back.png
rename to graphics/pokemon/gen_4/carnivine/back.png
diff --git a/graphics/pokemon/horsea/footprint.png b/graphics/pokemon/gen_4/carnivine/footprint.png
similarity index 100%
rename from graphics/pokemon/horsea/footprint.png
rename to graphics/pokemon/gen_4/carnivine/footprint.png
diff --git a/graphics/pokemon/carnivine/icon.png b/graphics/pokemon/gen_4/carnivine/icon.png
similarity index 100%
rename from graphics/pokemon/carnivine/icon.png
rename to graphics/pokemon/gen_4/carnivine/icon.png
diff --git a/graphics/pokemon/carnivine/normal.pal b/graphics/pokemon/gen_4/carnivine/normal.pal
similarity index 100%
rename from graphics/pokemon/carnivine/normal.pal
rename to graphics/pokemon/gen_4/carnivine/normal.pal
diff --git a/graphics/pokemon/carnivine/shiny.pal b/graphics/pokemon/gen_4/carnivine/shiny.pal
similarity index 100%
rename from graphics/pokemon/carnivine/shiny.pal
rename to graphics/pokemon/gen_4/carnivine/shiny.pal
diff --git a/graphics/pokemon/chatot/anim_front.png b/graphics/pokemon/gen_4/chatot/anim_front.png
similarity index 100%
rename from graphics/pokemon/chatot/anim_front.png
rename to graphics/pokemon/gen_4/chatot/anim_front.png
diff --git a/graphics/pokemon/chatot/back.png b/graphics/pokemon/gen_4/chatot/back.png
similarity index 100%
rename from graphics/pokemon/chatot/back.png
rename to graphics/pokemon/gen_4/chatot/back.png
diff --git a/graphics/pokemon/chatot/footprint.png b/graphics/pokemon/gen_4/chatot/footprint.png
similarity index 100%
rename from graphics/pokemon/chatot/footprint.png
rename to graphics/pokemon/gen_4/chatot/footprint.png
diff --git a/graphics/pokemon/chatot/icon.png b/graphics/pokemon/gen_4/chatot/icon.png
similarity index 100%
rename from graphics/pokemon/chatot/icon.png
rename to graphics/pokemon/gen_4/chatot/icon.png
diff --git a/graphics/pokemon/chatot/normal.pal b/graphics/pokemon/gen_4/chatot/normal.pal
similarity index 100%
rename from graphics/pokemon/chatot/normal.pal
rename to graphics/pokemon/gen_4/chatot/normal.pal
diff --git a/graphics/pokemon/chatot/shiny.pal b/graphics/pokemon/gen_4/chatot/shiny.pal
similarity index 100%
rename from graphics/pokemon/chatot/shiny.pal
rename to graphics/pokemon/gen_4/chatot/shiny.pal
diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/gen_4/cherrim/anim_front.png
similarity index 100%
rename from graphics/pokemon/cherrim/anim_front.png
rename to graphics/pokemon/gen_4/cherrim/anim_front.png
diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/gen_4/cherrim/back.png
similarity index 100%
rename from graphics/pokemon/cherrim/back.png
rename to graphics/pokemon/gen_4/cherrim/back.png
diff --git a/graphics/pokemon/calyrex/footprint.png b/graphics/pokemon/gen_4/cherrim/footprint.png
similarity index 100%
rename from graphics/pokemon/calyrex/footprint.png
rename to graphics/pokemon/gen_4/cherrim/footprint.png
diff --git a/graphics/pokemon/cherrim/icon.png b/graphics/pokemon/gen_4/cherrim/icon.png
similarity index 100%
rename from graphics/pokemon/cherrim/icon.png
rename to graphics/pokemon/gen_4/cherrim/icon.png
diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/gen_4/cherrim/normal.pal
similarity index 100%
rename from graphics/pokemon/cherrim/normal.pal
rename to graphics/pokemon/gen_4/cherrim/normal.pal
diff --git a/graphics/pokemon/cherrim/shiny.pal b/graphics/pokemon/gen_4/cherrim/shiny.pal
similarity index 100%
rename from graphics/pokemon/cherrim/shiny.pal
rename to graphics/pokemon/gen_4/cherrim/shiny.pal
diff --git a/graphics/pokemon/cherrim/sunshine/anim_front.png b/graphics/pokemon/gen_4/cherrim/sunshine/anim_front.png
similarity index 100%
rename from graphics/pokemon/cherrim/sunshine/anim_front.png
rename to graphics/pokemon/gen_4/cherrim/sunshine/anim_front.png
diff --git a/graphics/pokemon/cherrim/sunshine/back.png b/graphics/pokemon/gen_4/cherrim/sunshine/back.png
similarity index 100%
rename from graphics/pokemon/cherrim/sunshine/back.png
rename to graphics/pokemon/gen_4/cherrim/sunshine/back.png
diff --git a/graphics/pokemon/cherrim/sunshine/icon.png b/graphics/pokemon/gen_4/cherrim/sunshine/icon.png
similarity index 100%
rename from graphics/pokemon/cherrim/sunshine/icon.png
rename to graphics/pokemon/gen_4/cherrim/sunshine/icon.png
diff --git a/graphics/pokemon/cherrim/sunshine/normal.pal b/graphics/pokemon/gen_4/cherrim/sunshine/normal.pal
similarity index 100%
rename from graphics/pokemon/cherrim/sunshine/normal.pal
rename to graphics/pokemon/gen_4/cherrim/sunshine/normal.pal
diff --git a/graphics/pokemon/cherrim/sunshine/shiny.pal b/graphics/pokemon/gen_4/cherrim/sunshine/shiny.pal
similarity index 100%
rename from graphics/pokemon/cherrim/sunshine/shiny.pal
rename to graphics/pokemon/gen_4/cherrim/sunshine/shiny.pal
diff --git a/graphics/pokemon/cherubi/anim_front.png b/graphics/pokemon/gen_4/cherubi/anim_front.png
similarity index 100%
rename from graphics/pokemon/cherubi/anim_front.png
rename to graphics/pokemon/gen_4/cherubi/anim_front.png
diff --git a/graphics/pokemon/cherubi/back.png b/graphics/pokemon/gen_4/cherubi/back.png
similarity index 100%
rename from graphics/pokemon/cherubi/back.png
rename to graphics/pokemon/gen_4/cherubi/back.png
diff --git a/graphics/pokemon/caterpie/footprint.png b/graphics/pokemon/gen_4/cherubi/footprint.png
similarity index 100%
rename from graphics/pokemon/caterpie/footprint.png
rename to graphics/pokemon/gen_4/cherubi/footprint.png
diff --git a/graphics/pokemon/cherubi/icon.png b/graphics/pokemon/gen_4/cherubi/icon.png
similarity index 100%
rename from graphics/pokemon/cherubi/icon.png
rename to graphics/pokemon/gen_4/cherubi/icon.png
diff --git a/graphics/pokemon/cherubi/normal.pal b/graphics/pokemon/gen_4/cherubi/normal.pal
similarity index 100%
rename from graphics/pokemon/cherubi/normal.pal
rename to graphics/pokemon/gen_4/cherubi/normal.pal
diff --git a/graphics/pokemon/cherubi/shiny.pal b/graphics/pokemon/gen_4/cherubi/shiny.pal
similarity index 100%
rename from graphics/pokemon/cherubi/shiny.pal
rename to graphics/pokemon/gen_4/cherubi/shiny.pal
diff --git a/graphics/pokemon/chimchar/anim_front.png b/graphics/pokemon/gen_4/chimchar/anim_front.png
similarity index 100%
rename from graphics/pokemon/chimchar/anim_front.png
rename to graphics/pokemon/gen_4/chimchar/anim_front.png
diff --git a/graphics/pokemon/chimchar/back.png b/graphics/pokemon/gen_4/chimchar/back.png
similarity index 100%
rename from graphics/pokemon/chimchar/back.png
rename to graphics/pokemon/gen_4/chimchar/back.png
diff --git a/graphics/pokemon/chimchar/footprint.png b/graphics/pokemon/gen_4/chimchar/footprint.png
similarity index 100%
rename from graphics/pokemon/chimchar/footprint.png
rename to graphics/pokemon/gen_4/chimchar/footprint.png
diff --git a/graphics/pokemon/chimchar/icon.png b/graphics/pokemon/gen_4/chimchar/icon.png
similarity index 100%
rename from graphics/pokemon/chimchar/icon.png
rename to graphics/pokemon/gen_4/chimchar/icon.png
diff --git a/graphics/pokemon/chimchar/normal.pal b/graphics/pokemon/gen_4/chimchar/normal.pal
similarity index 100%
rename from graphics/pokemon/chimchar/normal.pal
rename to graphics/pokemon/gen_4/chimchar/normal.pal
diff --git a/graphics/pokemon/chimchar/shiny.pal b/graphics/pokemon/gen_4/chimchar/shiny.pal
similarity index 100%
rename from graphics/pokemon/chimchar/shiny.pal
rename to graphics/pokemon/gen_4/chimchar/shiny.pal
diff --git a/graphics/pokemon/chingling/anim_front.png b/graphics/pokemon/gen_4/chingling/anim_front.png
similarity index 100%
rename from graphics/pokemon/chingling/anim_front.png
rename to graphics/pokemon/gen_4/chingling/anim_front.png
diff --git a/graphics/pokemon/chingling/back.png b/graphics/pokemon/gen_4/chingling/back.png
similarity index 100%
rename from graphics/pokemon/chingling/back.png
rename to graphics/pokemon/gen_4/chingling/back.png
diff --git a/graphics/pokemon/chingling/footprint.png b/graphics/pokemon/gen_4/chingling/footprint.png
similarity index 100%
rename from graphics/pokemon/chingling/footprint.png
rename to graphics/pokemon/gen_4/chingling/footprint.png
diff --git a/graphics/pokemon/chingling/icon.png b/graphics/pokemon/gen_4/chingling/icon.png
similarity index 100%
rename from graphics/pokemon/chingling/icon.png
rename to graphics/pokemon/gen_4/chingling/icon.png
diff --git a/graphics/pokemon/chingling/normal.pal b/graphics/pokemon/gen_4/chingling/normal.pal
similarity index 100%
rename from graphics/pokemon/chingling/normal.pal
rename to graphics/pokemon/gen_4/chingling/normal.pal
diff --git a/graphics/pokemon/chingling/shiny.pal b/graphics/pokemon/gen_4/chingling/shiny.pal
similarity index 100%
rename from graphics/pokemon/chingling/shiny.pal
rename to graphics/pokemon/gen_4/chingling/shiny.pal
diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/gen_4/combee/anim_front.png
similarity index 100%
rename from graphics/pokemon/combee/anim_front.png
rename to graphics/pokemon/gen_4/combee/anim_front.png
diff --git a/graphics/pokemon/combee/back.png b/graphics/pokemon/gen_4/combee/back.png
similarity index 100%
rename from graphics/pokemon/combee/back.png
rename to graphics/pokemon/gen_4/combee/back.png
diff --git a/graphics/pokemon/huntail/footprint.png b/graphics/pokemon/gen_4/combee/footprint.png
similarity index 100%
rename from graphics/pokemon/huntail/footprint.png
rename to graphics/pokemon/gen_4/combee/footprint.png
diff --git a/graphics/pokemon/combee/icon.png b/graphics/pokemon/gen_4/combee/icon.png
similarity index 100%
rename from graphics/pokemon/combee/icon.png
rename to graphics/pokemon/gen_4/combee/icon.png
diff --git a/graphics/pokemon/combee/normal.pal b/graphics/pokemon/gen_4/combee/normal.pal
similarity index 100%
rename from graphics/pokemon/combee/normal.pal
rename to graphics/pokemon/gen_4/combee/normal.pal
diff --git a/graphics/pokemon/combee/normalf.pal b/graphics/pokemon/gen_4/combee/normalf.pal
similarity index 100%
rename from graphics/pokemon/combee/normalf.pal
rename to graphics/pokemon/gen_4/combee/normalf.pal
diff --git a/graphics/pokemon/combee/shiny.pal b/graphics/pokemon/gen_4/combee/shiny.pal
similarity index 100%
rename from graphics/pokemon/combee/shiny.pal
rename to graphics/pokemon/gen_4/combee/shiny.pal
diff --git a/graphics/pokemon/combee/shinyf.pal b/graphics/pokemon/gen_4/combee/shinyf.pal
similarity index 100%
rename from graphics/pokemon/combee/shinyf.pal
rename to graphics/pokemon/gen_4/combee/shinyf.pal
diff --git a/graphics/pokemon/cranidos/anim_front.png b/graphics/pokemon/gen_4/cranidos/anim_front.png
similarity index 100%
rename from graphics/pokemon/cranidos/anim_front.png
rename to graphics/pokemon/gen_4/cranidos/anim_front.png
diff --git a/graphics/pokemon/cranidos/back.png b/graphics/pokemon/gen_4/cranidos/back.png
similarity index 100%
rename from graphics/pokemon/cranidos/back.png
rename to graphics/pokemon/gen_4/cranidos/back.png
diff --git a/graphics/pokemon/cranidos/footprint.png b/graphics/pokemon/gen_4/cranidos/footprint.png
similarity index 100%
rename from graphics/pokemon/cranidos/footprint.png
rename to graphics/pokemon/gen_4/cranidos/footprint.png
diff --git a/graphics/pokemon/cranidos/icon.png b/graphics/pokemon/gen_4/cranidos/icon.png
similarity index 100%
rename from graphics/pokemon/cranidos/icon.png
rename to graphics/pokemon/gen_4/cranidos/icon.png
diff --git a/graphics/pokemon/cranidos/normal.pal b/graphics/pokemon/gen_4/cranidos/normal.pal
similarity index 100%
rename from graphics/pokemon/cranidos/normal.pal
rename to graphics/pokemon/gen_4/cranidos/normal.pal
diff --git a/graphics/pokemon/cranidos/shiny.pal b/graphics/pokemon/gen_4/cranidos/shiny.pal
similarity index 100%
rename from graphics/pokemon/cranidos/shiny.pal
rename to graphics/pokemon/gen_4/cranidos/shiny.pal
diff --git a/graphics/pokemon/cresselia/anim_front.png b/graphics/pokemon/gen_4/cresselia/anim_front.png
similarity index 100%
rename from graphics/pokemon/cresselia/anim_front.png
rename to graphics/pokemon/gen_4/cresselia/anim_front.png
diff --git a/graphics/pokemon/cresselia/back.png b/graphics/pokemon/gen_4/cresselia/back.png
similarity index 100%
rename from graphics/pokemon/cresselia/back.png
rename to graphics/pokemon/gen_4/cresselia/back.png
diff --git a/graphics/pokemon/hydreigon/footprint.png b/graphics/pokemon/gen_4/cresselia/footprint.png
similarity index 100%
rename from graphics/pokemon/hydreigon/footprint.png
rename to graphics/pokemon/gen_4/cresselia/footprint.png
diff --git a/graphics/pokemon/cresselia/icon.png b/graphics/pokemon/gen_4/cresselia/icon.png
similarity index 100%
rename from graphics/pokemon/cresselia/icon.png
rename to graphics/pokemon/gen_4/cresselia/icon.png
diff --git a/graphics/pokemon/cresselia/normal.pal b/graphics/pokemon/gen_4/cresselia/normal.pal
similarity index 100%
rename from graphics/pokemon/cresselia/normal.pal
rename to graphics/pokemon/gen_4/cresselia/normal.pal
diff --git a/graphics/pokemon/cresselia/shiny.pal b/graphics/pokemon/gen_4/cresselia/shiny.pal
similarity index 100%
rename from graphics/pokemon/cresselia/shiny.pal
rename to graphics/pokemon/gen_4/cresselia/shiny.pal
diff --git a/graphics/pokemon/croagunk/anim_front.png b/graphics/pokemon/gen_4/croagunk/anim_front.png
similarity index 100%
rename from graphics/pokemon/croagunk/anim_front.png
rename to graphics/pokemon/gen_4/croagunk/anim_front.png
diff --git a/graphics/pokemon/croagunk/anim_frontf.png b/graphics/pokemon/gen_4/croagunk/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/croagunk/anim_frontf.png
rename to graphics/pokemon/gen_4/croagunk/anim_frontf.png
diff --git a/graphics/pokemon/croagunk/back.png b/graphics/pokemon/gen_4/croagunk/back.png
similarity index 100%
rename from graphics/pokemon/croagunk/back.png
rename to graphics/pokemon/gen_4/croagunk/back.png
diff --git a/graphics/pokemon/croagunk/backf.png b/graphics/pokemon/gen_4/croagunk/backf.png
similarity index 100%
rename from graphics/pokemon/croagunk/backf.png
rename to graphics/pokemon/gen_4/croagunk/backf.png
diff --git a/graphics/pokemon/croagunk/footprint.png b/graphics/pokemon/gen_4/croagunk/footprint.png
similarity index 100%
rename from graphics/pokemon/croagunk/footprint.png
rename to graphics/pokemon/gen_4/croagunk/footprint.png
diff --git a/graphics/pokemon/croagunk/icon.png b/graphics/pokemon/gen_4/croagunk/icon.png
similarity index 100%
rename from graphics/pokemon/croagunk/icon.png
rename to graphics/pokemon/gen_4/croagunk/icon.png
diff --git a/graphics/pokemon/croagunk/normal.pal b/graphics/pokemon/gen_4/croagunk/normal.pal
similarity index 100%
rename from graphics/pokemon/croagunk/normal.pal
rename to graphics/pokemon/gen_4/croagunk/normal.pal
diff --git a/graphics/pokemon/croagunk/shiny.pal b/graphics/pokemon/gen_4/croagunk/shiny.pal
similarity index 100%
rename from graphics/pokemon/croagunk/shiny.pal
rename to graphics/pokemon/gen_4/croagunk/shiny.pal
diff --git a/graphics/pokemon/darkrai/anim_front.png b/graphics/pokemon/gen_4/darkrai/anim_front.png
similarity index 100%
rename from graphics/pokemon/darkrai/anim_front.png
rename to graphics/pokemon/gen_4/darkrai/anim_front.png
diff --git a/graphics/pokemon/darkrai/back.png b/graphics/pokemon/gen_4/darkrai/back.png
similarity index 100%
rename from graphics/pokemon/darkrai/back.png
rename to graphics/pokemon/gen_4/darkrai/back.png
diff --git a/graphics/pokemon/centiskorch/footprint.png b/graphics/pokemon/gen_4/darkrai/footprint.png
similarity index 100%
rename from graphics/pokemon/centiskorch/footprint.png
rename to graphics/pokemon/gen_4/darkrai/footprint.png
diff --git a/graphics/pokemon/darkrai/icon.png b/graphics/pokemon/gen_4/darkrai/icon.png
similarity index 100%
rename from graphics/pokemon/darkrai/icon.png
rename to graphics/pokemon/gen_4/darkrai/icon.png
diff --git a/graphics/pokemon/darkrai/normal.pal b/graphics/pokemon/gen_4/darkrai/normal.pal
similarity index 100%
rename from graphics/pokemon/darkrai/normal.pal
rename to graphics/pokemon/gen_4/darkrai/normal.pal
diff --git a/graphics/pokemon/darkrai/shiny.pal b/graphics/pokemon/gen_4/darkrai/shiny.pal
similarity index 100%
rename from graphics/pokemon/darkrai/shiny.pal
rename to graphics/pokemon/gen_4/darkrai/shiny.pal
diff --git a/graphics/pokemon/dialga/anim_front.png b/graphics/pokemon/gen_4/dialga/anim_front.png
similarity index 100%
rename from graphics/pokemon/dialga/anim_front.png
rename to graphics/pokemon/gen_4/dialga/anim_front.png
diff --git a/graphics/pokemon/dialga/back.png b/graphics/pokemon/gen_4/dialga/back.png
similarity index 100%
rename from graphics/pokemon/dialga/back.png
rename to graphics/pokemon/gen_4/dialga/back.png
diff --git a/graphics/pokemon/dialga/footprint.png b/graphics/pokemon/gen_4/dialga/footprint.png
similarity index 100%
rename from graphics/pokemon/dialga/footprint.png
rename to graphics/pokemon/gen_4/dialga/footprint.png
diff --git a/graphics/pokemon/dialga/icon.png b/graphics/pokemon/gen_4/dialga/icon.png
similarity index 100%
rename from graphics/pokemon/dialga/icon.png
rename to graphics/pokemon/gen_4/dialga/icon.png
diff --git a/graphics/pokemon/dialga/normal.pal b/graphics/pokemon/gen_4/dialga/normal.pal
similarity index 100%
rename from graphics/pokemon/dialga/normal.pal
rename to graphics/pokemon/gen_4/dialga/normal.pal
diff --git a/graphics/pokemon/dialga/origin/back.png b/graphics/pokemon/gen_4/dialga/origin/back.png
similarity index 100%
rename from graphics/pokemon/dialga/origin/back.png
rename to graphics/pokemon/gen_4/dialga/origin/back.png
diff --git a/graphics/pokemon/dialga/origin/front.png b/graphics/pokemon/gen_4/dialga/origin/front.png
similarity index 100%
rename from graphics/pokemon/dialga/origin/front.png
rename to graphics/pokemon/gen_4/dialga/origin/front.png
diff --git a/graphics/pokemon/dialga/origin/icon.png b/graphics/pokemon/gen_4/dialga/origin/icon.png
similarity index 100%
rename from graphics/pokemon/dialga/origin/icon.png
rename to graphics/pokemon/gen_4/dialga/origin/icon.png
diff --git a/graphics/pokemon/dialga/origin/normal.pal b/graphics/pokemon/gen_4/dialga/origin/normal.pal
similarity index 100%
rename from graphics/pokemon/dialga/origin/normal.pal
rename to graphics/pokemon/gen_4/dialga/origin/normal.pal
diff --git a/graphics/pokemon/dialga/origin/shiny.pal b/graphics/pokemon/gen_4/dialga/origin/shiny.pal
similarity index 100%
rename from graphics/pokemon/dialga/origin/shiny.pal
rename to graphics/pokemon/gen_4/dialga/origin/shiny.pal
diff --git a/graphics/pokemon/dialga/shiny.pal b/graphics/pokemon/gen_4/dialga/shiny.pal
similarity index 100%
rename from graphics/pokemon/dialga/shiny.pal
rename to graphics/pokemon/gen_4/dialga/shiny.pal
diff --git a/graphics/pokemon/drapion/anim_front.png b/graphics/pokemon/gen_4/drapion/anim_front.png
similarity index 100%
rename from graphics/pokemon/drapion/anim_front.png
rename to graphics/pokemon/gen_4/drapion/anim_front.png
diff --git a/graphics/pokemon/drapion/back.png b/graphics/pokemon/gen_4/drapion/back.png
similarity index 100%
rename from graphics/pokemon/drapion/back.png
rename to graphics/pokemon/gen_4/drapion/back.png
diff --git a/graphics/pokemon/espurr/footprint.png b/graphics/pokemon/gen_4/drapion/footprint.png
similarity index 100%
rename from graphics/pokemon/espurr/footprint.png
rename to graphics/pokemon/gen_4/drapion/footprint.png
diff --git a/graphics/pokemon/drapion/icon.png b/graphics/pokemon/gen_4/drapion/icon.png
similarity index 100%
rename from graphics/pokemon/drapion/icon.png
rename to graphics/pokemon/gen_4/drapion/icon.png
diff --git a/graphics/pokemon/drapion/normal.pal b/graphics/pokemon/gen_4/drapion/normal.pal
similarity index 100%
rename from graphics/pokemon/drapion/normal.pal
rename to graphics/pokemon/gen_4/drapion/normal.pal
diff --git a/graphics/pokemon/drapion/shiny.pal b/graphics/pokemon/gen_4/drapion/shiny.pal
similarity index 100%
rename from graphics/pokemon/drapion/shiny.pal
rename to graphics/pokemon/gen_4/drapion/shiny.pal
diff --git a/graphics/pokemon/drifblim/anim_front.png b/graphics/pokemon/gen_4/drifblim/anim_front.png
similarity index 100%
rename from graphics/pokemon/drifblim/anim_front.png
rename to graphics/pokemon/gen_4/drifblim/anim_front.png
diff --git a/graphics/pokemon/drifblim/back.png b/graphics/pokemon/gen_4/drifblim/back.png
similarity index 100%
rename from graphics/pokemon/drifblim/back.png
rename to graphics/pokemon/gen_4/drifblim/back.png
diff --git a/graphics/pokemon/inkay/footprint.png b/graphics/pokemon/gen_4/drifblim/footprint.png
similarity index 100%
rename from graphics/pokemon/inkay/footprint.png
rename to graphics/pokemon/gen_4/drifblim/footprint.png
diff --git a/graphics/pokemon/drifblim/icon.png b/graphics/pokemon/gen_4/drifblim/icon.png
similarity index 100%
rename from graphics/pokemon/drifblim/icon.png
rename to graphics/pokemon/gen_4/drifblim/icon.png
diff --git a/graphics/pokemon/drifblim/normal.pal b/graphics/pokemon/gen_4/drifblim/normal.pal
similarity index 100%
rename from graphics/pokemon/drifblim/normal.pal
rename to graphics/pokemon/gen_4/drifblim/normal.pal
diff --git a/graphics/pokemon/drifblim/shiny.pal b/graphics/pokemon/gen_4/drifblim/shiny.pal
similarity index 100%
rename from graphics/pokemon/drifblim/shiny.pal
rename to graphics/pokemon/gen_4/drifblim/shiny.pal
diff --git a/graphics/pokemon/drifloon/anim_front.png b/graphics/pokemon/gen_4/drifloon/anim_front.png
similarity index 100%
rename from graphics/pokemon/drifloon/anim_front.png
rename to graphics/pokemon/gen_4/drifloon/anim_front.png
diff --git a/graphics/pokemon/drifloon/back.png b/graphics/pokemon/gen_4/drifloon/back.png
similarity index 100%
rename from graphics/pokemon/drifloon/back.png
rename to graphics/pokemon/gen_4/drifloon/back.png
diff --git a/graphics/pokemon/jellicent/footprint.png b/graphics/pokemon/gen_4/drifloon/footprint.png
similarity index 100%
rename from graphics/pokemon/jellicent/footprint.png
rename to graphics/pokemon/gen_4/drifloon/footprint.png
diff --git a/graphics/pokemon/drifloon/icon.png b/graphics/pokemon/gen_4/drifloon/icon.png
similarity index 100%
rename from graphics/pokemon/drifloon/icon.png
rename to graphics/pokemon/gen_4/drifloon/icon.png
diff --git a/graphics/pokemon/drifloon/normal.pal b/graphics/pokemon/gen_4/drifloon/normal.pal
similarity index 100%
rename from graphics/pokemon/drifloon/normal.pal
rename to graphics/pokemon/gen_4/drifloon/normal.pal
diff --git a/graphics/pokemon/drifloon/shiny.pal b/graphics/pokemon/gen_4/drifloon/shiny.pal
similarity index 100%
rename from graphics/pokemon/drifloon/shiny.pal
rename to graphics/pokemon/gen_4/drifloon/shiny.pal
diff --git a/graphics/pokemon/dusknoir/anim_front.png b/graphics/pokemon/gen_4/dusknoir/anim_front.png
similarity index 100%
rename from graphics/pokemon/dusknoir/anim_front.png
rename to graphics/pokemon/gen_4/dusknoir/anim_front.png
diff --git a/graphics/pokemon/dusknoir/back.png b/graphics/pokemon/gen_4/dusknoir/back.png
similarity index 100%
rename from graphics/pokemon/dusknoir/back.png
rename to graphics/pokemon/gen_4/dusknoir/back.png
diff --git a/graphics/pokemon/jynx/footprint.png b/graphics/pokemon/gen_4/dusknoir/footprint.png
similarity index 100%
rename from graphics/pokemon/jynx/footprint.png
rename to graphics/pokemon/gen_4/dusknoir/footprint.png
diff --git a/graphics/pokemon/dusknoir/icon.png b/graphics/pokemon/gen_4/dusknoir/icon.png
similarity index 100%
rename from graphics/pokemon/dusknoir/icon.png
rename to graphics/pokemon/gen_4/dusknoir/icon.png
diff --git a/graphics/pokemon/dusknoir/normal.pal b/graphics/pokemon/gen_4/dusknoir/normal.pal
similarity index 100%
rename from graphics/pokemon/dusknoir/normal.pal
rename to graphics/pokemon/gen_4/dusknoir/normal.pal
diff --git a/graphics/pokemon/dusknoir/shiny.pal b/graphics/pokemon/gen_4/dusknoir/shiny.pal
similarity index 100%
rename from graphics/pokemon/dusknoir/shiny.pal
rename to graphics/pokemon/gen_4/dusknoir/shiny.pal
diff --git a/graphics/pokemon/electivire/anim_front.png b/graphics/pokemon/gen_4/electivire/anim_front.png
similarity index 100%
rename from graphics/pokemon/electivire/anim_front.png
rename to graphics/pokemon/gen_4/electivire/anim_front.png
diff --git a/graphics/pokemon/electivire/back.png b/graphics/pokemon/gen_4/electivire/back.png
similarity index 100%
rename from graphics/pokemon/electivire/back.png
rename to graphics/pokemon/gen_4/electivire/back.png
diff --git a/graphics/pokemon/electivire/footprint.png b/graphics/pokemon/gen_4/electivire/footprint.png
similarity index 100%
rename from graphics/pokemon/electivire/footprint.png
rename to graphics/pokemon/gen_4/electivire/footprint.png
diff --git a/graphics/pokemon/electivire/icon.png b/graphics/pokemon/gen_4/electivire/icon.png
similarity index 100%
rename from graphics/pokemon/electivire/icon.png
rename to graphics/pokemon/gen_4/electivire/icon.png
diff --git a/graphics/pokemon/electivire/normal.pal b/graphics/pokemon/gen_4/electivire/normal.pal
similarity index 100%
rename from graphics/pokemon/electivire/normal.pal
rename to graphics/pokemon/gen_4/electivire/normal.pal
diff --git a/graphics/pokemon/electivire/shiny.pal b/graphics/pokemon/gen_4/electivire/shiny.pal
similarity index 100%
rename from graphics/pokemon/electivire/shiny.pal
rename to graphics/pokemon/gen_4/electivire/shiny.pal
diff --git a/graphics/pokemon/empoleon/anim_front.png b/graphics/pokemon/gen_4/empoleon/anim_front.png
similarity index 100%
rename from graphics/pokemon/empoleon/anim_front.png
rename to graphics/pokemon/gen_4/empoleon/anim_front.png
diff --git a/graphics/pokemon/empoleon/back.png b/graphics/pokemon/gen_4/empoleon/back.png
similarity index 100%
rename from graphics/pokemon/empoleon/back.png
rename to graphics/pokemon/gen_4/empoleon/back.png
diff --git a/graphics/pokemon/empoleon/footprint.png b/graphics/pokemon/gen_4/empoleon/footprint.png
similarity index 100%
rename from graphics/pokemon/empoleon/footprint.png
rename to graphics/pokemon/gen_4/empoleon/footprint.png
diff --git a/graphics/pokemon/empoleon/icon.png b/graphics/pokemon/gen_4/empoleon/icon.png
similarity index 100%
rename from graphics/pokemon/empoleon/icon.png
rename to graphics/pokemon/gen_4/empoleon/icon.png
diff --git a/graphics/pokemon/empoleon/normal.pal b/graphics/pokemon/gen_4/empoleon/normal.pal
similarity index 100%
rename from graphics/pokemon/empoleon/normal.pal
rename to graphics/pokemon/gen_4/empoleon/normal.pal
diff --git a/graphics/pokemon/empoleon/shiny.pal b/graphics/pokemon/gen_4/empoleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/empoleon/shiny.pal
rename to graphics/pokemon/gen_4/empoleon/shiny.pal
diff --git a/graphics/pokemon/finneon/anim_front.png b/graphics/pokemon/gen_4/finneon/anim_front.png
similarity index 100%
rename from graphics/pokemon/finneon/anim_front.png
rename to graphics/pokemon/gen_4/finneon/anim_front.png
diff --git a/graphics/pokemon/finneon/anim_frontf.png b/graphics/pokemon/gen_4/finneon/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/finneon/anim_frontf.png
rename to graphics/pokemon/gen_4/finneon/anim_frontf.png
diff --git a/graphics/pokemon/finneon/back.png b/graphics/pokemon/gen_4/finneon/back.png
similarity index 100%
rename from graphics/pokemon/finneon/back.png
rename to graphics/pokemon/gen_4/finneon/back.png
diff --git a/graphics/pokemon/finneon/backf.png b/graphics/pokemon/gen_4/finneon/backf.png
similarity index 100%
rename from graphics/pokemon/finneon/backf.png
rename to graphics/pokemon/gen_4/finneon/backf.png
diff --git a/graphics/pokemon/kakuna/footprint.png b/graphics/pokemon/gen_4/finneon/footprint.png
similarity index 100%
rename from graphics/pokemon/kakuna/footprint.png
rename to graphics/pokemon/gen_4/finneon/footprint.png
diff --git a/graphics/pokemon/finneon/icon.png b/graphics/pokemon/gen_4/finneon/icon.png
similarity index 100%
rename from graphics/pokemon/finneon/icon.png
rename to graphics/pokemon/gen_4/finneon/icon.png
diff --git a/graphics/pokemon/finneon/normal.pal b/graphics/pokemon/gen_4/finneon/normal.pal
similarity index 100%
rename from graphics/pokemon/finneon/normal.pal
rename to graphics/pokemon/gen_4/finneon/normal.pal
diff --git a/graphics/pokemon/finneon/shiny.pal b/graphics/pokemon/gen_4/finneon/shiny.pal
similarity index 100%
rename from graphics/pokemon/finneon/shiny.pal
rename to graphics/pokemon/gen_4/finneon/shiny.pal
diff --git a/graphics/pokemon/floatzel/anim_front.png b/graphics/pokemon/gen_4/floatzel/anim_front.png
similarity index 100%
rename from graphics/pokemon/floatzel/anim_front.png
rename to graphics/pokemon/gen_4/floatzel/anim_front.png
diff --git a/graphics/pokemon/floatzel/back.png b/graphics/pokemon/gen_4/floatzel/back.png
similarity index 100%
rename from graphics/pokemon/floatzel/back.png
rename to graphics/pokemon/gen_4/floatzel/back.png
diff --git a/graphics/pokemon/floatzel/backf.png b/graphics/pokemon/gen_4/floatzel/backf.png
similarity index 100%
rename from graphics/pokemon/floatzel/backf.png
rename to graphics/pokemon/gen_4/floatzel/backf.png
diff --git a/graphics/pokemon/floatzel/footprint.png b/graphics/pokemon/gen_4/floatzel/footprint.png
similarity index 100%
rename from graphics/pokemon/floatzel/footprint.png
rename to graphics/pokemon/gen_4/floatzel/footprint.png
diff --git a/graphics/pokemon/floatzel/icon.png b/graphics/pokemon/gen_4/floatzel/icon.png
similarity index 100%
rename from graphics/pokemon/floatzel/icon.png
rename to graphics/pokemon/gen_4/floatzel/icon.png
diff --git a/graphics/pokemon/floatzel/normal.pal b/graphics/pokemon/gen_4/floatzel/normal.pal
similarity index 100%
rename from graphics/pokemon/floatzel/normal.pal
rename to graphics/pokemon/gen_4/floatzel/normal.pal
diff --git a/graphics/pokemon/floatzel/shiny.pal b/graphics/pokemon/gen_4/floatzel/shiny.pal
similarity index 100%
rename from graphics/pokemon/floatzel/shiny.pal
rename to graphics/pokemon/gen_4/floatzel/shiny.pal
diff --git a/graphics/pokemon/froslass/anim_front.png b/graphics/pokemon/gen_4/froslass/anim_front.png
similarity index 100%
rename from graphics/pokemon/froslass/anim_front.png
rename to graphics/pokemon/gen_4/froslass/anim_front.png
diff --git a/graphics/pokemon/froslass/back.png b/graphics/pokemon/gen_4/froslass/back.png
similarity index 100%
rename from graphics/pokemon/froslass/back.png
rename to graphics/pokemon/gen_4/froslass/back.png
diff --git a/graphics/pokemon/kartana/footprint.png b/graphics/pokemon/gen_4/froslass/footprint.png
similarity index 100%
rename from graphics/pokemon/kartana/footprint.png
rename to graphics/pokemon/gen_4/froslass/footprint.png
diff --git a/graphics/pokemon/froslass/icon.png b/graphics/pokemon/gen_4/froslass/icon.png
similarity index 100%
rename from graphics/pokemon/froslass/icon.png
rename to graphics/pokemon/gen_4/froslass/icon.png
diff --git a/graphics/pokemon/froslass/normal.pal b/graphics/pokemon/gen_4/froslass/normal.pal
similarity index 100%
rename from graphics/pokemon/froslass/normal.pal
rename to graphics/pokemon/gen_4/froslass/normal.pal
diff --git a/graphics/pokemon/froslass/shiny.pal b/graphics/pokemon/gen_4/froslass/shiny.pal
similarity index 100%
rename from graphics/pokemon/froslass/shiny.pal
rename to graphics/pokemon/gen_4/froslass/shiny.pal
diff --git a/graphics/pokemon/gabite/anim_front.png b/graphics/pokemon/gen_4/gabite/anim_front.png
similarity index 100%
rename from graphics/pokemon/gabite/anim_front.png
rename to graphics/pokemon/gen_4/gabite/anim_front.png
diff --git a/graphics/pokemon/gabite/anim_frontf.png b/graphics/pokemon/gen_4/gabite/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gabite/anim_frontf.png
rename to graphics/pokemon/gen_4/gabite/anim_frontf.png
diff --git a/graphics/pokemon/gabite/back.png b/graphics/pokemon/gen_4/gabite/back.png
similarity index 100%
rename from graphics/pokemon/gabite/back.png
rename to graphics/pokemon/gen_4/gabite/back.png
diff --git a/graphics/pokemon/gabite/backf.png b/graphics/pokemon/gen_4/gabite/backf.png
similarity index 100%
rename from graphics/pokemon/gabite/backf.png
rename to graphics/pokemon/gen_4/gabite/backf.png
diff --git a/graphics/pokemon/gabite/footprint.png b/graphics/pokemon/gen_4/gabite/footprint.png
similarity index 100%
rename from graphics/pokemon/gabite/footprint.png
rename to graphics/pokemon/gen_4/gabite/footprint.png
diff --git a/graphics/pokemon/gabite/icon.png b/graphics/pokemon/gen_4/gabite/icon.png
similarity index 100%
rename from graphics/pokemon/gabite/icon.png
rename to graphics/pokemon/gen_4/gabite/icon.png
diff --git a/graphics/pokemon/gabite/normal.pal b/graphics/pokemon/gen_4/gabite/normal.pal
similarity index 100%
rename from graphics/pokemon/gabite/normal.pal
rename to graphics/pokemon/gen_4/gabite/normal.pal
diff --git a/graphics/pokemon/gabite/shiny.pal b/graphics/pokemon/gen_4/gabite/shiny.pal
similarity index 100%
rename from graphics/pokemon/gabite/shiny.pal
rename to graphics/pokemon/gen_4/gabite/shiny.pal
diff --git a/graphics/pokemon/gallade/anim_front.png b/graphics/pokemon/gen_4/gallade/anim_front.png
similarity index 100%
rename from graphics/pokemon/gallade/anim_front.png
rename to graphics/pokemon/gen_4/gallade/anim_front.png
diff --git a/graphics/pokemon/gallade/back.png b/graphics/pokemon/gen_4/gallade/back.png
similarity index 100%
rename from graphics/pokemon/gallade/back.png
rename to graphics/pokemon/gen_4/gallade/back.png
diff --git a/graphics/pokemon/gallade/footprint.png b/graphics/pokemon/gen_4/gallade/footprint.png
similarity index 100%
rename from graphics/pokemon/gallade/footprint.png
rename to graphics/pokemon/gen_4/gallade/footprint.png
diff --git a/graphics/pokemon/gallade/icon.png b/graphics/pokemon/gen_4/gallade/icon.png
similarity index 100%
rename from graphics/pokemon/gallade/icon.png
rename to graphics/pokemon/gen_4/gallade/icon.png
diff --git a/graphics/pokemon/gallade/mega/back.png b/graphics/pokemon/gen_4/gallade/mega/back.png
similarity index 100%
rename from graphics/pokemon/gallade/mega/back.png
rename to graphics/pokemon/gen_4/gallade/mega/back.png
diff --git a/graphics/pokemon/gallade/mega/front.png b/graphics/pokemon/gen_4/gallade/mega/front.png
similarity index 100%
rename from graphics/pokemon/gallade/mega/front.png
rename to graphics/pokemon/gen_4/gallade/mega/front.png
diff --git a/graphics/pokemon/gallade/mega/icon.png b/graphics/pokemon/gen_4/gallade/mega/icon.png
similarity index 100%
rename from graphics/pokemon/gallade/mega/icon.png
rename to graphics/pokemon/gen_4/gallade/mega/icon.png
diff --git a/graphics/pokemon/gallade/mega/normal.pal b/graphics/pokemon/gen_4/gallade/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/gallade/mega/normal.pal
rename to graphics/pokemon/gen_4/gallade/mega/normal.pal
diff --git a/graphics/pokemon/gallade/mega/shiny.pal b/graphics/pokemon/gen_4/gallade/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/gallade/mega/shiny.pal
rename to graphics/pokemon/gen_4/gallade/mega/shiny.pal
diff --git a/graphics/pokemon/gallade/normal.pal b/graphics/pokemon/gen_4/gallade/normal.pal
similarity index 100%
rename from graphics/pokemon/gallade/normal.pal
rename to graphics/pokemon/gen_4/gallade/normal.pal
diff --git a/graphics/pokemon/gallade/shiny.pal b/graphics/pokemon/gen_4/gallade/shiny.pal
similarity index 100%
rename from graphics/pokemon/gallade/shiny.pal
rename to graphics/pokemon/gen_4/gallade/shiny.pal
diff --git a/graphics/pokemon/garchomp/anim_front.png b/graphics/pokemon/gen_4/garchomp/anim_front.png
similarity index 100%
rename from graphics/pokemon/garchomp/anim_front.png
rename to graphics/pokemon/gen_4/garchomp/anim_front.png
diff --git a/graphics/pokemon/garchomp/anim_frontf.png b/graphics/pokemon/gen_4/garchomp/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/garchomp/anim_frontf.png
rename to graphics/pokemon/gen_4/garchomp/anim_frontf.png
diff --git a/graphics/pokemon/garchomp/back.png b/graphics/pokemon/gen_4/garchomp/back.png
similarity index 100%
rename from graphics/pokemon/garchomp/back.png
rename to graphics/pokemon/gen_4/garchomp/back.png
diff --git a/graphics/pokemon/garchomp/footprint.png b/graphics/pokemon/gen_4/garchomp/footprint.png
similarity index 100%
rename from graphics/pokemon/garchomp/footprint.png
rename to graphics/pokemon/gen_4/garchomp/footprint.png
diff --git a/graphics/pokemon/garchomp/icon.png b/graphics/pokemon/gen_4/garchomp/icon.png
similarity index 100%
rename from graphics/pokemon/garchomp/icon.png
rename to graphics/pokemon/gen_4/garchomp/icon.png
diff --git a/graphics/pokemon/garchomp/mega/back.png b/graphics/pokemon/gen_4/garchomp/mega/back.png
similarity index 100%
rename from graphics/pokemon/garchomp/mega/back.png
rename to graphics/pokemon/gen_4/garchomp/mega/back.png
diff --git a/graphics/pokemon/garchomp/mega/front.png b/graphics/pokemon/gen_4/garchomp/mega/front.png
similarity index 100%
rename from graphics/pokemon/garchomp/mega/front.png
rename to graphics/pokemon/gen_4/garchomp/mega/front.png
diff --git a/graphics/pokemon/garchomp/mega/icon.png b/graphics/pokemon/gen_4/garchomp/mega/icon.png
similarity index 100%
rename from graphics/pokemon/garchomp/mega/icon.png
rename to graphics/pokemon/gen_4/garchomp/mega/icon.png
diff --git a/graphics/pokemon/garchomp/mega/normal.pal b/graphics/pokemon/gen_4/garchomp/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/garchomp/mega/normal.pal
rename to graphics/pokemon/gen_4/garchomp/mega/normal.pal
diff --git a/graphics/pokemon/garchomp/mega/shiny.pal b/graphics/pokemon/gen_4/garchomp/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/garchomp/mega/shiny.pal
rename to graphics/pokemon/gen_4/garchomp/mega/shiny.pal
diff --git a/graphics/pokemon/garchomp/normal.pal b/graphics/pokemon/gen_4/garchomp/normal.pal
similarity index 100%
rename from graphics/pokemon/garchomp/normal.pal
rename to graphics/pokemon/gen_4/garchomp/normal.pal
diff --git a/graphics/pokemon/garchomp/shiny.pal b/graphics/pokemon/gen_4/garchomp/shiny.pal
similarity index 100%
rename from graphics/pokemon/garchomp/shiny.pal
rename to graphics/pokemon/gen_4/garchomp/shiny.pal
diff --git a/graphics/pokemon/gastrodon/anim_front.png b/graphics/pokemon/gen_4/gastrodon/anim_front.png
similarity index 100%
rename from graphics/pokemon/gastrodon/anim_front.png
rename to graphics/pokemon/gen_4/gastrodon/anim_front.png
diff --git a/graphics/pokemon/gastrodon/back.png b/graphics/pokemon/gen_4/gastrodon/back.png
similarity index 100%
rename from graphics/pokemon/gastrodon/back.png
rename to graphics/pokemon/gen_4/gastrodon/back.png
diff --git a/graphics/pokemon/gastrodon/east_sea/anim_front.png b/graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.png
similarity index 100%
rename from graphics/pokemon/gastrodon/east_sea/anim_front.png
rename to graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.png
diff --git a/graphics/pokemon/gastrodon/east_sea/back.png b/graphics/pokemon/gen_4/gastrodon/east_sea/back.png
similarity index 100%
rename from graphics/pokemon/gastrodon/east_sea/back.png
rename to graphics/pokemon/gen_4/gastrodon/east_sea/back.png
diff --git a/graphics/pokemon/gastrodon/east_sea/icon.png b/graphics/pokemon/gen_4/gastrodon/east_sea/icon.png
similarity index 100%
rename from graphics/pokemon/gastrodon/east_sea/icon.png
rename to graphics/pokemon/gen_4/gastrodon/east_sea/icon.png
diff --git a/graphics/pokemon/gastrodon/east_sea/normal.pal b/graphics/pokemon/gen_4/gastrodon/east_sea/normal.pal
similarity index 100%
rename from graphics/pokemon/gastrodon/east_sea/normal.pal
rename to graphics/pokemon/gen_4/gastrodon/east_sea/normal.pal
diff --git a/graphics/pokemon/gastrodon/east_sea/shiny.pal b/graphics/pokemon/gen_4/gastrodon/east_sea/shiny.pal
similarity index 100%
rename from graphics/pokemon/gastrodon/east_sea/shiny.pal
rename to graphics/pokemon/gen_4/gastrodon/east_sea/shiny.pal
diff --git a/graphics/pokemon/gastrodon/footprint.png b/graphics/pokemon/gen_4/gastrodon/footprint.png
similarity index 100%
rename from graphics/pokemon/gastrodon/footprint.png
rename to graphics/pokemon/gen_4/gastrodon/footprint.png
diff --git a/graphics/pokemon/gastrodon/icon.png b/graphics/pokemon/gen_4/gastrodon/icon.png
similarity index 100%
rename from graphics/pokemon/gastrodon/icon.png
rename to graphics/pokemon/gen_4/gastrodon/icon.png
diff --git a/graphics/pokemon/gastrodon/normal.pal b/graphics/pokemon/gen_4/gastrodon/normal.pal
similarity index 100%
rename from graphics/pokemon/gastrodon/normal.pal
rename to graphics/pokemon/gen_4/gastrodon/normal.pal
diff --git a/graphics/pokemon/gastrodon/shiny.pal b/graphics/pokemon/gen_4/gastrodon/shiny.pal
similarity index 100%
rename from graphics/pokemon/gastrodon/shiny.pal
rename to graphics/pokemon/gen_4/gastrodon/shiny.pal
diff --git a/graphics/pokemon/gible/anim_front.png b/graphics/pokemon/gen_4/gible/anim_front.png
similarity index 100%
rename from graphics/pokemon/gible/anim_front.png
rename to graphics/pokemon/gen_4/gible/anim_front.png
diff --git a/graphics/pokemon/gible/anim_frontf.png b/graphics/pokemon/gen_4/gible/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/gible/anim_frontf.png
rename to graphics/pokemon/gen_4/gible/anim_frontf.png
diff --git a/graphics/pokemon/gible/back.png b/graphics/pokemon/gen_4/gible/back.png
similarity index 100%
rename from graphics/pokemon/gible/back.png
rename to graphics/pokemon/gen_4/gible/back.png
diff --git a/graphics/pokemon/gible/backf.png b/graphics/pokemon/gen_4/gible/backf.png
similarity index 100%
rename from graphics/pokemon/gible/backf.png
rename to graphics/pokemon/gen_4/gible/backf.png
diff --git a/graphics/pokemon/gible/footprint.png b/graphics/pokemon/gen_4/gible/footprint.png
similarity index 100%
rename from graphics/pokemon/gible/footprint.png
rename to graphics/pokemon/gen_4/gible/footprint.png
diff --git a/graphics/pokemon/gible/icon.png b/graphics/pokemon/gen_4/gible/icon.png
similarity index 100%
rename from graphics/pokemon/gible/icon.png
rename to graphics/pokemon/gen_4/gible/icon.png
diff --git a/graphics/pokemon/gible/normal.pal b/graphics/pokemon/gen_4/gible/normal.pal
similarity index 100%
rename from graphics/pokemon/gible/normal.pal
rename to graphics/pokemon/gen_4/gible/normal.pal
diff --git a/graphics/pokemon/gible/shiny.pal b/graphics/pokemon/gen_4/gible/shiny.pal
similarity index 100%
rename from graphics/pokemon/gible/shiny.pal
rename to graphics/pokemon/gen_4/gible/shiny.pal
diff --git a/graphics/pokemon/giratina/anim_front.png b/graphics/pokemon/gen_4/giratina/anim_front.png
similarity index 100%
rename from graphics/pokemon/giratina/anim_front.png
rename to graphics/pokemon/gen_4/giratina/anim_front.png
diff --git a/graphics/pokemon/giratina/back.png b/graphics/pokemon/gen_4/giratina/back.png
similarity index 100%
rename from graphics/pokemon/giratina/back.png
rename to graphics/pokemon/gen_4/giratina/back.png
diff --git a/graphics/pokemon/giratina/footprint.png b/graphics/pokemon/gen_4/giratina/footprint.png
similarity index 100%
rename from graphics/pokemon/giratina/footprint.png
rename to graphics/pokemon/gen_4/giratina/footprint.png
diff --git a/graphics/pokemon/giratina/icon.png b/graphics/pokemon/gen_4/giratina/icon.png
similarity index 100%
rename from graphics/pokemon/giratina/icon.png
rename to graphics/pokemon/gen_4/giratina/icon.png
diff --git a/graphics/pokemon/giratina/normal.pal b/graphics/pokemon/gen_4/giratina/normal.pal
similarity index 100%
rename from graphics/pokemon/giratina/normal.pal
rename to graphics/pokemon/gen_4/giratina/normal.pal
diff --git a/graphics/pokemon/giratina/origin/anim_front.png b/graphics/pokemon/gen_4/giratina/origin/anim_front.png
similarity index 100%
rename from graphics/pokemon/giratina/origin/anim_front.png
rename to graphics/pokemon/gen_4/giratina/origin/anim_front.png
diff --git a/graphics/pokemon/giratina/origin/back.png b/graphics/pokemon/gen_4/giratina/origin/back.png
similarity index 100%
rename from graphics/pokemon/giratina/origin/back.png
rename to graphics/pokemon/gen_4/giratina/origin/back.png
diff --git a/graphics/pokemon/giratina/origin/icon.png b/graphics/pokemon/gen_4/giratina/origin/icon.png
similarity index 100%
rename from graphics/pokemon/giratina/origin/icon.png
rename to graphics/pokemon/gen_4/giratina/origin/icon.png
diff --git a/graphics/pokemon/giratina/origin/normal.pal b/graphics/pokemon/gen_4/giratina/origin/normal.pal
similarity index 100%
rename from graphics/pokemon/giratina/origin/normal.pal
rename to graphics/pokemon/gen_4/giratina/origin/normal.pal
diff --git a/graphics/pokemon/giratina/origin/shiny.pal b/graphics/pokemon/gen_4/giratina/origin/shiny.pal
similarity index 100%
rename from graphics/pokemon/giratina/origin/shiny.pal
rename to graphics/pokemon/gen_4/giratina/origin/shiny.pal
diff --git a/graphics/pokemon/giratina/shiny.pal b/graphics/pokemon/gen_4/giratina/shiny.pal
similarity index 100%
rename from graphics/pokemon/giratina/shiny.pal
rename to graphics/pokemon/gen_4/giratina/shiny.pal
diff --git a/graphics/pokemon/glaceon/anim_front.png b/graphics/pokemon/gen_4/glaceon/anim_front.png
similarity index 100%
rename from graphics/pokemon/glaceon/anim_front.png
rename to graphics/pokemon/gen_4/glaceon/anim_front.png
diff --git a/graphics/pokemon/glaceon/back.png b/graphics/pokemon/gen_4/glaceon/back.png
similarity index 100%
rename from graphics/pokemon/glaceon/back.png
rename to graphics/pokemon/gen_4/glaceon/back.png
diff --git a/graphics/pokemon/glaceon/footprint.png b/graphics/pokemon/gen_4/glaceon/footprint.png
similarity index 100%
rename from graphics/pokemon/glaceon/footprint.png
rename to graphics/pokemon/gen_4/glaceon/footprint.png
diff --git a/graphics/pokemon/glaceon/icon.png b/graphics/pokemon/gen_4/glaceon/icon.png
similarity index 100%
rename from graphics/pokemon/glaceon/icon.png
rename to graphics/pokemon/gen_4/glaceon/icon.png
diff --git a/graphics/pokemon/glaceon/normal.pal b/graphics/pokemon/gen_4/glaceon/normal.pal
similarity index 100%
rename from graphics/pokemon/glaceon/normal.pal
rename to graphics/pokemon/gen_4/glaceon/normal.pal
diff --git a/graphics/pokemon/glaceon/shiny.pal b/graphics/pokemon/gen_4/glaceon/shiny.pal
similarity index 100%
rename from graphics/pokemon/glaceon/shiny.pal
rename to graphics/pokemon/gen_4/glaceon/shiny.pal
diff --git a/graphics/pokemon/glameow/anim_front.png b/graphics/pokemon/gen_4/glameow/anim_front.png
similarity index 100%
rename from graphics/pokemon/glameow/anim_front.png
rename to graphics/pokemon/gen_4/glameow/anim_front.png
diff --git a/graphics/pokemon/glameow/back.png b/graphics/pokemon/gen_4/glameow/back.png
similarity index 100%
rename from graphics/pokemon/glameow/back.png
rename to graphics/pokemon/gen_4/glameow/back.png
diff --git a/graphics/pokemon/glameow/footprint.png b/graphics/pokemon/gen_4/glameow/footprint.png
similarity index 100%
rename from graphics/pokemon/glameow/footprint.png
rename to graphics/pokemon/gen_4/glameow/footprint.png
diff --git a/graphics/pokemon/glameow/icon.png b/graphics/pokemon/gen_4/glameow/icon.png
similarity index 100%
rename from graphics/pokemon/glameow/icon.png
rename to graphics/pokemon/gen_4/glameow/icon.png
diff --git a/graphics/pokemon/glameow/normal.pal b/graphics/pokemon/gen_4/glameow/normal.pal
similarity index 100%
rename from graphics/pokemon/glameow/normal.pal
rename to graphics/pokemon/gen_4/glameow/normal.pal
diff --git a/graphics/pokemon/glameow/shiny.pal b/graphics/pokemon/gen_4/glameow/shiny.pal
similarity index 100%
rename from graphics/pokemon/glameow/shiny.pal
rename to graphics/pokemon/gen_4/glameow/shiny.pal
diff --git a/graphics/pokemon/gliscor/anim_front.png b/graphics/pokemon/gen_4/gliscor/anim_front.png
similarity index 100%
rename from graphics/pokemon/gliscor/anim_front.png
rename to graphics/pokemon/gen_4/gliscor/anim_front.png
diff --git a/graphics/pokemon/gliscor/back.png b/graphics/pokemon/gen_4/gliscor/back.png
similarity index 100%
rename from graphics/pokemon/gliscor/back.png
rename to graphics/pokemon/gen_4/gliscor/back.png
diff --git a/graphics/pokemon/gliscor/footprint.png b/graphics/pokemon/gen_4/gliscor/footprint.png
similarity index 100%
rename from graphics/pokemon/gliscor/footprint.png
rename to graphics/pokemon/gen_4/gliscor/footprint.png
diff --git a/graphics/pokemon/gliscor/icon.png b/graphics/pokemon/gen_4/gliscor/icon.png
similarity index 100%
rename from graphics/pokemon/gliscor/icon.png
rename to graphics/pokemon/gen_4/gliscor/icon.png
diff --git a/graphics/pokemon/gliscor/normal.pal b/graphics/pokemon/gen_4/gliscor/normal.pal
similarity index 100%
rename from graphics/pokemon/gliscor/normal.pal
rename to graphics/pokemon/gen_4/gliscor/normal.pal
diff --git a/graphics/pokemon/gliscor/shiny.pal b/graphics/pokemon/gen_4/gliscor/shiny.pal
similarity index 100%
rename from graphics/pokemon/gliscor/shiny.pal
rename to graphics/pokemon/gen_4/gliscor/shiny.pal
diff --git a/graphics/pokemon/grotle/anim_front.png b/graphics/pokemon/gen_4/grotle/anim_front.png
similarity index 100%
rename from graphics/pokemon/grotle/anim_front.png
rename to graphics/pokemon/gen_4/grotle/anim_front.png
diff --git a/graphics/pokemon/grotle/back.png b/graphics/pokemon/gen_4/grotle/back.png
similarity index 100%
rename from graphics/pokemon/grotle/back.png
rename to graphics/pokemon/gen_4/grotle/back.png
diff --git a/graphics/pokemon/grotle/footprint.png b/graphics/pokemon/gen_4/grotle/footprint.png
similarity index 100%
rename from graphics/pokemon/grotle/footprint.png
rename to graphics/pokemon/gen_4/grotle/footprint.png
diff --git a/graphics/pokemon/grotle/icon.png b/graphics/pokemon/gen_4/grotle/icon.png
similarity index 100%
rename from graphics/pokemon/grotle/icon.png
rename to graphics/pokemon/gen_4/grotle/icon.png
diff --git a/graphics/pokemon/grotle/normal.pal b/graphics/pokemon/gen_4/grotle/normal.pal
similarity index 100%
rename from graphics/pokemon/grotle/normal.pal
rename to graphics/pokemon/gen_4/grotle/normal.pal
diff --git a/graphics/pokemon/grotle/shiny.pal b/graphics/pokemon/gen_4/grotle/shiny.pal
similarity index 100%
rename from graphics/pokemon/grotle/shiny.pal
rename to graphics/pokemon/gen_4/grotle/shiny.pal
diff --git a/graphics/pokemon/happiny/anim_front.png b/graphics/pokemon/gen_4/happiny/anim_front.png
similarity index 100%
rename from graphics/pokemon/happiny/anim_front.png
rename to graphics/pokemon/gen_4/happiny/anim_front.png
diff --git a/graphics/pokemon/happiny/back.png b/graphics/pokemon/gen_4/happiny/back.png
similarity index 100%
rename from graphics/pokemon/happiny/back.png
rename to graphics/pokemon/gen_4/happiny/back.png
diff --git a/graphics/pokemon/happiny/footprint.png b/graphics/pokemon/gen_4/happiny/footprint.png
similarity index 100%
rename from graphics/pokemon/happiny/footprint.png
rename to graphics/pokemon/gen_4/happiny/footprint.png
diff --git a/graphics/pokemon/happiny/icon.png b/graphics/pokemon/gen_4/happiny/icon.png
similarity index 100%
rename from graphics/pokemon/happiny/icon.png
rename to graphics/pokemon/gen_4/happiny/icon.png
diff --git a/graphics/pokemon/happiny/normal.pal b/graphics/pokemon/gen_4/happiny/normal.pal
similarity index 100%
rename from graphics/pokemon/happiny/normal.pal
rename to graphics/pokemon/gen_4/happiny/normal.pal
diff --git a/graphics/pokemon/happiny/shiny.pal b/graphics/pokemon/gen_4/happiny/shiny.pal
similarity index 100%
rename from graphics/pokemon/happiny/shiny.pal
rename to graphics/pokemon/gen_4/happiny/shiny.pal
diff --git a/graphics/pokemon/heatran/anim_front.png b/graphics/pokemon/gen_4/heatran/anim_front.png
similarity index 100%
rename from graphics/pokemon/heatran/anim_front.png
rename to graphics/pokemon/gen_4/heatran/anim_front.png
diff --git a/graphics/pokemon/heatran/back.png b/graphics/pokemon/gen_4/heatran/back.png
similarity index 100%
rename from graphics/pokemon/heatran/back.png
rename to graphics/pokemon/gen_4/heatran/back.png
diff --git a/graphics/pokemon/heatran/footprint.png b/graphics/pokemon/gen_4/heatran/footprint.png
similarity index 100%
rename from graphics/pokemon/heatran/footprint.png
rename to graphics/pokemon/gen_4/heatran/footprint.png
diff --git a/graphics/pokemon/heatran/icon.png b/graphics/pokemon/gen_4/heatran/icon.png
similarity index 100%
rename from graphics/pokemon/heatran/icon.png
rename to graphics/pokemon/gen_4/heatran/icon.png
diff --git a/graphics/pokemon/heatran/normal.pal b/graphics/pokemon/gen_4/heatran/normal.pal
similarity index 100%
rename from graphics/pokemon/heatran/normal.pal
rename to graphics/pokemon/gen_4/heatran/normal.pal
diff --git a/graphics/pokemon/heatran/shiny.pal b/graphics/pokemon/gen_4/heatran/shiny.pal
similarity index 100%
rename from graphics/pokemon/heatran/shiny.pal
rename to graphics/pokemon/gen_4/heatran/shiny.pal
diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/gen_4/hippopotas/anim_front.png
similarity index 100%
rename from graphics/pokemon/hippopotas/anim_front.png
rename to graphics/pokemon/gen_4/hippopotas/anim_front.png
diff --git a/graphics/pokemon/hippopotas/back.png b/graphics/pokemon/gen_4/hippopotas/back.png
similarity index 100%
rename from graphics/pokemon/hippopotas/back.png
rename to graphics/pokemon/gen_4/hippopotas/back.png
diff --git a/graphics/pokemon/hippopotas/footprint.png b/graphics/pokemon/gen_4/hippopotas/footprint.png
similarity index 100%
rename from graphics/pokemon/hippopotas/footprint.png
rename to graphics/pokemon/gen_4/hippopotas/footprint.png
diff --git a/graphics/pokemon/hippopotas/icon.png b/graphics/pokemon/gen_4/hippopotas/icon.png
similarity index 100%
rename from graphics/pokemon/hippopotas/icon.png
rename to graphics/pokemon/gen_4/hippopotas/icon.png
diff --git a/graphics/pokemon/hippopotas/iconf.png b/graphics/pokemon/gen_4/hippopotas/iconf.png
similarity index 100%
rename from graphics/pokemon/hippopotas/iconf.png
rename to graphics/pokemon/gen_4/hippopotas/iconf.png
diff --git a/graphics/pokemon/hippopotas/normal.pal b/graphics/pokemon/gen_4/hippopotas/normal.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/normal.pal
rename to graphics/pokemon/gen_4/hippopotas/normal.pal
diff --git a/graphics/pokemon/hippopotas/normalf.pal b/graphics/pokemon/gen_4/hippopotas/normalf.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/normalf.pal
rename to graphics/pokemon/gen_4/hippopotas/normalf.pal
diff --git a/graphics/pokemon/hippopotas/shiny.pal b/graphics/pokemon/gen_4/hippopotas/shiny.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/shiny.pal
rename to graphics/pokemon/gen_4/hippopotas/shiny.pal
diff --git a/graphics/pokemon/hippopotas/shinyf.pal b/graphics/pokemon/gen_4/hippopotas/shinyf.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/shinyf.pal
rename to graphics/pokemon/gen_4/hippopotas/shinyf.pal
diff --git a/graphics/pokemon/hippowdon/anim_front.png b/graphics/pokemon/gen_4/hippowdon/anim_front.png
similarity index 100%
rename from graphics/pokemon/hippowdon/anim_front.png
rename to graphics/pokemon/gen_4/hippowdon/anim_front.png
diff --git a/graphics/pokemon/hippowdon/back.png b/graphics/pokemon/gen_4/hippowdon/back.png
similarity index 100%
rename from graphics/pokemon/hippowdon/back.png
rename to graphics/pokemon/gen_4/hippowdon/back.png
diff --git a/graphics/pokemon/hippowdon/footprint.png b/graphics/pokemon/gen_4/hippowdon/footprint.png
similarity index 100%
rename from graphics/pokemon/hippowdon/footprint.png
rename to graphics/pokemon/gen_4/hippowdon/footprint.png
diff --git a/graphics/pokemon/hippowdon/icon.png b/graphics/pokemon/gen_4/hippowdon/icon.png
similarity index 100%
rename from graphics/pokemon/hippowdon/icon.png
rename to graphics/pokemon/gen_4/hippowdon/icon.png
diff --git a/graphics/pokemon/hippowdon/iconf.png b/graphics/pokemon/gen_4/hippowdon/iconf.png
similarity index 100%
rename from graphics/pokemon/hippowdon/iconf.png
rename to graphics/pokemon/gen_4/hippowdon/iconf.png
diff --git a/graphics/pokemon/hippowdon/normal.pal b/graphics/pokemon/gen_4/hippowdon/normal.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/normal.pal
rename to graphics/pokemon/gen_4/hippowdon/normal.pal
diff --git a/graphics/pokemon/hippowdon/normalf.pal b/graphics/pokemon/gen_4/hippowdon/normalf.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/normalf.pal
rename to graphics/pokemon/gen_4/hippowdon/normalf.pal
diff --git a/graphics/pokemon/hippowdon/shiny.pal b/graphics/pokemon/gen_4/hippowdon/shiny.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/shiny.pal
rename to graphics/pokemon/gen_4/hippowdon/shiny.pal
diff --git a/graphics/pokemon/hippowdon/shinyf.pal b/graphics/pokemon/gen_4/hippowdon/shinyf.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/shinyf.pal
rename to graphics/pokemon/gen_4/hippowdon/shinyf.pal
diff --git a/graphics/pokemon/honchkrow/anim_front.png b/graphics/pokemon/gen_4/honchkrow/anim_front.png
similarity index 100%
rename from graphics/pokemon/honchkrow/anim_front.png
rename to graphics/pokemon/gen_4/honchkrow/anim_front.png
diff --git a/graphics/pokemon/honchkrow/back.png b/graphics/pokemon/gen_4/honchkrow/back.png
similarity index 100%
rename from graphics/pokemon/honchkrow/back.png
rename to graphics/pokemon/gen_4/honchkrow/back.png
diff --git a/graphics/pokemon/honchkrow/footprint.png b/graphics/pokemon/gen_4/honchkrow/footprint.png
similarity index 100%
rename from graphics/pokemon/honchkrow/footprint.png
rename to graphics/pokemon/gen_4/honchkrow/footprint.png
diff --git a/graphics/pokemon/honchkrow/icon.png b/graphics/pokemon/gen_4/honchkrow/icon.png
similarity index 100%
rename from graphics/pokemon/honchkrow/icon.png
rename to graphics/pokemon/gen_4/honchkrow/icon.png
diff --git a/graphics/pokemon/honchkrow/normal.pal b/graphics/pokemon/gen_4/honchkrow/normal.pal
similarity index 100%
rename from graphics/pokemon/honchkrow/normal.pal
rename to graphics/pokemon/gen_4/honchkrow/normal.pal
diff --git a/graphics/pokemon/honchkrow/shiny.pal b/graphics/pokemon/gen_4/honchkrow/shiny.pal
similarity index 100%
rename from graphics/pokemon/honchkrow/shiny.pal
rename to graphics/pokemon/gen_4/honchkrow/shiny.pal
diff --git a/graphics/pokemon/infernape/anim_front.png b/graphics/pokemon/gen_4/infernape/anim_front.png
similarity index 100%
rename from graphics/pokemon/infernape/anim_front.png
rename to graphics/pokemon/gen_4/infernape/anim_front.png
diff --git a/graphics/pokemon/infernape/back.png b/graphics/pokemon/gen_4/infernape/back.png
similarity index 100%
rename from graphics/pokemon/infernape/back.png
rename to graphics/pokemon/gen_4/infernape/back.png
diff --git a/graphics/pokemon/infernape/footprint.png b/graphics/pokemon/gen_4/infernape/footprint.png
similarity index 100%
rename from graphics/pokemon/infernape/footprint.png
rename to graphics/pokemon/gen_4/infernape/footprint.png
diff --git a/graphics/pokemon/infernape/icon.png b/graphics/pokemon/gen_4/infernape/icon.png
similarity index 100%
rename from graphics/pokemon/infernape/icon.png
rename to graphics/pokemon/gen_4/infernape/icon.png
diff --git a/graphics/pokemon/infernape/normal.pal b/graphics/pokemon/gen_4/infernape/normal.pal
similarity index 100%
rename from graphics/pokemon/infernape/normal.pal
rename to graphics/pokemon/gen_4/infernape/normal.pal
diff --git a/graphics/pokemon/infernape/shiny.pal b/graphics/pokemon/gen_4/infernape/shiny.pal
similarity index 100%
rename from graphics/pokemon/infernape/shiny.pal
rename to graphics/pokemon/gen_4/infernape/shiny.pal
diff --git a/graphics/pokemon/kricketot/anim_front.png b/graphics/pokemon/gen_4/kricketot/anim_front.png
similarity index 100%
rename from graphics/pokemon/kricketot/anim_front.png
rename to graphics/pokemon/gen_4/kricketot/anim_front.png
diff --git a/graphics/pokemon/kricketot/anim_frontf.png b/graphics/pokemon/gen_4/kricketot/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/kricketot/anim_frontf.png
rename to graphics/pokemon/gen_4/kricketot/anim_frontf.png
diff --git a/graphics/pokemon/kricketot/back.png b/graphics/pokemon/gen_4/kricketot/back.png
similarity index 100%
rename from graphics/pokemon/kricketot/back.png
rename to graphics/pokemon/gen_4/kricketot/back.png
diff --git a/graphics/pokemon/kricketot/backf.png b/graphics/pokemon/gen_4/kricketot/backf.png
similarity index 100%
rename from graphics/pokemon/kricketot/backf.png
rename to graphics/pokemon/gen_4/kricketot/backf.png
diff --git a/graphics/pokemon/kricketot/footprint.png b/graphics/pokemon/gen_4/kricketot/footprint.png
similarity index 100%
rename from graphics/pokemon/kricketot/footprint.png
rename to graphics/pokemon/gen_4/kricketot/footprint.png
diff --git a/graphics/pokemon/kricketot/icon.png b/graphics/pokemon/gen_4/kricketot/icon.png
similarity index 100%
rename from graphics/pokemon/kricketot/icon.png
rename to graphics/pokemon/gen_4/kricketot/icon.png
diff --git a/graphics/pokemon/kricketot/normal.pal b/graphics/pokemon/gen_4/kricketot/normal.pal
similarity index 100%
rename from graphics/pokemon/kricketot/normal.pal
rename to graphics/pokemon/gen_4/kricketot/normal.pal
diff --git a/graphics/pokemon/kricketot/shiny.pal b/graphics/pokemon/gen_4/kricketot/shiny.pal
similarity index 100%
rename from graphics/pokemon/kricketot/shiny.pal
rename to graphics/pokemon/gen_4/kricketot/shiny.pal
diff --git a/graphics/pokemon/kricketune/anim_front.png b/graphics/pokemon/gen_4/kricketune/anim_front.png
similarity index 100%
rename from graphics/pokemon/kricketune/anim_front.png
rename to graphics/pokemon/gen_4/kricketune/anim_front.png
diff --git a/graphics/pokemon/kricketune/anim_frontf.png b/graphics/pokemon/gen_4/kricketune/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/kricketune/anim_frontf.png
rename to graphics/pokemon/gen_4/kricketune/anim_frontf.png
diff --git a/graphics/pokemon/kricketune/back.png b/graphics/pokemon/gen_4/kricketune/back.png
similarity index 100%
rename from graphics/pokemon/kricketune/back.png
rename to graphics/pokemon/gen_4/kricketune/back.png
diff --git a/graphics/pokemon/kricketune/backf.png b/graphics/pokemon/gen_4/kricketune/backf.png
similarity index 100%
rename from graphics/pokemon/kricketune/backf.png
rename to graphics/pokemon/gen_4/kricketune/backf.png
diff --git a/graphics/pokemon/gourgeist/footprint.png b/graphics/pokemon/gen_4/kricketune/footprint.png
similarity index 100%
rename from graphics/pokemon/gourgeist/footprint.png
rename to graphics/pokemon/gen_4/kricketune/footprint.png
diff --git a/graphics/pokemon/kricketune/icon.png b/graphics/pokemon/gen_4/kricketune/icon.png
similarity index 100%
rename from graphics/pokemon/kricketune/icon.png
rename to graphics/pokemon/gen_4/kricketune/icon.png
diff --git a/graphics/pokemon/kricketune/normal.pal b/graphics/pokemon/gen_4/kricketune/normal.pal
similarity index 100%
rename from graphics/pokemon/kricketune/normal.pal
rename to graphics/pokemon/gen_4/kricketune/normal.pal
diff --git a/graphics/pokemon/kricketune/shiny.pal b/graphics/pokemon/gen_4/kricketune/shiny.pal
similarity index 100%
rename from graphics/pokemon/kricketune/shiny.pal
rename to graphics/pokemon/gen_4/kricketune/shiny.pal
diff --git a/graphics/pokemon/leafeon/anim_front.png b/graphics/pokemon/gen_4/leafeon/anim_front.png
similarity index 100%
rename from graphics/pokemon/leafeon/anim_front.png
rename to graphics/pokemon/gen_4/leafeon/anim_front.png
diff --git a/graphics/pokemon/leafeon/back.png b/graphics/pokemon/gen_4/leafeon/back.png
similarity index 100%
rename from graphics/pokemon/leafeon/back.png
rename to graphics/pokemon/gen_4/leafeon/back.png
diff --git a/graphics/pokemon/leafeon/footprint.png b/graphics/pokemon/gen_4/leafeon/footprint.png
similarity index 100%
rename from graphics/pokemon/leafeon/footprint.png
rename to graphics/pokemon/gen_4/leafeon/footprint.png
diff --git a/graphics/pokemon/leafeon/icon.png b/graphics/pokemon/gen_4/leafeon/icon.png
similarity index 100%
rename from graphics/pokemon/leafeon/icon.png
rename to graphics/pokemon/gen_4/leafeon/icon.png
diff --git a/graphics/pokemon/leafeon/normal.pal b/graphics/pokemon/gen_4/leafeon/normal.pal
similarity index 100%
rename from graphics/pokemon/leafeon/normal.pal
rename to graphics/pokemon/gen_4/leafeon/normal.pal
diff --git a/graphics/pokemon/leafeon/shiny.pal b/graphics/pokemon/gen_4/leafeon/shiny.pal
similarity index 100%
rename from graphics/pokemon/leafeon/shiny.pal
rename to graphics/pokemon/gen_4/leafeon/shiny.pal
diff --git a/graphics/pokemon/lickilicky/anim_front.png b/graphics/pokemon/gen_4/lickilicky/anim_front.png
similarity index 100%
rename from graphics/pokemon/lickilicky/anim_front.png
rename to graphics/pokemon/gen_4/lickilicky/anim_front.png
diff --git a/graphics/pokemon/lickilicky/back.png b/graphics/pokemon/gen_4/lickilicky/back.png
similarity index 100%
rename from graphics/pokemon/lickilicky/back.png
rename to graphics/pokemon/gen_4/lickilicky/back.png
diff --git a/graphics/pokemon/lickilicky/footprint.png b/graphics/pokemon/gen_4/lickilicky/footprint.png
similarity index 100%
rename from graphics/pokemon/lickilicky/footprint.png
rename to graphics/pokemon/gen_4/lickilicky/footprint.png
diff --git a/graphics/pokemon/lickilicky/icon.png b/graphics/pokemon/gen_4/lickilicky/icon.png
similarity index 100%
rename from graphics/pokemon/lickilicky/icon.png
rename to graphics/pokemon/gen_4/lickilicky/icon.png
diff --git a/graphics/pokemon/lickilicky/normal.pal b/graphics/pokemon/gen_4/lickilicky/normal.pal
similarity index 100%
rename from graphics/pokemon/lickilicky/normal.pal
rename to graphics/pokemon/gen_4/lickilicky/normal.pal
diff --git a/graphics/pokemon/lickilicky/shiny.pal b/graphics/pokemon/gen_4/lickilicky/shiny.pal
similarity index 100%
rename from graphics/pokemon/lickilicky/shiny.pal
rename to graphics/pokemon/gen_4/lickilicky/shiny.pal
diff --git a/graphics/pokemon/lopunny/anim_front.png b/graphics/pokemon/gen_4/lopunny/anim_front.png
similarity index 100%
rename from graphics/pokemon/lopunny/anim_front.png
rename to graphics/pokemon/gen_4/lopunny/anim_front.png
diff --git a/graphics/pokemon/lopunny/back.png b/graphics/pokemon/gen_4/lopunny/back.png
similarity index 100%
rename from graphics/pokemon/lopunny/back.png
rename to graphics/pokemon/gen_4/lopunny/back.png
diff --git a/graphics/pokemon/lopunny/footprint.png b/graphics/pokemon/gen_4/lopunny/footprint.png
similarity index 100%
rename from graphics/pokemon/lopunny/footprint.png
rename to graphics/pokemon/gen_4/lopunny/footprint.png
diff --git a/graphics/pokemon/lopunny/icon.png b/graphics/pokemon/gen_4/lopunny/icon.png
similarity index 100%
rename from graphics/pokemon/lopunny/icon.png
rename to graphics/pokemon/gen_4/lopunny/icon.png
diff --git a/graphics/pokemon/lopunny/mega/back.png b/graphics/pokemon/gen_4/lopunny/mega/back.png
similarity index 100%
rename from graphics/pokemon/lopunny/mega/back.png
rename to graphics/pokemon/gen_4/lopunny/mega/back.png
diff --git a/graphics/pokemon/lopunny/mega/front.png b/graphics/pokemon/gen_4/lopunny/mega/front.png
similarity index 100%
rename from graphics/pokemon/lopunny/mega/front.png
rename to graphics/pokemon/gen_4/lopunny/mega/front.png
diff --git a/graphics/pokemon/lopunny/mega/icon.png b/graphics/pokemon/gen_4/lopunny/mega/icon.png
similarity index 100%
rename from graphics/pokemon/lopunny/mega/icon.png
rename to graphics/pokemon/gen_4/lopunny/mega/icon.png
diff --git a/graphics/pokemon/lopunny/mega/normal.pal b/graphics/pokemon/gen_4/lopunny/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/lopunny/mega/normal.pal
rename to graphics/pokemon/gen_4/lopunny/mega/normal.pal
diff --git a/graphics/pokemon/lopunny/mega/shiny.pal b/graphics/pokemon/gen_4/lopunny/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/lopunny/mega/shiny.pal
rename to graphics/pokemon/gen_4/lopunny/mega/shiny.pal
diff --git a/graphics/pokemon/lopunny/normal.pal b/graphics/pokemon/gen_4/lopunny/normal.pal
similarity index 100%
rename from graphics/pokemon/lopunny/normal.pal
rename to graphics/pokemon/gen_4/lopunny/normal.pal
diff --git a/graphics/pokemon/lopunny/shiny.pal b/graphics/pokemon/gen_4/lopunny/shiny.pal
similarity index 100%
rename from graphics/pokemon/lopunny/shiny.pal
rename to graphics/pokemon/gen_4/lopunny/shiny.pal
diff --git a/graphics/pokemon/lucario/anim_front.png b/graphics/pokemon/gen_4/lucario/anim_front.png
similarity index 100%
rename from graphics/pokemon/lucario/anim_front.png
rename to graphics/pokemon/gen_4/lucario/anim_front.png
diff --git a/graphics/pokemon/lucario/back.png b/graphics/pokemon/gen_4/lucario/back.png
similarity index 100%
rename from graphics/pokemon/lucario/back.png
rename to graphics/pokemon/gen_4/lucario/back.png
diff --git a/graphics/pokemon/lucario/footprint.png b/graphics/pokemon/gen_4/lucario/footprint.png
similarity index 100%
rename from graphics/pokemon/lucario/footprint.png
rename to graphics/pokemon/gen_4/lucario/footprint.png
diff --git a/graphics/pokemon/lucario/icon.png b/graphics/pokemon/gen_4/lucario/icon.png
similarity index 100%
rename from graphics/pokemon/lucario/icon.png
rename to graphics/pokemon/gen_4/lucario/icon.png
diff --git a/graphics/pokemon/lucario/mega/back.png b/graphics/pokemon/gen_4/lucario/mega/back.png
similarity index 100%
rename from graphics/pokemon/lucario/mega/back.png
rename to graphics/pokemon/gen_4/lucario/mega/back.png
diff --git a/graphics/pokemon/lucario/mega/front.png b/graphics/pokemon/gen_4/lucario/mega/front.png
similarity index 100%
rename from graphics/pokemon/lucario/mega/front.png
rename to graphics/pokemon/gen_4/lucario/mega/front.png
diff --git a/graphics/pokemon/lucario/mega/icon.png b/graphics/pokemon/gen_4/lucario/mega/icon.png
similarity index 100%
rename from graphics/pokemon/lucario/mega/icon.png
rename to graphics/pokemon/gen_4/lucario/mega/icon.png
diff --git a/graphics/pokemon/lucario/mega/normal.pal b/graphics/pokemon/gen_4/lucario/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/lucario/mega/normal.pal
rename to graphics/pokemon/gen_4/lucario/mega/normal.pal
diff --git a/graphics/pokemon/lucario/mega/shiny.pal b/graphics/pokemon/gen_4/lucario/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/lucario/mega/shiny.pal
rename to graphics/pokemon/gen_4/lucario/mega/shiny.pal
diff --git a/graphics/pokemon/lucario/normal.pal b/graphics/pokemon/gen_4/lucario/normal.pal
similarity index 100%
rename from graphics/pokemon/lucario/normal.pal
rename to graphics/pokemon/gen_4/lucario/normal.pal
diff --git a/graphics/pokemon/lucario/shiny.pal b/graphics/pokemon/gen_4/lucario/shiny.pal
similarity index 100%
rename from graphics/pokemon/lucario/shiny.pal
rename to graphics/pokemon/gen_4/lucario/shiny.pal
diff --git a/graphics/pokemon/lumineon/anim_front.png b/graphics/pokemon/gen_4/lumineon/anim_front.png
similarity index 100%
rename from graphics/pokemon/lumineon/anim_front.png
rename to graphics/pokemon/gen_4/lumineon/anim_front.png
diff --git a/graphics/pokemon/lumineon/anim_frontf.png b/graphics/pokemon/gen_4/lumineon/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/lumineon/anim_frontf.png
rename to graphics/pokemon/gen_4/lumineon/anim_frontf.png
diff --git a/graphics/pokemon/lumineon/back.png b/graphics/pokemon/gen_4/lumineon/back.png
similarity index 100%
rename from graphics/pokemon/lumineon/back.png
rename to graphics/pokemon/gen_4/lumineon/back.png
diff --git a/graphics/pokemon/lumineon/backf.png b/graphics/pokemon/gen_4/lumineon/backf.png
similarity index 100%
rename from graphics/pokemon/lumineon/backf.png
rename to graphics/pokemon/gen_4/lumineon/backf.png
diff --git a/graphics/pokemon/kingdra/footprint.png b/graphics/pokemon/gen_4/lumineon/footprint.png
similarity index 100%
rename from graphics/pokemon/kingdra/footprint.png
rename to graphics/pokemon/gen_4/lumineon/footprint.png
diff --git a/graphics/pokemon/lumineon/icon.png b/graphics/pokemon/gen_4/lumineon/icon.png
similarity index 100%
rename from graphics/pokemon/lumineon/icon.png
rename to graphics/pokemon/gen_4/lumineon/icon.png
diff --git a/graphics/pokemon/lumineon/normal.pal b/graphics/pokemon/gen_4/lumineon/normal.pal
similarity index 100%
rename from graphics/pokemon/lumineon/normal.pal
rename to graphics/pokemon/gen_4/lumineon/normal.pal
diff --git a/graphics/pokemon/lumineon/shiny.pal b/graphics/pokemon/gen_4/lumineon/shiny.pal
similarity index 100%
rename from graphics/pokemon/lumineon/shiny.pal
rename to graphics/pokemon/gen_4/lumineon/shiny.pal
diff --git a/graphics/pokemon/luxio/anim_front.png b/graphics/pokemon/gen_4/luxio/anim_front.png
similarity index 100%
rename from graphics/pokemon/luxio/anim_front.png
rename to graphics/pokemon/gen_4/luxio/anim_front.png
diff --git a/graphics/pokemon/luxio/anim_frontf.png b/graphics/pokemon/gen_4/luxio/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/luxio/anim_frontf.png
rename to graphics/pokemon/gen_4/luxio/anim_frontf.png
diff --git a/graphics/pokemon/luxio/back.png b/graphics/pokemon/gen_4/luxio/back.png
similarity index 100%
rename from graphics/pokemon/luxio/back.png
rename to graphics/pokemon/gen_4/luxio/back.png
diff --git a/graphics/pokemon/luxio/backf.png b/graphics/pokemon/gen_4/luxio/backf.png
similarity index 100%
rename from graphics/pokemon/luxio/backf.png
rename to graphics/pokemon/gen_4/luxio/backf.png
diff --git a/graphics/pokemon/luxio/footprint.png b/graphics/pokemon/gen_4/luxio/footprint.png
similarity index 100%
rename from graphics/pokemon/luxio/footprint.png
rename to graphics/pokemon/gen_4/luxio/footprint.png
diff --git a/graphics/pokemon/luxio/icon.png b/graphics/pokemon/gen_4/luxio/icon.png
similarity index 100%
rename from graphics/pokemon/luxio/icon.png
rename to graphics/pokemon/gen_4/luxio/icon.png
diff --git a/graphics/pokemon/luxio/normal.pal b/graphics/pokemon/gen_4/luxio/normal.pal
similarity index 100%
rename from graphics/pokemon/luxio/normal.pal
rename to graphics/pokemon/gen_4/luxio/normal.pal
diff --git a/graphics/pokemon/luxio/shiny.pal b/graphics/pokemon/gen_4/luxio/shiny.pal
similarity index 100%
rename from graphics/pokemon/luxio/shiny.pal
rename to graphics/pokemon/gen_4/luxio/shiny.pal
diff --git a/graphics/pokemon/luxray/anim_front.png b/graphics/pokemon/gen_4/luxray/anim_front.png
similarity index 100%
rename from graphics/pokemon/luxray/anim_front.png
rename to graphics/pokemon/gen_4/luxray/anim_front.png
diff --git a/graphics/pokemon/luxray/anim_frontf.png b/graphics/pokemon/gen_4/luxray/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/luxray/anim_frontf.png
rename to graphics/pokemon/gen_4/luxray/anim_frontf.png
diff --git a/graphics/pokemon/luxray/back.png b/graphics/pokemon/gen_4/luxray/back.png
similarity index 100%
rename from graphics/pokemon/luxray/back.png
rename to graphics/pokemon/gen_4/luxray/back.png
diff --git a/graphics/pokemon/luxray/backf.png b/graphics/pokemon/gen_4/luxray/backf.png
similarity index 100%
rename from graphics/pokemon/luxray/backf.png
rename to graphics/pokemon/gen_4/luxray/backf.png
diff --git a/graphics/pokemon/luxray/footprint.png b/graphics/pokemon/gen_4/luxray/footprint.png
similarity index 100%
rename from graphics/pokemon/luxray/footprint.png
rename to graphics/pokemon/gen_4/luxray/footprint.png
diff --git a/graphics/pokemon/luxray/icon.png b/graphics/pokemon/gen_4/luxray/icon.png
similarity index 100%
rename from graphics/pokemon/luxray/icon.png
rename to graphics/pokemon/gen_4/luxray/icon.png
diff --git a/graphics/pokemon/luxray/normal.pal b/graphics/pokemon/gen_4/luxray/normal.pal
similarity index 100%
rename from graphics/pokemon/luxray/normal.pal
rename to graphics/pokemon/gen_4/luxray/normal.pal
diff --git a/graphics/pokemon/luxray/shiny.pal b/graphics/pokemon/gen_4/luxray/shiny.pal
similarity index 100%
rename from graphics/pokemon/luxray/shiny.pal
rename to graphics/pokemon/gen_4/luxray/shiny.pal
diff --git a/graphics/pokemon/magmortar/anim_front.png b/graphics/pokemon/gen_4/magmortar/anim_front.png
similarity index 100%
rename from graphics/pokemon/magmortar/anim_front.png
rename to graphics/pokemon/gen_4/magmortar/anim_front.png
diff --git a/graphics/pokemon/magmortar/back.png b/graphics/pokemon/gen_4/magmortar/back.png
similarity index 100%
rename from graphics/pokemon/magmortar/back.png
rename to graphics/pokemon/gen_4/magmortar/back.png
diff --git a/graphics/pokemon/magmortar/footprint.png b/graphics/pokemon/gen_4/magmortar/footprint.png
similarity index 100%
rename from graphics/pokemon/magmortar/footprint.png
rename to graphics/pokemon/gen_4/magmortar/footprint.png
diff --git a/graphics/pokemon/magmortar/icon.png b/graphics/pokemon/gen_4/magmortar/icon.png
similarity index 100%
rename from graphics/pokemon/magmortar/icon.png
rename to graphics/pokemon/gen_4/magmortar/icon.png
diff --git a/graphics/pokemon/magmortar/normal.pal b/graphics/pokemon/gen_4/magmortar/normal.pal
similarity index 100%
rename from graphics/pokemon/magmortar/normal.pal
rename to graphics/pokemon/gen_4/magmortar/normal.pal
diff --git a/graphics/pokemon/magmortar/shiny.pal b/graphics/pokemon/gen_4/magmortar/shiny.pal
similarity index 100%
rename from graphics/pokemon/magmortar/shiny.pal
rename to graphics/pokemon/gen_4/magmortar/shiny.pal
diff --git a/graphics/pokemon/magnezone/anim_front.png b/graphics/pokemon/gen_4/magnezone/anim_front.png
similarity index 100%
rename from graphics/pokemon/magnezone/anim_front.png
rename to graphics/pokemon/gen_4/magnezone/anim_front.png
diff --git a/graphics/pokemon/magnezone/back.png b/graphics/pokemon/gen_4/magnezone/back.png
similarity index 100%
rename from graphics/pokemon/magnezone/back.png
rename to graphics/pokemon/gen_4/magnezone/back.png
diff --git a/graphics/pokemon/klang/footprint.png b/graphics/pokemon/gen_4/magnezone/footprint.png
similarity index 100%
rename from graphics/pokemon/klang/footprint.png
rename to graphics/pokemon/gen_4/magnezone/footprint.png
diff --git a/graphics/pokemon/magnezone/icon.png b/graphics/pokemon/gen_4/magnezone/icon.png
similarity index 100%
rename from graphics/pokemon/magnezone/icon.png
rename to graphics/pokemon/gen_4/magnezone/icon.png
diff --git a/graphics/pokemon/magnezone/normal.pal b/graphics/pokemon/gen_4/magnezone/normal.pal
similarity index 100%
rename from graphics/pokemon/magnezone/normal.pal
rename to graphics/pokemon/gen_4/magnezone/normal.pal
diff --git a/graphics/pokemon/magnezone/shiny.pal b/graphics/pokemon/gen_4/magnezone/shiny.pal
similarity index 100%
rename from graphics/pokemon/magnezone/shiny.pal
rename to graphics/pokemon/gen_4/magnezone/shiny.pal
diff --git a/graphics/pokemon/mamoswine/anim_front.png b/graphics/pokemon/gen_4/mamoswine/anim_front.png
similarity index 100%
rename from graphics/pokemon/mamoswine/anim_front.png
rename to graphics/pokemon/gen_4/mamoswine/anim_front.png
diff --git a/graphics/pokemon/mamoswine/anim_frontf.png b/graphics/pokemon/gen_4/mamoswine/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/mamoswine/anim_frontf.png
rename to graphics/pokemon/gen_4/mamoswine/anim_frontf.png
diff --git a/graphics/pokemon/mamoswine/back.png b/graphics/pokemon/gen_4/mamoswine/back.png
similarity index 100%
rename from graphics/pokemon/mamoswine/back.png
rename to graphics/pokemon/gen_4/mamoswine/back.png
diff --git a/graphics/pokemon/mamoswine/footprint.png b/graphics/pokemon/gen_4/mamoswine/footprint.png
similarity index 100%
rename from graphics/pokemon/mamoswine/footprint.png
rename to graphics/pokemon/gen_4/mamoswine/footprint.png
diff --git a/graphics/pokemon/mamoswine/icon.png b/graphics/pokemon/gen_4/mamoswine/icon.png
similarity index 100%
rename from graphics/pokemon/mamoswine/icon.png
rename to graphics/pokemon/gen_4/mamoswine/icon.png
diff --git a/graphics/pokemon/mamoswine/normal.pal b/graphics/pokemon/gen_4/mamoswine/normal.pal
similarity index 100%
rename from graphics/pokemon/mamoswine/normal.pal
rename to graphics/pokemon/gen_4/mamoswine/normal.pal
diff --git a/graphics/pokemon/mamoswine/shiny.pal b/graphics/pokemon/gen_4/mamoswine/shiny.pal
similarity index 100%
rename from graphics/pokemon/mamoswine/shiny.pal
rename to graphics/pokemon/gen_4/mamoswine/shiny.pal
diff --git a/graphics/pokemon/manaphy/anim_front.png b/graphics/pokemon/gen_4/manaphy/anim_front.png
similarity index 100%
rename from graphics/pokemon/manaphy/anim_front.png
rename to graphics/pokemon/gen_4/manaphy/anim_front.png
diff --git a/graphics/pokemon/manaphy/back.png b/graphics/pokemon/gen_4/manaphy/back.png
similarity index 100%
rename from graphics/pokemon/manaphy/back.png
rename to graphics/pokemon/gen_4/manaphy/back.png
diff --git a/graphics/pokemon/klefki/footprint.png b/graphics/pokemon/gen_4/manaphy/footprint.png
similarity index 100%
rename from graphics/pokemon/klefki/footprint.png
rename to graphics/pokemon/gen_4/manaphy/footprint.png
diff --git a/graphics/pokemon/manaphy/icon.png b/graphics/pokemon/gen_4/manaphy/icon.png
similarity index 100%
rename from graphics/pokemon/manaphy/icon.png
rename to graphics/pokemon/gen_4/manaphy/icon.png
diff --git a/graphics/pokemon/manaphy/normal.pal b/graphics/pokemon/gen_4/manaphy/normal.pal
similarity index 100%
rename from graphics/pokemon/manaphy/normal.pal
rename to graphics/pokemon/gen_4/manaphy/normal.pal
diff --git a/graphics/pokemon/manaphy/shiny.pal b/graphics/pokemon/gen_4/manaphy/shiny.pal
similarity index 100%
rename from graphics/pokemon/manaphy/shiny.pal
rename to graphics/pokemon/gen_4/manaphy/shiny.pal
diff --git a/graphics/pokemon/mantyke/anim_front.png b/graphics/pokemon/gen_4/mantyke/anim_front.png
similarity index 100%
rename from graphics/pokemon/mantyke/anim_front.png
rename to graphics/pokemon/gen_4/mantyke/anim_front.png
diff --git a/graphics/pokemon/mantyke/back.png b/graphics/pokemon/gen_4/mantyke/back.png
similarity index 100%
rename from graphics/pokemon/mantyke/back.png
rename to graphics/pokemon/gen_4/mantyke/back.png
diff --git a/graphics/pokemon/klink/footprint.png b/graphics/pokemon/gen_4/mantyke/footprint.png
similarity index 100%
rename from graphics/pokemon/klink/footprint.png
rename to graphics/pokemon/gen_4/mantyke/footprint.png
diff --git a/graphics/pokemon/mantyke/icon.png b/graphics/pokemon/gen_4/mantyke/icon.png
similarity index 100%
rename from graphics/pokemon/mantyke/icon.png
rename to graphics/pokemon/gen_4/mantyke/icon.png
diff --git a/graphics/pokemon/mantyke/normal.pal b/graphics/pokemon/gen_4/mantyke/normal.pal
similarity index 100%
rename from graphics/pokemon/mantyke/normal.pal
rename to graphics/pokemon/gen_4/mantyke/normal.pal
diff --git a/graphics/pokemon/mantyke/shiny.pal b/graphics/pokemon/gen_4/mantyke/shiny.pal
similarity index 100%
rename from graphics/pokemon/mantyke/shiny.pal
rename to graphics/pokemon/gen_4/mantyke/shiny.pal
diff --git a/graphics/pokemon/mesprit/anim_front.png b/graphics/pokemon/gen_4/mesprit/anim_front.png
similarity index 100%
rename from graphics/pokemon/mesprit/anim_front.png
rename to graphics/pokemon/gen_4/mesprit/anim_front.png
diff --git a/graphics/pokemon/mesprit/back.png b/graphics/pokemon/gen_4/mesprit/back.png
similarity index 100%
rename from graphics/pokemon/mesprit/back.png
rename to graphics/pokemon/gen_4/mesprit/back.png
diff --git a/graphics/pokemon/mesprit/footprint.png b/graphics/pokemon/gen_4/mesprit/footprint.png
similarity index 100%
rename from graphics/pokemon/mesprit/footprint.png
rename to graphics/pokemon/gen_4/mesprit/footprint.png
diff --git a/graphics/pokemon/mesprit/icon.png b/graphics/pokemon/gen_4/mesprit/icon.png
similarity index 100%
rename from graphics/pokemon/mesprit/icon.png
rename to graphics/pokemon/gen_4/mesprit/icon.png
diff --git a/graphics/pokemon/mesprit/normal.pal b/graphics/pokemon/gen_4/mesprit/normal.pal
similarity index 100%
rename from graphics/pokemon/mesprit/normal.pal
rename to graphics/pokemon/gen_4/mesprit/normal.pal
diff --git a/graphics/pokemon/mesprit/shiny.pal b/graphics/pokemon/gen_4/mesprit/shiny.pal
similarity index 100%
rename from graphics/pokemon/mesprit/shiny.pal
rename to graphics/pokemon/gen_4/mesprit/shiny.pal
diff --git a/graphics/pokemon/mime_jr/anim_front.png b/graphics/pokemon/gen_4/mime_jr/anim_front.png
similarity index 100%
rename from graphics/pokemon/mime_jr/anim_front.png
rename to graphics/pokemon/gen_4/mime_jr/anim_front.png
diff --git a/graphics/pokemon/mime_jr/back.png b/graphics/pokemon/gen_4/mime_jr/back.png
similarity index 100%
rename from graphics/pokemon/mime_jr/back.png
rename to graphics/pokemon/gen_4/mime_jr/back.png
diff --git a/graphics/pokemon/cursola/footprint.png b/graphics/pokemon/gen_4/mime_jr/footprint.png
similarity index 100%
rename from graphics/pokemon/cursola/footprint.png
rename to graphics/pokemon/gen_4/mime_jr/footprint.png
diff --git a/graphics/pokemon/mime_jr/icon.png b/graphics/pokemon/gen_4/mime_jr/icon.png
similarity index 100%
rename from graphics/pokemon/mime_jr/icon.png
rename to graphics/pokemon/gen_4/mime_jr/icon.png
diff --git a/graphics/pokemon/mime_jr/normal.pal b/graphics/pokemon/gen_4/mime_jr/normal.pal
similarity index 100%
rename from graphics/pokemon/mime_jr/normal.pal
rename to graphics/pokemon/gen_4/mime_jr/normal.pal
diff --git a/graphics/pokemon/mime_jr/shiny.pal b/graphics/pokemon/gen_4/mime_jr/shiny.pal
similarity index 100%
rename from graphics/pokemon/mime_jr/shiny.pal
rename to graphics/pokemon/gen_4/mime_jr/shiny.pal
diff --git a/graphics/pokemon/mismagius/anim_front.png b/graphics/pokemon/gen_4/mismagius/anim_front.png
similarity index 100%
rename from graphics/pokemon/mismagius/anim_front.png
rename to graphics/pokemon/gen_4/mismagius/anim_front.png
diff --git a/graphics/pokemon/mismagius/back.png b/graphics/pokemon/gen_4/mismagius/back.png
similarity index 100%
rename from graphics/pokemon/mismagius/back.png
rename to graphics/pokemon/gen_4/mismagius/back.png
diff --git a/graphics/pokemon/klinklang/footprint.png b/graphics/pokemon/gen_4/mismagius/footprint.png
similarity index 100%
rename from graphics/pokemon/klinklang/footprint.png
rename to graphics/pokemon/gen_4/mismagius/footprint.png
diff --git a/graphics/pokemon/mismagius/icon.png b/graphics/pokemon/gen_4/mismagius/icon.png
similarity index 100%
rename from graphics/pokemon/mismagius/icon.png
rename to graphics/pokemon/gen_4/mismagius/icon.png
diff --git a/graphics/pokemon/mismagius/normal.pal b/graphics/pokemon/gen_4/mismagius/normal.pal
similarity index 100%
rename from graphics/pokemon/mismagius/normal.pal
rename to graphics/pokemon/gen_4/mismagius/normal.pal
diff --git a/graphics/pokemon/mismagius/shiny.pal b/graphics/pokemon/gen_4/mismagius/shiny.pal
similarity index 100%
rename from graphics/pokemon/mismagius/shiny.pal
rename to graphics/pokemon/gen_4/mismagius/shiny.pal
diff --git a/graphics/pokemon/monferno/anim_front.png b/graphics/pokemon/gen_4/monferno/anim_front.png
similarity index 100%
rename from graphics/pokemon/monferno/anim_front.png
rename to graphics/pokemon/gen_4/monferno/anim_front.png
diff --git a/graphics/pokemon/monferno/back.png b/graphics/pokemon/gen_4/monferno/back.png
similarity index 100%
rename from graphics/pokemon/monferno/back.png
rename to graphics/pokemon/gen_4/monferno/back.png
diff --git a/graphics/pokemon/monferno/footprint.png b/graphics/pokemon/gen_4/monferno/footprint.png
similarity index 100%
rename from graphics/pokemon/monferno/footprint.png
rename to graphics/pokemon/gen_4/monferno/footprint.png
diff --git a/graphics/pokemon/monferno/icon.png b/graphics/pokemon/gen_4/monferno/icon.png
similarity index 100%
rename from graphics/pokemon/monferno/icon.png
rename to graphics/pokemon/gen_4/monferno/icon.png
diff --git a/graphics/pokemon/monferno/normal.pal b/graphics/pokemon/gen_4/monferno/normal.pal
similarity index 100%
rename from graphics/pokemon/monferno/normal.pal
rename to graphics/pokemon/gen_4/monferno/normal.pal
diff --git a/graphics/pokemon/monferno/shiny.pal b/graphics/pokemon/gen_4/monferno/shiny.pal
similarity index 100%
rename from graphics/pokemon/monferno/shiny.pal
rename to graphics/pokemon/gen_4/monferno/shiny.pal
diff --git a/graphics/pokemon/mothim/anim_front.png b/graphics/pokemon/gen_4/mothim/anim_front.png
similarity index 100%
rename from graphics/pokemon/mothim/anim_front.png
rename to graphics/pokemon/gen_4/mothim/anim_front.png
diff --git a/graphics/pokemon/mothim/back.png b/graphics/pokemon/gen_4/mothim/back.png
similarity index 100%
rename from graphics/pokemon/mothim/back.png
rename to graphics/pokemon/gen_4/mothim/back.png
diff --git a/graphics/pokemon/kabuto/footprint.png b/graphics/pokemon/gen_4/mothim/footprint.png
similarity index 100%
rename from graphics/pokemon/kabuto/footprint.png
rename to graphics/pokemon/gen_4/mothim/footprint.png
diff --git a/graphics/pokemon/mothim/icon.png b/graphics/pokemon/gen_4/mothim/icon.png
similarity index 100%
rename from graphics/pokemon/mothim/icon.png
rename to graphics/pokemon/gen_4/mothim/icon.png
diff --git a/graphics/pokemon/mothim/normal.pal b/graphics/pokemon/gen_4/mothim/normal.pal
similarity index 100%
rename from graphics/pokemon/mothim/normal.pal
rename to graphics/pokemon/gen_4/mothim/normal.pal
diff --git a/graphics/pokemon/mothim/shiny.pal b/graphics/pokemon/gen_4/mothim/shiny.pal
similarity index 100%
rename from graphics/pokemon/mothim/shiny.pal
rename to graphics/pokemon/gen_4/mothim/shiny.pal
diff --git a/graphics/pokemon/munchlax/anim_front.png b/graphics/pokemon/gen_4/munchlax/anim_front.png
similarity index 100%
rename from graphics/pokemon/munchlax/anim_front.png
rename to graphics/pokemon/gen_4/munchlax/anim_front.png
diff --git a/graphics/pokemon/munchlax/back.png b/graphics/pokemon/gen_4/munchlax/back.png
similarity index 100%
rename from graphics/pokemon/munchlax/back.png
rename to graphics/pokemon/gen_4/munchlax/back.png
diff --git a/graphics/pokemon/munchlax/footprint.png b/graphics/pokemon/gen_4/munchlax/footprint.png
similarity index 100%
rename from graphics/pokemon/munchlax/footprint.png
rename to graphics/pokemon/gen_4/munchlax/footprint.png
diff --git a/graphics/pokemon/munchlax/icon.png b/graphics/pokemon/gen_4/munchlax/icon.png
similarity index 100%
rename from graphics/pokemon/munchlax/icon.png
rename to graphics/pokemon/gen_4/munchlax/icon.png
diff --git a/graphics/pokemon/munchlax/normal.pal b/graphics/pokemon/gen_4/munchlax/normal.pal
similarity index 100%
rename from graphics/pokemon/munchlax/normal.pal
rename to graphics/pokemon/gen_4/munchlax/normal.pal
diff --git a/graphics/pokemon/munchlax/shiny.pal b/graphics/pokemon/gen_4/munchlax/shiny.pal
similarity index 100%
rename from graphics/pokemon/munchlax/shiny.pal
rename to graphics/pokemon/gen_4/munchlax/shiny.pal
diff --git a/graphics/pokemon/pachirisu/anim_front.png b/graphics/pokemon/gen_4/pachirisu/anim_front.png
similarity index 100%
rename from graphics/pokemon/pachirisu/anim_front.png
rename to graphics/pokemon/gen_4/pachirisu/anim_front.png
diff --git a/graphics/pokemon/pachirisu/anim_frontf.png b/graphics/pokemon/gen_4/pachirisu/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/pachirisu/anim_frontf.png
rename to graphics/pokemon/gen_4/pachirisu/anim_frontf.png
diff --git a/graphics/pokemon/pachirisu/back.png b/graphics/pokemon/gen_4/pachirisu/back.png
similarity index 100%
rename from graphics/pokemon/pachirisu/back.png
rename to graphics/pokemon/gen_4/pachirisu/back.png
diff --git a/graphics/pokemon/pachirisu/footprint.png b/graphics/pokemon/gen_4/pachirisu/footprint.png
similarity index 100%
rename from graphics/pokemon/pachirisu/footprint.png
rename to graphics/pokemon/gen_4/pachirisu/footprint.png
diff --git a/graphics/pokemon/pachirisu/icon.png b/graphics/pokemon/gen_4/pachirisu/icon.png
similarity index 100%
rename from graphics/pokemon/pachirisu/icon.png
rename to graphics/pokemon/gen_4/pachirisu/icon.png
diff --git a/graphics/pokemon/pachirisu/normal.pal b/graphics/pokemon/gen_4/pachirisu/normal.pal
similarity index 100%
rename from graphics/pokemon/pachirisu/normal.pal
rename to graphics/pokemon/gen_4/pachirisu/normal.pal
diff --git a/graphics/pokemon/pachirisu/shiny.pal b/graphics/pokemon/gen_4/pachirisu/shiny.pal
similarity index 100%
rename from graphics/pokemon/pachirisu/shiny.pal
rename to graphics/pokemon/gen_4/pachirisu/shiny.pal
diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/gen_4/palkia/anim_front.png
similarity index 100%
rename from graphics/pokemon/palkia/anim_front.png
rename to graphics/pokemon/gen_4/palkia/anim_front.png
diff --git a/graphics/pokemon/palkia/back.png b/graphics/pokemon/gen_4/palkia/back.png
similarity index 100%
rename from graphics/pokemon/palkia/back.png
rename to graphics/pokemon/gen_4/palkia/back.png
diff --git a/graphics/pokemon/palkia/footprint.png b/graphics/pokemon/gen_4/palkia/footprint.png
similarity index 100%
rename from graphics/pokemon/palkia/footprint.png
rename to graphics/pokemon/gen_4/palkia/footprint.png
diff --git a/graphics/pokemon/palkia/icon.png b/graphics/pokemon/gen_4/palkia/icon.png
similarity index 100%
rename from graphics/pokemon/palkia/icon.png
rename to graphics/pokemon/gen_4/palkia/icon.png
diff --git a/graphics/pokemon/palkia/normal.pal b/graphics/pokemon/gen_4/palkia/normal.pal
similarity index 100%
rename from graphics/pokemon/palkia/normal.pal
rename to graphics/pokemon/gen_4/palkia/normal.pal
diff --git a/graphics/pokemon/palkia/origin/back.png b/graphics/pokemon/gen_4/palkia/origin/back.png
similarity index 100%
rename from graphics/pokemon/palkia/origin/back.png
rename to graphics/pokemon/gen_4/palkia/origin/back.png
diff --git a/graphics/pokemon/palkia/origin/front.png b/graphics/pokemon/gen_4/palkia/origin/front.png
similarity index 100%
rename from graphics/pokemon/palkia/origin/front.png
rename to graphics/pokemon/gen_4/palkia/origin/front.png
diff --git a/graphics/pokemon/palkia/origin/icon.png b/graphics/pokemon/gen_4/palkia/origin/icon.png
similarity index 100%
rename from graphics/pokemon/palkia/origin/icon.png
rename to graphics/pokemon/gen_4/palkia/origin/icon.png
diff --git a/graphics/pokemon/palkia/origin/normal.pal b/graphics/pokemon/gen_4/palkia/origin/normal.pal
similarity index 100%
rename from graphics/pokemon/palkia/origin/normal.pal
rename to graphics/pokemon/gen_4/palkia/origin/normal.pal
diff --git a/graphics/pokemon/palkia/origin/shiny.pal b/graphics/pokemon/gen_4/palkia/origin/shiny.pal
similarity index 100%
rename from graphics/pokemon/palkia/origin/shiny.pal
rename to graphics/pokemon/gen_4/palkia/origin/shiny.pal
diff --git a/graphics/pokemon/palkia/shiny.pal b/graphics/pokemon/gen_4/palkia/shiny.pal
similarity index 100%
rename from graphics/pokemon/palkia/shiny.pal
rename to graphics/pokemon/gen_4/palkia/shiny.pal
diff --git a/graphics/pokemon/phione/anim_front.png b/graphics/pokemon/gen_4/phione/anim_front.png
similarity index 100%
rename from graphics/pokemon/phione/anim_front.png
rename to graphics/pokemon/gen_4/phione/anim_front.png
diff --git a/graphics/pokemon/phione/back.png b/graphics/pokemon/gen_4/phione/back.png
similarity index 100%
rename from graphics/pokemon/phione/back.png
rename to graphics/pokemon/gen_4/phione/back.png
diff --git a/graphics/pokemon/koffing/footprint.png b/graphics/pokemon/gen_4/phione/footprint.png
similarity index 100%
rename from graphics/pokemon/koffing/footprint.png
rename to graphics/pokemon/gen_4/phione/footprint.png
diff --git a/graphics/pokemon/phione/icon.png b/graphics/pokemon/gen_4/phione/icon.png
similarity index 100%
rename from graphics/pokemon/phione/icon.png
rename to graphics/pokemon/gen_4/phione/icon.png
diff --git a/graphics/pokemon/phione/normal.pal b/graphics/pokemon/gen_4/phione/normal.pal
similarity index 100%
rename from graphics/pokemon/phione/normal.pal
rename to graphics/pokemon/gen_4/phione/normal.pal
diff --git a/graphics/pokemon/phione/shiny.pal b/graphics/pokemon/gen_4/phione/shiny.pal
similarity index 100%
rename from graphics/pokemon/phione/shiny.pal
rename to graphics/pokemon/gen_4/phione/shiny.pal
diff --git a/graphics/pokemon/piplup/anim_front.png b/graphics/pokemon/gen_4/piplup/anim_front.png
similarity index 100%
rename from graphics/pokemon/piplup/anim_front.png
rename to graphics/pokemon/gen_4/piplup/anim_front.png
diff --git a/graphics/pokemon/piplup/back.png b/graphics/pokemon/gen_4/piplup/back.png
similarity index 100%
rename from graphics/pokemon/piplup/back.png
rename to graphics/pokemon/gen_4/piplup/back.png
diff --git a/graphics/pokemon/piplup/footprint.png b/graphics/pokemon/gen_4/piplup/footprint.png
similarity index 100%
rename from graphics/pokemon/piplup/footprint.png
rename to graphics/pokemon/gen_4/piplup/footprint.png
diff --git a/graphics/pokemon/piplup/icon.png b/graphics/pokemon/gen_4/piplup/icon.png
similarity index 100%
rename from graphics/pokemon/piplup/icon.png
rename to graphics/pokemon/gen_4/piplup/icon.png
diff --git a/graphics/pokemon/piplup/normal.pal b/graphics/pokemon/gen_4/piplup/normal.pal
similarity index 100%
rename from graphics/pokemon/piplup/normal.pal
rename to graphics/pokemon/gen_4/piplup/normal.pal
diff --git a/graphics/pokemon/piplup/shiny.pal b/graphics/pokemon/gen_4/piplup/shiny.pal
similarity index 100%
rename from graphics/pokemon/piplup/shiny.pal
rename to graphics/pokemon/gen_4/piplup/shiny.pal
diff --git a/graphics/pokemon/porygon_z/anim_front.png b/graphics/pokemon/gen_4/porygon_z/anim_front.png
similarity index 100%
rename from graphics/pokemon/porygon_z/anim_front.png
rename to graphics/pokemon/gen_4/porygon_z/anim_front.png
diff --git a/graphics/pokemon/porygon_z/back.png b/graphics/pokemon/gen_4/porygon_z/back.png
similarity index 100%
rename from graphics/pokemon/porygon_z/back.png
rename to graphics/pokemon/gen_4/porygon_z/back.png
diff --git a/graphics/pokemon/cherrim/footprint.png b/graphics/pokemon/gen_4/porygon_z/footprint.png
similarity index 100%
rename from graphics/pokemon/cherrim/footprint.png
rename to graphics/pokemon/gen_4/porygon_z/footprint.png
diff --git a/graphics/pokemon/porygon_z/icon.png b/graphics/pokemon/gen_4/porygon_z/icon.png
similarity index 100%
rename from graphics/pokemon/porygon_z/icon.png
rename to graphics/pokemon/gen_4/porygon_z/icon.png
diff --git a/graphics/pokemon/porygon_z/normal.pal b/graphics/pokemon/gen_4/porygon_z/normal.pal
similarity index 100%
rename from graphics/pokemon/porygon_z/normal.pal
rename to graphics/pokemon/gen_4/porygon_z/normal.pal
diff --git a/graphics/pokemon/porygon_z/shiny.pal b/graphics/pokemon/gen_4/porygon_z/shiny.pal
similarity index 100%
rename from graphics/pokemon/porygon_z/shiny.pal
rename to graphics/pokemon/gen_4/porygon_z/shiny.pal
diff --git a/graphics/pokemon/prinplup/anim_front.png b/graphics/pokemon/gen_4/prinplup/anim_front.png
similarity index 100%
rename from graphics/pokemon/prinplup/anim_front.png
rename to graphics/pokemon/gen_4/prinplup/anim_front.png
diff --git a/graphics/pokemon/prinplup/back.png b/graphics/pokemon/gen_4/prinplup/back.png
similarity index 100%
rename from graphics/pokemon/prinplup/back.png
rename to graphics/pokemon/gen_4/prinplup/back.png
diff --git a/graphics/pokemon/prinplup/footprint.png b/graphics/pokemon/gen_4/prinplup/footprint.png
similarity index 100%
rename from graphics/pokemon/prinplup/footprint.png
rename to graphics/pokemon/gen_4/prinplup/footprint.png
diff --git a/graphics/pokemon/prinplup/icon.png b/graphics/pokemon/gen_4/prinplup/icon.png
similarity index 100%
rename from graphics/pokemon/prinplup/icon.png
rename to graphics/pokemon/gen_4/prinplup/icon.png
diff --git a/graphics/pokemon/prinplup/normal.pal b/graphics/pokemon/gen_4/prinplup/normal.pal
similarity index 100%
rename from graphics/pokemon/prinplup/normal.pal
rename to graphics/pokemon/gen_4/prinplup/normal.pal
diff --git a/graphics/pokemon/prinplup/shiny.pal b/graphics/pokemon/gen_4/prinplup/shiny.pal
similarity index 100%
rename from graphics/pokemon/prinplup/shiny.pal
rename to graphics/pokemon/gen_4/prinplup/shiny.pal
diff --git a/graphics/pokemon/probopass/anim_front.png b/graphics/pokemon/gen_4/probopass/anim_front.png
similarity index 100%
rename from graphics/pokemon/probopass/anim_front.png
rename to graphics/pokemon/gen_4/probopass/anim_front.png
diff --git a/graphics/pokemon/probopass/back.png b/graphics/pokemon/gen_4/probopass/back.png
similarity index 100%
rename from graphics/pokemon/probopass/back.png
rename to graphics/pokemon/gen_4/probopass/back.png
diff --git a/graphics/pokemon/probopass/footprint.png b/graphics/pokemon/gen_4/probopass/footprint.png
similarity index 100%
rename from graphics/pokemon/probopass/footprint.png
rename to graphics/pokemon/gen_4/probopass/footprint.png
diff --git a/graphics/pokemon/probopass/icon.png b/graphics/pokemon/gen_4/probopass/icon.png
similarity index 100%
rename from graphics/pokemon/probopass/icon.png
rename to graphics/pokemon/gen_4/probopass/icon.png
diff --git a/graphics/pokemon/probopass/normal.pal b/graphics/pokemon/gen_4/probopass/normal.pal
similarity index 100%
rename from graphics/pokemon/probopass/normal.pal
rename to graphics/pokemon/gen_4/probopass/normal.pal
diff --git a/graphics/pokemon/probopass/shiny.pal b/graphics/pokemon/gen_4/probopass/shiny.pal
similarity index 100%
rename from graphics/pokemon/probopass/shiny.pal
rename to graphics/pokemon/gen_4/probopass/shiny.pal
diff --git a/graphics/pokemon/purugly/anim_front.png b/graphics/pokemon/gen_4/purugly/anim_front.png
similarity index 100%
rename from graphics/pokemon/purugly/anim_front.png
rename to graphics/pokemon/gen_4/purugly/anim_front.png
diff --git a/graphics/pokemon/purugly/back.png b/graphics/pokemon/gen_4/purugly/back.png
similarity index 100%
rename from graphics/pokemon/purugly/back.png
rename to graphics/pokemon/gen_4/purugly/back.png
diff --git a/graphics/pokemon/purugly/footprint.png b/graphics/pokemon/gen_4/purugly/footprint.png
similarity index 100%
rename from graphics/pokemon/purugly/footprint.png
rename to graphics/pokemon/gen_4/purugly/footprint.png
diff --git a/graphics/pokemon/purugly/icon.png b/graphics/pokemon/gen_4/purugly/icon.png
similarity index 100%
rename from graphics/pokemon/purugly/icon.png
rename to graphics/pokemon/gen_4/purugly/icon.png
diff --git a/graphics/pokemon/purugly/normal.pal b/graphics/pokemon/gen_4/purugly/normal.pal
similarity index 100%
rename from graphics/pokemon/purugly/normal.pal
rename to graphics/pokemon/gen_4/purugly/normal.pal
diff --git a/graphics/pokemon/purugly/shiny.pal b/graphics/pokemon/gen_4/purugly/shiny.pal
similarity index 100%
rename from graphics/pokemon/purugly/shiny.pal
rename to graphics/pokemon/gen_4/purugly/shiny.pal
diff --git a/graphics/pokemon/rampardos/anim_front.png b/graphics/pokemon/gen_4/rampardos/anim_front.png
similarity index 100%
rename from graphics/pokemon/rampardos/anim_front.png
rename to graphics/pokemon/gen_4/rampardos/anim_front.png
diff --git a/graphics/pokemon/rampardos/back.png b/graphics/pokemon/gen_4/rampardos/back.png
similarity index 100%
rename from graphics/pokemon/rampardos/back.png
rename to graphics/pokemon/gen_4/rampardos/back.png
diff --git a/graphics/pokemon/rampardos/footprint.png b/graphics/pokemon/gen_4/rampardos/footprint.png
similarity index 100%
rename from graphics/pokemon/rampardos/footprint.png
rename to graphics/pokemon/gen_4/rampardos/footprint.png
diff --git a/graphics/pokemon/rampardos/icon.png b/graphics/pokemon/gen_4/rampardos/icon.png
similarity index 100%
rename from graphics/pokemon/rampardos/icon.png
rename to graphics/pokemon/gen_4/rampardos/icon.png
diff --git a/graphics/pokemon/rampardos/normal.pal b/graphics/pokemon/gen_4/rampardos/normal.pal
similarity index 100%
rename from graphics/pokemon/rampardos/normal.pal
rename to graphics/pokemon/gen_4/rampardos/normal.pal
diff --git a/graphics/pokemon/rampardos/shiny.pal b/graphics/pokemon/gen_4/rampardos/shiny.pal
similarity index 100%
rename from graphics/pokemon/rampardos/shiny.pal
rename to graphics/pokemon/gen_4/rampardos/shiny.pal
diff --git a/graphics/pokemon/regigigas/anim_front.png b/graphics/pokemon/gen_4/regigigas/anim_front.png
similarity index 100%
rename from graphics/pokemon/regigigas/anim_front.png
rename to graphics/pokemon/gen_4/regigigas/anim_front.png
diff --git a/graphics/pokemon/regigigas/back.png b/graphics/pokemon/gen_4/regigigas/back.png
similarity index 100%
rename from graphics/pokemon/regigigas/back.png
rename to graphics/pokemon/gen_4/regigigas/back.png
diff --git a/graphics/pokemon/regigigas/footprint.png b/graphics/pokemon/gen_4/regigigas/footprint.png
similarity index 100%
rename from graphics/pokemon/regigigas/footprint.png
rename to graphics/pokemon/gen_4/regigigas/footprint.png
diff --git a/graphics/pokemon/regigigas/icon.png b/graphics/pokemon/gen_4/regigigas/icon.png
similarity index 100%
rename from graphics/pokemon/regigigas/icon.png
rename to graphics/pokemon/gen_4/regigigas/icon.png
diff --git a/graphics/pokemon/regigigas/normal.pal b/graphics/pokemon/gen_4/regigigas/normal.pal
similarity index 100%
rename from graphics/pokemon/regigigas/normal.pal
rename to graphics/pokemon/gen_4/regigigas/normal.pal
diff --git a/graphics/pokemon/regigigas/shiny.pal b/graphics/pokemon/gen_4/regigigas/shiny.pal
similarity index 100%
rename from graphics/pokemon/regigigas/shiny.pal
rename to graphics/pokemon/gen_4/regigigas/shiny.pal
diff --git a/graphics/pokemon/rhyperior/anim_front.png b/graphics/pokemon/gen_4/rhyperior/anim_front.png
similarity index 100%
rename from graphics/pokemon/rhyperior/anim_front.png
rename to graphics/pokemon/gen_4/rhyperior/anim_front.png
diff --git a/graphics/pokemon/rhyperior/anim_frontf.png b/graphics/pokemon/gen_4/rhyperior/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/rhyperior/anim_frontf.png
rename to graphics/pokemon/gen_4/rhyperior/anim_frontf.png
diff --git a/graphics/pokemon/rhyperior/back.png b/graphics/pokemon/gen_4/rhyperior/back.png
similarity index 100%
rename from graphics/pokemon/rhyperior/back.png
rename to graphics/pokemon/gen_4/rhyperior/back.png
diff --git a/graphics/pokemon/rhyperior/backf.png b/graphics/pokemon/gen_4/rhyperior/backf.png
similarity index 100%
rename from graphics/pokemon/rhyperior/backf.png
rename to graphics/pokemon/gen_4/rhyperior/backf.png
diff --git a/graphics/pokemon/rhyperior/footprint.png b/graphics/pokemon/gen_4/rhyperior/footprint.png
similarity index 100%
rename from graphics/pokemon/rhyperior/footprint.png
rename to graphics/pokemon/gen_4/rhyperior/footprint.png
diff --git a/graphics/pokemon/rhyperior/icon.png b/graphics/pokemon/gen_4/rhyperior/icon.png
similarity index 100%
rename from graphics/pokemon/rhyperior/icon.png
rename to graphics/pokemon/gen_4/rhyperior/icon.png
diff --git a/graphics/pokemon/rhyperior/normal.pal b/graphics/pokemon/gen_4/rhyperior/normal.pal
similarity index 100%
rename from graphics/pokemon/rhyperior/normal.pal
rename to graphics/pokemon/gen_4/rhyperior/normal.pal
diff --git a/graphics/pokemon/rhyperior/shiny.pal b/graphics/pokemon/gen_4/rhyperior/shiny.pal
similarity index 100%
rename from graphics/pokemon/rhyperior/shiny.pal
rename to graphics/pokemon/gen_4/rhyperior/shiny.pal
diff --git a/graphics/pokemon/riolu/anim_front.png b/graphics/pokemon/gen_4/riolu/anim_front.png
similarity index 100%
rename from graphics/pokemon/riolu/anim_front.png
rename to graphics/pokemon/gen_4/riolu/anim_front.png
diff --git a/graphics/pokemon/riolu/back.png b/graphics/pokemon/gen_4/riolu/back.png
similarity index 100%
rename from graphics/pokemon/riolu/back.png
rename to graphics/pokemon/gen_4/riolu/back.png
diff --git a/graphics/pokemon/riolu/footprint.png b/graphics/pokemon/gen_4/riolu/footprint.png
similarity index 100%
rename from graphics/pokemon/riolu/footprint.png
rename to graphics/pokemon/gen_4/riolu/footprint.png
diff --git a/graphics/pokemon/riolu/icon.png b/graphics/pokemon/gen_4/riolu/icon.png
similarity index 100%
rename from graphics/pokemon/riolu/icon.png
rename to graphics/pokemon/gen_4/riolu/icon.png
diff --git a/graphics/pokemon/riolu/normal.pal b/graphics/pokemon/gen_4/riolu/normal.pal
similarity index 100%
rename from graphics/pokemon/riolu/normal.pal
rename to graphics/pokemon/gen_4/riolu/normal.pal
diff --git a/graphics/pokemon/riolu/shiny.pal b/graphics/pokemon/gen_4/riolu/shiny.pal
similarity index 100%
rename from graphics/pokemon/riolu/shiny.pal
rename to graphics/pokemon/gen_4/riolu/shiny.pal
diff --git a/graphics/pokemon/roserade/anim_front.png b/graphics/pokemon/gen_4/roserade/anim_front.png
similarity index 100%
rename from graphics/pokemon/roserade/anim_front.png
rename to graphics/pokemon/gen_4/roserade/anim_front.png
diff --git a/graphics/pokemon/roserade/anim_frontf.png b/graphics/pokemon/gen_4/roserade/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/roserade/anim_frontf.png
rename to graphics/pokemon/gen_4/roserade/anim_frontf.png
diff --git a/graphics/pokemon/roserade/back.png b/graphics/pokemon/gen_4/roserade/back.png
similarity index 100%
rename from graphics/pokemon/roserade/back.png
rename to graphics/pokemon/gen_4/roserade/back.png
diff --git a/graphics/pokemon/roserade/backf.png b/graphics/pokemon/gen_4/roserade/backf.png
similarity index 100%
rename from graphics/pokemon/roserade/backf.png
rename to graphics/pokemon/gen_4/roserade/backf.png
diff --git a/graphics/pokemon/karrablast/footprint.png b/graphics/pokemon/gen_4/roserade/footprint.png
similarity index 100%
rename from graphics/pokemon/karrablast/footprint.png
rename to graphics/pokemon/gen_4/roserade/footprint.png
diff --git a/graphics/pokemon/roserade/icon.png b/graphics/pokemon/gen_4/roserade/icon.png
similarity index 100%
rename from graphics/pokemon/roserade/icon.png
rename to graphics/pokemon/gen_4/roserade/icon.png
diff --git a/graphics/pokemon/roserade/normal.pal b/graphics/pokemon/gen_4/roserade/normal.pal
similarity index 100%
rename from graphics/pokemon/roserade/normal.pal
rename to graphics/pokemon/gen_4/roserade/normal.pal
diff --git a/graphics/pokemon/roserade/shiny.pal b/graphics/pokemon/gen_4/roserade/shiny.pal
similarity index 100%
rename from graphics/pokemon/roserade/shiny.pal
rename to graphics/pokemon/gen_4/roserade/shiny.pal
diff --git a/graphics/pokemon/rotom/anim_front.png b/graphics/pokemon/gen_4/rotom/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/anim_front.png
rename to graphics/pokemon/gen_4/rotom/anim_front.png
diff --git a/graphics/pokemon/rotom/back.png b/graphics/pokemon/gen_4/rotom/back.png
similarity index 100%
rename from graphics/pokemon/rotom/back.png
rename to graphics/pokemon/gen_4/rotom/back.png
diff --git a/graphics/pokemon/rotom/fan/anim_front.png b/graphics/pokemon/gen_4/rotom/fan/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/fan/anim_front.png
rename to graphics/pokemon/gen_4/rotom/fan/anim_front.png
diff --git a/graphics/pokemon/rotom/fan/back.png b/graphics/pokemon/gen_4/rotom/fan/back.png
similarity index 100%
rename from graphics/pokemon/rotom/fan/back.png
rename to graphics/pokemon/gen_4/rotom/fan/back.png
diff --git a/graphics/pokemon/rotom/fan/icon.png b/graphics/pokemon/gen_4/rotom/fan/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/fan/icon.png
rename to graphics/pokemon/gen_4/rotom/fan/icon.png
diff --git a/graphics/pokemon/rotom/fan/normal.pal b/graphics/pokemon/gen_4/rotom/fan/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/fan/normal.pal
rename to graphics/pokemon/gen_4/rotom/fan/normal.pal
diff --git a/graphics/pokemon/rotom/fan/shiny.pal b/graphics/pokemon/gen_4/rotom/fan/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/fan/shiny.pal
rename to graphics/pokemon/gen_4/rotom/fan/shiny.pal
diff --git a/graphics/pokemon/rotom/frost/anim_front.png b/graphics/pokemon/gen_4/rotom/frost/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/frost/anim_front.png
rename to graphics/pokemon/gen_4/rotom/frost/anim_front.png
diff --git a/graphics/pokemon/rotom/frost/back.png b/graphics/pokemon/gen_4/rotom/frost/back.png
similarity index 100%
rename from graphics/pokemon/rotom/frost/back.png
rename to graphics/pokemon/gen_4/rotom/frost/back.png
diff --git a/graphics/pokemon/rotom/frost/icon.png b/graphics/pokemon/gen_4/rotom/frost/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/frost/icon.png
rename to graphics/pokemon/gen_4/rotom/frost/icon.png
diff --git a/graphics/pokemon/rotom/frost/normal.pal b/graphics/pokemon/gen_4/rotom/frost/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/frost/normal.pal
rename to graphics/pokemon/gen_4/rotom/frost/normal.pal
diff --git a/graphics/pokemon/rotom/frost/shiny.pal b/graphics/pokemon/gen_4/rotom/frost/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/frost/shiny.pal
rename to graphics/pokemon/gen_4/rotom/frost/shiny.pal
diff --git a/graphics/pokemon/rotom/heat/anim_front.png b/graphics/pokemon/gen_4/rotom/heat/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/heat/anim_front.png
rename to graphics/pokemon/gen_4/rotom/heat/anim_front.png
diff --git a/graphics/pokemon/rotom/heat/back.png b/graphics/pokemon/gen_4/rotom/heat/back.png
similarity index 100%
rename from graphics/pokemon/rotom/heat/back.png
rename to graphics/pokemon/gen_4/rotom/heat/back.png
diff --git a/graphics/pokemon/rotom/heat/icon.png b/graphics/pokemon/gen_4/rotom/heat/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/heat/icon.png
rename to graphics/pokemon/gen_4/rotom/heat/icon.png
diff --git a/graphics/pokemon/rotom/heat/normal.pal b/graphics/pokemon/gen_4/rotom/heat/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/heat/normal.pal
rename to graphics/pokemon/gen_4/rotom/heat/normal.pal
diff --git a/graphics/pokemon/rotom/heat/shiny.pal b/graphics/pokemon/gen_4/rotom/heat/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/heat/shiny.pal
rename to graphics/pokemon/gen_4/rotom/heat/shiny.pal
diff --git a/graphics/pokemon/rotom/icon.png b/graphics/pokemon/gen_4/rotom/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/icon.png
rename to graphics/pokemon/gen_4/rotom/icon.png
diff --git a/graphics/pokemon/rotom/mow/anim_front.png b/graphics/pokemon/gen_4/rotom/mow/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/mow/anim_front.png
rename to graphics/pokemon/gen_4/rotom/mow/anim_front.png
diff --git a/graphics/pokemon/rotom/mow/back.png b/graphics/pokemon/gen_4/rotom/mow/back.png
similarity index 100%
rename from graphics/pokemon/rotom/mow/back.png
rename to graphics/pokemon/gen_4/rotom/mow/back.png
diff --git a/graphics/pokemon/rotom/mow/icon.png b/graphics/pokemon/gen_4/rotom/mow/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/mow/icon.png
rename to graphics/pokemon/gen_4/rotom/mow/icon.png
diff --git a/graphics/pokemon/rotom/mow/normal.pal b/graphics/pokemon/gen_4/rotom/mow/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/mow/normal.pal
rename to graphics/pokemon/gen_4/rotom/mow/normal.pal
diff --git a/graphics/pokemon/rotom/mow/shiny.pal b/graphics/pokemon/gen_4/rotom/mow/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/mow/shiny.pal
rename to graphics/pokemon/gen_4/rotom/mow/shiny.pal
diff --git a/graphics/pokemon/rotom/normal.pal b/graphics/pokemon/gen_4/rotom/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/normal.pal
rename to graphics/pokemon/gen_4/rotom/normal.pal
diff --git a/graphics/pokemon/lampent/footprint.png b/graphics/pokemon/gen_4/rotom/normal/footprint.png
similarity index 100%
rename from graphics/pokemon/lampent/footprint.png
rename to graphics/pokemon/gen_4/rotom/normal/footprint.png
diff --git a/graphics/pokemon/rotom/shiny.pal b/graphics/pokemon/gen_4/rotom/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/shiny.pal
rename to graphics/pokemon/gen_4/rotom/shiny.pal
diff --git a/graphics/pokemon/rotom/wash/anim_front.png b/graphics/pokemon/gen_4/rotom/wash/anim_front.png
similarity index 100%
rename from graphics/pokemon/rotom/wash/anim_front.png
rename to graphics/pokemon/gen_4/rotom/wash/anim_front.png
diff --git a/graphics/pokemon/rotom/wash/back.png b/graphics/pokemon/gen_4/rotom/wash/back.png
similarity index 100%
rename from graphics/pokemon/rotom/wash/back.png
rename to graphics/pokemon/gen_4/rotom/wash/back.png
diff --git a/graphics/pokemon/rotom/wash/icon.png b/graphics/pokemon/gen_4/rotom/wash/icon.png
similarity index 100%
rename from graphics/pokemon/rotom/wash/icon.png
rename to graphics/pokemon/gen_4/rotom/wash/icon.png
diff --git a/graphics/pokemon/rotom/wash/normal.pal b/graphics/pokemon/gen_4/rotom/wash/normal.pal
similarity index 100%
rename from graphics/pokemon/rotom/wash/normal.pal
rename to graphics/pokemon/gen_4/rotom/wash/normal.pal
diff --git a/graphics/pokemon/rotom/wash/shiny.pal b/graphics/pokemon/gen_4/rotom/wash/shiny.pal
similarity index 100%
rename from graphics/pokemon/rotom/wash/shiny.pal
rename to graphics/pokemon/gen_4/rotom/wash/shiny.pal
diff --git a/graphics/pokemon/shaymin/anim_front.png b/graphics/pokemon/gen_4/shaymin/anim_front.png
similarity index 100%
rename from graphics/pokemon/shaymin/anim_front.png
rename to graphics/pokemon/gen_4/shaymin/anim_front.png
diff --git a/graphics/pokemon/shaymin/back.png b/graphics/pokemon/gen_4/shaymin/back.png
similarity index 100%
rename from graphics/pokemon/shaymin/back.png
rename to graphics/pokemon/gen_4/shaymin/back.png
diff --git a/graphics/pokemon/shaymin/footprint.png b/graphics/pokemon/gen_4/shaymin/footprint.png
similarity index 100%
rename from graphics/pokemon/shaymin/footprint.png
rename to graphics/pokemon/gen_4/shaymin/footprint.png
diff --git a/graphics/pokemon/shaymin/icon.png b/graphics/pokemon/gen_4/shaymin/icon.png
similarity index 100%
rename from graphics/pokemon/shaymin/icon.png
rename to graphics/pokemon/gen_4/shaymin/icon.png
diff --git a/graphics/pokemon/shaymin/normal.pal b/graphics/pokemon/gen_4/shaymin/normal.pal
similarity index 100%
rename from graphics/pokemon/shaymin/normal.pal
rename to graphics/pokemon/gen_4/shaymin/normal.pal
diff --git a/graphics/pokemon/shaymin/shiny.pal b/graphics/pokemon/gen_4/shaymin/shiny.pal
similarity index 100%
rename from graphics/pokemon/shaymin/shiny.pal
rename to graphics/pokemon/gen_4/shaymin/shiny.pal
diff --git a/graphics/pokemon/shaymin/sky/anim_front.png b/graphics/pokemon/gen_4/shaymin/sky/anim_front.png
similarity index 100%
rename from graphics/pokemon/shaymin/sky/anim_front.png
rename to graphics/pokemon/gen_4/shaymin/sky/anim_front.png
diff --git a/graphics/pokemon/shaymin/sky/back.png b/graphics/pokemon/gen_4/shaymin/sky/back.png
similarity index 100%
rename from graphics/pokemon/shaymin/sky/back.png
rename to graphics/pokemon/gen_4/shaymin/sky/back.png
diff --git a/graphics/pokemon/shaymin/sky/icon.png b/graphics/pokemon/gen_4/shaymin/sky/icon.png
similarity index 100%
rename from graphics/pokemon/shaymin/sky/icon.png
rename to graphics/pokemon/gen_4/shaymin/sky/icon.png
diff --git a/graphics/pokemon/shaymin/sky/normal.pal b/graphics/pokemon/gen_4/shaymin/sky/normal.pal
similarity index 100%
rename from graphics/pokemon/shaymin/sky/normal.pal
rename to graphics/pokemon/gen_4/shaymin/sky/normal.pal
diff --git a/graphics/pokemon/shaymin/sky/shiny.pal b/graphics/pokemon/gen_4/shaymin/sky/shiny.pal
similarity index 100%
rename from graphics/pokemon/shaymin/sky/shiny.pal
rename to graphics/pokemon/gen_4/shaymin/sky/shiny.pal
diff --git a/graphics/pokemon/shellos/anim_front.png b/graphics/pokemon/gen_4/shellos/anim_front.png
similarity index 100%
rename from graphics/pokemon/shellos/anim_front.png
rename to graphics/pokemon/gen_4/shellos/anim_front.png
diff --git a/graphics/pokemon/shellos/back.png b/graphics/pokemon/gen_4/shellos/back.png
similarity index 100%
rename from graphics/pokemon/shellos/back.png
rename to graphics/pokemon/gen_4/shellos/back.png
diff --git a/graphics/pokemon/shellos/east_sea/anim_front.png b/graphics/pokemon/gen_4/shellos/east_sea/anim_front.png
similarity index 100%
rename from graphics/pokemon/shellos/east_sea/anim_front.png
rename to graphics/pokemon/gen_4/shellos/east_sea/anim_front.png
diff --git a/graphics/pokemon/shellos/east_sea/back.png b/graphics/pokemon/gen_4/shellos/east_sea/back.png
similarity index 100%
rename from graphics/pokemon/shellos/east_sea/back.png
rename to graphics/pokemon/gen_4/shellos/east_sea/back.png
diff --git a/graphics/pokemon/shellos/east_sea/icon.png b/graphics/pokemon/gen_4/shellos/east_sea/icon.png
similarity index 100%
rename from graphics/pokemon/shellos/east_sea/icon.png
rename to graphics/pokemon/gen_4/shellos/east_sea/icon.png
diff --git a/graphics/pokemon/shellos/east_sea/normal.pal b/graphics/pokemon/gen_4/shellos/east_sea/normal.pal
similarity index 100%
rename from graphics/pokemon/shellos/east_sea/normal.pal
rename to graphics/pokemon/gen_4/shellos/east_sea/normal.pal
diff --git a/graphics/pokemon/shellos/east_sea/shiny.pal b/graphics/pokemon/gen_4/shellos/east_sea/shiny.pal
similarity index 100%
rename from graphics/pokemon/shellos/east_sea/shiny.pal
rename to graphics/pokemon/gen_4/shellos/east_sea/shiny.pal
diff --git a/graphics/pokemon/shellos/footprint.png b/graphics/pokemon/gen_4/shellos/footprint.png
similarity index 100%
rename from graphics/pokemon/shellos/footprint.png
rename to graphics/pokemon/gen_4/shellos/footprint.png
diff --git a/graphics/pokemon/shellos/icon.png b/graphics/pokemon/gen_4/shellos/icon.png
similarity index 100%
rename from graphics/pokemon/shellos/icon.png
rename to graphics/pokemon/gen_4/shellos/icon.png
diff --git a/graphics/pokemon/shellos/normal.pal b/graphics/pokemon/gen_4/shellos/normal.pal
similarity index 100%
rename from graphics/pokemon/shellos/normal.pal
rename to graphics/pokemon/gen_4/shellos/normal.pal
diff --git a/graphics/pokemon/shellos/shiny.pal b/graphics/pokemon/gen_4/shellos/shiny.pal
similarity index 100%
rename from graphics/pokemon/shellos/shiny.pal
rename to graphics/pokemon/gen_4/shellos/shiny.pal
diff --git a/graphics/pokemon/shieldon/anim_front.png b/graphics/pokemon/gen_4/shieldon/anim_front.png
similarity index 100%
rename from graphics/pokemon/shieldon/anim_front.png
rename to graphics/pokemon/gen_4/shieldon/anim_front.png
diff --git a/graphics/pokemon/shieldon/back.png b/graphics/pokemon/gen_4/shieldon/back.png
similarity index 100%
rename from graphics/pokemon/shieldon/back.png
rename to graphics/pokemon/gen_4/shieldon/back.png
diff --git a/graphics/pokemon/shieldon/footprint.png b/graphics/pokemon/gen_4/shieldon/footprint.png
similarity index 100%
rename from graphics/pokemon/shieldon/footprint.png
rename to graphics/pokemon/gen_4/shieldon/footprint.png
diff --git a/graphics/pokemon/shieldon/icon.png b/graphics/pokemon/gen_4/shieldon/icon.png
similarity index 100%
rename from graphics/pokemon/shieldon/icon.png
rename to graphics/pokemon/gen_4/shieldon/icon.png
diff --git a/graphics/pokemon/shieldon/normal.pal b/graphics/pokemon/gen_4/shieldon/normal.pal
similarity index 100%
rename from graphics/pokemon/shieldon/normal.pal
rename to graphics/pokemon/gen_4/shieldon/normal.pal
diff --git a/graphics/pokemon/shieldon/shiny.pal b/graphics/pokemon/gen_4/shieldon/shiny.pal
similarity index 100%
rename from graphics/pokemon/shieldon/shiny.pal
rename to graphics/pokemon/gen_4/shieldon/shiny.pal
diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/gen_4/shinx/anim_front.png
similarity index 100%
rename from graphics/pokemon/shinx/anim_front.png
rename to graphics/pokemon/gen_4/shinx/anim_front.png
diff --git a/graphics/pokemon/shinx/anim_frontf.png b/graphics/pokemon/gen_4/shinx/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/shinx/anim_frontf.png
rename to graphics/pokemon/gen_4/shinx/anim_frontf.png
diff --git a/graphics/pokemon/shinx/back.png b/graphics/pokemon/gen_4/shinx/back.png
similarity index 100%
rename from graphics/pokemon/shinx/back.png
rename to graphics/pokemon/gen_4/shinx/back.png
diff --git a/graphics/pokemon/shinx/backf.png b/graphics/pokemon/gen_4/shinx/backf.png
similarity index 100%
rename from graphics/pokemon/shinx/backf.png
rename to graphics/pokemon/gen_4/shinx/backf.png
diff --git a/graphics/pokemon/shinx/footprint.png b/graphics/pokemon/gen_4/shinx/footprint.png
similarity index 100%
rename from graphics/pokemon/shinx/footprint.png
rename to graphics/pokemon/gen_4/shinx/footprint.png
diff --git a/graphics/pokemon/shinx/icon.png b/graphics/pokemon/gen_4/shinx/icon.png
similarity index 100%
rename from graphics/pokemon/shinx/icon.png
rename to graphics/pokemon/gen_4/shinx/icon.png
diff --git a/graphics/pokemon/shinx/normal.pal b/graphics/pokemon/gen_4/shinx/normal.pal
similarity index 100%
rename from graphics/pokemon/shinx/normal.pal
rename to graphics/pokemon/gen_4/shinx/normal.pal
diff --git a/graphics/pokemon/shinx/shiny.pal b/graphics/pokemon/gen_4/shinx/shiny.pal
similarity index 100%
rename from graphics/pokemon/shinx/shiny.pal
rename to graphics/pokemon/gen_4/shinx/shiny.pal
diff --git a/graphics/pokemon/skorupi/anim_front.png b/graphics/pokemon/gen_4/skorupi/anim_front.png
similarity index 100%
rename from graphics/pokemon/skorupi/anim_front.png
rename to graphics/pokemon/gen_4/skorupi/anim_front.png
diff --git a/graphics/pokemon/skorupi/back.png b/graphics/pokemon/gen_4/skorupi/back.png
similarity index 100%
rename from graphics/pokemon/skorupi/back.png
rename to graphics/pokemon/gen_4/skorupi/back.png
diff --git a/graphics/pokemon/kricketune/footprint.png b/graphics/pokemon/gen_4/skorupi/footprint.png
similarity index 100%
rename from graphics/pokemon/kricketune/footprint.png
rename to graphics/pokemon/gen_4/skorupi/footprint.png
diff --git a/graphics/pokemon/skorupi/icon.png b/graphics/pokemon/gen_4/skorupi/icon.png
similarity index 100%
rename from graphics/pokemon/skorupi/icon.png
rename to graphics/pokemon/gen_4/skorupi/icon.png
diff --git a/graphics/pokemon/skorupi/normal.pal b/graphics/pokemon/gen_4/skorupi/normal.pal
similarity index 100%
rename from graphics/pokemon/skorupi/normal.pal
rename to graphics/pokemon/gen_4/skorupi/normal.pal
diff --git a/graphics/pokemon/skorupi/shiny.pal b/graphics/pokemon/gen_4/skorupi/shiny.pal
similarity index 100%
rename from graphics/pokemon/skorupi/shiny.pal
rename to graphics/pokemon/gen_4/skorupi/shiny.pal
diff --git a/graphics/pokemon/skuntank/anim_front.png b/graphics/pokemon/gen_4/skuntank/anim_front.png
similarity index 100%
rename from graphics/pokemon/skuntank/anim_front.png
rename to graphics/pokemon/gen_4/skuntank/anim_front.png
diff --git a/graphics/pokemon/skuntank/back.png b/graphics/pokemon/gen_4/skuntank/back.png
similarity index 100%
rename from graphics/pokemon/skuntank/back.png
rename to graphics/pokemon/gen_4/skuntank/back.png
diff --git a/graphics/pokemon/skuntank/footprint.png b/graphics/pokemon/gen_4/skuntank/footprint.png
similarity index 100%
rename from graphics/pokemon/skuntank/footprint.png
rename to graphics/pokemon/gen_4/skuntank/footprint.png
diff --git a/graphics/pokemon/skuntank/icon.png b/graphics/pokemon/gen_4/skuntank/icon.png
similarity index 100%
rename from graphics/pokemon/skuntank/icon.png
rename to graphics/pokemon/gen_4/skuntank/icon.png
diff --git a/graphics/pokemon/skuntank/normal.pal b/graphics/pokemon/gen_4/skuntank/normal.pal
similarity index 100%
rename from graphics/pokemon/skuntank/normal.pal
rename to graphics/pokemon/gen_4/skuntank/normal.pal
diff --git a/graphics/pokemon/skuntank/shiny.pal b/graphics/pokemon/gen_4/skuntank/shiny.pal
similarity index 100%
rename from graphics/pokemon/skuntank/shiny.pal
rename to graphics/pokemon/gen_4/skuntank/shiny.pal
diff --git a/graphics/pokemon/snover/anim_front.png b/graphics/pokemon/gen_4/snover/anim_front.png
similarity index 100%
rename from graphics/pokemon/snover/anim_front.png
rename to graphics/pokemon/gen_4/snover/anim_front.png
diff --git a/graphics/pokemon/snover/anim_frontf.png b/graphics/pokemon/gen_4/snover/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/snover/anim_frontf.png
rename to graphics/pokemon/gen_4/snover/anim_frontf.png
diff --git a/graphics/pokemon/snover/back.png b/graphics/pokemon/gen_4/snover/back.png
similarity index 100%
rename from graphics/pokemon/snover/back.png
rename to graphics/pokemon/gen_4/snover/back.png
diff --git a/graphics/pokemon/snover/backf.png b/graphics/pokemon/gen_4/snover/backf.png
similarity index 100%
rename from graphics/pokemon/snover/backf.png
rename to graphics/pokemon/gen_4/snover/backf.png
diff --git a/graphics/pokemon/snover/footprint.png b/graphics/pokemon/gen_4/snover/footprint.png
similarity index 100%
rename from graphics/pokemon/snover/footprint.png
rename to graphics/pokemon/gen_4/snover/footprint.png
diff --git a/graphics/pokemon/snover/icon.png b/graphics/pokemon/gen_4/snover/icon.png
similarity index 100%
rename from graphics/pokemon/snover/icon.png
rename to graphics/pokemon/gen_4/snover/icon.png
diff --git a/graphics/pokemon/snover/normal.pal b/graphics/pokemon/gen_4/snover/normal.pal
similarity index 100%
rename from graphics/pokemon/snover/normal.pal
rename to graphics/pokemon/gen_4/snover/normal.pal
diff --git a/graphics/pokemon/snover/shiny.pal b/graphics/pokemon/gen_4/snover/shiny.pal
similarity index 100%
rename from graphics/pokemon/snover/shiny.pal
rename to graphics/pokemon/gen_4/snover/shiny.pal
diff --git a/graphics/pokemon/spiritomb/anim_front.png b/graphics/pokemon/gen_4/spiritomb/anim_front.png
similarity index 100%
rename from graphics/pokemon/spiritomb/anim_front.png
rename to graphics/pokemon/gen_4/spiritomb/anim_front.png
diff --git a/graphics/pokemon/spiritomb/back.png b/graphics/pokemon/gen_4/spiritomb/back.png
similarity index 100%
rename from graphics/pokemon/spiritomb/back.png
rename to graphics/pokemon/gen_4/spiritomb/back.png
diff --git a/graphics/pokemon/landorus/footprint.png b/graphics/pokemon/gen_4/spiritomb/footprint.png
similarity index 100%
rename from graphics/pokemon/landorus/footprint.png
rename to graphics/pokemon/gen_4/spiritomb/footprint.png
diff --git a/graphics/pokemon/spiritomb/icon.png b/graphics/pokemon/gen_4/spiritomb/icon.png
similarity index 100%
rename from graphics/pokemon/spiritomb/icon.png
rename to graphics/pokemon/gen_4/spiritomb/icon.png
diff --git a/graphics/pokemon/spiritomb/normal.pal b/graphics/pokemon/gen_4/spiritomb/normal.pal
similarity index 100%
rename from graphics/pokemon/spiritomb/normal.pal
rename to graphics/pokemon/gen_4/spiritomb/normal.pal
diff --git a/graphics/pokemon/spiritomb/shiny.pal b/graphics/pokemon/gen_4/spiritomb/shiny.pal
similarity index 100%
rename from graphics/pokemon/spiritomb/shiny.pal
rename to graphics/pokemon/gen_4/spiritomb/shiny.pal
diff --git a/graphics/pokemon/staraptor/anim_front.png b/graphics/pokemon/gen_4/staraptor/anim_front.png
similarity index 100%
rename from graphics/pokemon/staraptor/anim_front.png
rename to graphics/pokemon/gen_4/staraptor/anim_front.png
diff --git a/graphics/pokemon/staraptor/anim_frontf.png b/graphics/pokemon/gen_4/staraptor/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/staraptor/anim_frontf.png
rename to graphics/pokemon/gen_4/staraptor/anim_frontf.png
diff --git a/graphics/pokemon/staraptor/back.png b/graphics/pokemon/gen_4/staraptor/back.png
similarity index 100%
rename from graphics/pokemon/staraptor/back.png
rename to graphics/pokemon/gen_4/staraptor/back.png
diff --git a/graphics/pokemon/staraptor/footprint.png b/graphics/pokemon/gen_4/staraptor/footprint.png
similarity index 100%
rename from graphics/pokemon/staraptor/footprint.png
rename to graphics/pokemon/gen_4/staraptor/footprint.png
diff --git a/graphics/pokemon/staraptor/icon.png b/graphics/pokemon/gen_4/staraptor/icon.png
similarity index 100%
rename from graphics/pokemon/staraptor/icon.png
rename to graphics/pokemon/gen_4/staraptor/icon.png
diff --git a/graphics/pokemon/staraptor/normal.pal b/graphics/pokemon/gen_4/staraptor/normal.pal
similarity index 100%
rename from graphics/pokemon/staraptor/normal.pal
rename to graphics/pokemon/gen_4/staraptor/normal.pal
diff --git a/graphics/pokemon/staraptor/shiny.pal b/graphics/pokemon/gen_4/staraptor/shiny.pal
similarity index 100%
rename from graphics/pokemon/staraptor/shiny.pal
rename to graphics/pokemon/gen_4/staraptor/shiny.pal
diff --git a/graphics/pokemon/staravia/anim_front.png b/graphics/pokemon/gen_4/staravia/anim_front.png
similarity index 100%
rename from graphics/pokemon/staravia/anim_front.png
rename to graphics/pokemon/gen_4/staravia/anim_front.png
diff --git a/graphics/pokemon/staravia/anim_frontf.png b/graphics/pokemon/gen_4/staravia/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/staravia/anim_frontf.png
rename to graphics/pokemon/gen_4/staravia/anim_frontf.png
diff --git a/graphics/pokemon/staravia/back.png b/graphics/pokemon/gen_4/staravia/back.png
similarity index 100%
rename from graphics/pokemon/staravia/back.png
rename to graphics/pokemon/gen_4/staravia/back.png
diff --git a/graphics/pokemon/staravia/backf.png b/graphics/pokemon/gen_4/staravia/backf.png
similarity index 100%
rename from graphics/pokemon/staravia/backf.png
rename to graphics/pokemon/gen_4/staravia/backf.png
diff --git a/graphics/pokemon/staravia/footprint.png b/graphics/pokemon/gen_4/staravia/footprint.png
similarity index 100%
rename from graphics/pokemon/staravia/footprint.png
rename to graphics/pokemon/gen_4/staravia/footprint.png
diff --git a/graphics/pokemon/staravia/icon.png b/graphics/pokemon/gen_4/staravia/icon.png
similarity index 100%
rename from graphics/pokemon/staravia/icon.png
rename to graphics/pokemon/gen_4/staravia/icon.png
diff --git a/graphics/pokemon/staravia/normal.pal b/graphics/pokemon/gen_4/staravia/normal.pal
similarity index 100%
rename from graphics/pokemon/staravia/normal.pal
rename to graphics/pokemon/gen_4/staravia/normal.pal
diff --git a/graphics/pokemon/staravia/shiny.pal b/graphics/pokemon/gen_4/staravia/shiny.pal
similarity index 100%
rename from graphics/pokemon/staravia/shiny.pal
rename to graphics/pokemon/gen_4/staravia/shiny.pal
diff --git a/graphics/pokemon/starly/anim_front.png b/graphics/pokemon/gen_4/starly/anim_front.png
similarity index 100%
rename from graphics/pokemon/starly/anim_front.png
rename to graphics/pokemon/gen_4/starly/anim_front.png
diff --git a/graphics/pokemon/starly/anim_frontf.png b/graphics/pokemon/gen_4/starly/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/starly/anim_frontf.png
rename to graphics/pokemon/gen_4/starly/anim_frontf.png
diff --git a/graphics/pokemon/starly/back.png b/graphics/pokemon/gen_4/starly/back.png
similarity index 100%
rename from graphics/pokemon/starly/back.png
rename to graphics/pokemon/gen_4/starly/back.png
diff --git a/graphics/pokemon/starly/backf.png b/graphics/pokemon/gen_4/starly/backf.png
similarity index 100%
rename from graphics/pokemon/starly/backf.png
rename to graphics/pokemon/gen_4/starly/backf.png
diff --git a/graphics/pokemon/starly/footprint.png b/graphics/pokemon/gen_4/starly/footprint.png
similarity index 100%
rename from graphics/pokemon/starly/footprint.png
rename to graphics/pokemon/gen_4/starly/footprint.png
diff --git a/graphics/pokemon/starly/icon.png b/graphics/pokemon/gen_4/starly/icon.png
similarity index 100%
rename from graphics/pokemon/starly/icon.png
rename to graphics/pokemon/gen_4/starly/icon.png
diff --git a/graphics/pokemon/starly/normal.pal b/graphics/pokemon/gen_4/starly/normal.pal
similarity index 100%
rename from graphics/pokemon/starly/normal.pal
rename to graphics/pokemon/gen_4/starly/normal.pal
diff --git a/graphics/pokemon/starly/shiny.pal b/graphics/pokemon/gen_4/starly/shiny.pal
similarity index 100%
rename from graphics/pokemon/starly/shiny.pal
rename to graphics/pokemon/gen_4/starly/shiny.pal
diff --git a/graphics/pokemon/stunky/anim_front.png b/graphics/pokemon/gen_4/stunky/anim_front.png
similarity index 100%
rename from graphics/pokemon/stunky/anim_front.png
rename to graphics/pokemon/gen_4/stunky/anim_front.png
diff --git a/graphics/pokemon/stunky/back.png b/graphics/pokemon/gen_4/stunky/back.png
similarity index 100%
rename from graphics/pokemon/stunky/back.png
rename to graphics/pokemon/gen_4/stunky/back.png
diff --git a/graphics/pokemon/stunky/footprint.png b/graphics/pokemon/gen_4/stunky/footprint.png
similarity index 100%
rename from graphics/pokemon/stunky/footprint.png
rename to graphics/pokemon/gen_4/stunky/footprint.png
diff --git a/graphics/pokemon/stunky/icon.png b/graphics/pokemon/gen_4/stunky/icon.png
similarity index 100%
rename from graphics/pokemon/stunky/icon.png
rename to graphics/pokemon/gen_4/stunky/icon.png
diff --git a/graphics/pokemon/stunky/normal.pal b/graphics/pokemon/gen_4/stunky/normal.pal
similarity index 100%
rename from graphics/pokemon/stunky/normal.pal
rename to graphics/pokemon/gen_4/stunky/normal.pal
diff --git a/graphics/pokemon/stunky/shiny.pal b/graphics/pokemon/gen_4/stunky/shiny.pal
similarity index 100%
rename from graphics/pokemon/stunky/shiny.pal
rename to graphics/pokemon/gen_4/stunky/shiny.pal
diff --git a/graphics/pokemon/tangrowth/anim_front.png b/graphics/pokemon/gen_4/tangrowth/anim_front.png
similarity index 100%
rename from graphics/pokemon/tangrowth/anim_front.png
rename to graphics/pokemon/gen_4/tangrowth/anim_front.png
diff --git a/graphics/pokemon/tangrowth/anim_frontf.png b/graphics/pokemon/gen_4/tangrowth/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/tangrowth/anim_frontf.png
rename to graphics/pokemon/gen_4/tangrowth/anim_frontf.png
diff --git a/graphics/pokemon/tangrowth/back.png b/graphics/pokemon/gen_4/tangrowth/back.png
similarity index 100%
rename from graphics/pokemon/tangrowth/back.png
rename to graphics/pokemon/gen_4/tangrowth/back.png
diff --git a/graphics/pokemon/tangrowth/footprint.png b/graphics/pokemon/gen_4/tangrowth/footprint.png
similarity index 100%
rename from graphics/pokemon/tangrowth/footprint.png
rename to graphics/pokemon/gen_4/tangrowth/footprint.png
diff --git a/graphics/pokemon/tangrowth/icon.png b/graphics/pokemon/gen_4/tangrowth/icon.png
similarity index 100%
rename from graphics/pokemon/tangrowth/icon.png
rename to graphics/pokemon/gen_4/tangrowth/icon.png
diff --git a/graphics/pokemon/tangrowth/normal.pal b/graphics/pokemon/gen_4/tangrowth/normal.pal
similarity index 100%
rename from graphics/pokemon/tangrowth/normal.pal
rename to graphics/pokemon/gen_4/tangrowth/normal.pal
diff --git a/graphics/pokemon/tangrowth/shiny.pal b/graphics/pokemon/gen_4/tangrowth/shiny.pal
similarity index 100%
rename from graphics/pokemon/tangrowth/shiny.pal
rename to graphics/pokemon/gen_4/tangrowth/shiny.pal
diff --git a/graphics/pokemon/togekiss/anim_front.png b/graphics/pokemon/gen_4/togekiss/anim_front.png
similarity index 100%
rename from graphics/pokemon/togekiss/anim_front.png
rename to graphics/pokemon/gen_4/togekiss/anim_front.png
diff --git a/graphics/pokemon/togekiss/back.png b/graphics/pokemon/gen_4/togekiss/back.png
similarity index 100%
rename from graphics/pokemon/togekiss/back.png
rename to graphics/pokemon/gen_4/togekiss/back.png
diff --git a/graphics/pokemon/togekiss/footprint.png b/graphics/pokemon/gen_4/togekiss/footprint.png
similarity index 100%
rename from graphics/pokemon/togekiss/footprint.png
rename to graphics/pokemon/gen_4/togekiss/footprint.png
diff --git a/graphics/pokemon/togekiss/icon.png b/graphics/pokemon/gen_4/togekiss/icon.png
similarity index 100%
rename from graphics/pokemon/togekiss/icon.png
rename to graphics/pokemon/gen_4/togekiss/icon.png
diff --git a/graphics/pokemon/togekiss/normal.pal b/graphics/pokemon/gen_4/togekiss/normal.pal
similarity index 100%
rename from graphics/pokemon/togekiss/normal.pal
rename to graphics/pokemon/gen_4/togekiss/normal.pal
diff --git a/graphics/pokemon/togekiss/shiny.pal b/graphics/pokemon/gen_4/togekiss/shiny.pal
similarity index 100%
rename from graphics/pokemon/togekiss/shiny.pal
rename to graphics/pokemon/gen_4/togekiss/shiny.pal
diff --git a/graphics/pokemon/torterra/anim_front.png b/graphics/pokemon/gen_4/torterra/anim_front.png
similarity index 100%
rename from graphics/pokemon/torterra/anim_front.png
rename to graphics/pokemon/gen_4/torterra/anim_front.png
diff --git a/graphics/pokemon/torterra/back.png b/graphics/pokemon/gen_4/torterra/back.png
similarity index 100%
rename from graphics/pokemon/torterra/back.png
rename to graphics/pokemon/gen_4/torterra/back.png
diff --git a/graphics/pokemon/torterra/footprint.png b/graphics/pokemon/gen_4/torterra/footprint.png
similarity index 100%
rename from graphics/pokemon/torterra/footprint.png
rename to graphics/pokemon/gen_4/torterra/footprint.png
diff --git a/graphics/pokemon/torterra/icon.png b/graphics/pokemon/gen_4/torterra/icon.png
similarity index 100%
rename from graphics/pokemon/torterra/icon.png
rename to graphics/pokemon/gen_4/torterra/icon.png
diff --git a/graphics/pokemon/torterra/normal.pal b/graphics/pokemon/gen_4/torterra/normal.pal
similarity index 100%
rename from graphics/pokemon/torterra/normal.pal
rename to graphics/pokemon/gen_4/torterra/normal.pal
diff --git a/graphics/pokemon/torterra/shiny.pal b/graphics/pokemon/gen_4/torterra/shiny.pal
similarity index 100%
rename from graphics/pokemon/torterra/shiny.pal
rename to graphics/pokemon/gen_4/torterra/shiny.pal
diff --git a/graphics/pokemon/toxicroak/anim_front.png b/graphics/pokemon/gen_4/toxicroak/anim_front.png
similarity index 100%
rename from graphics/pokemon/toxicroak/anim_front.png
rename to graphics/pokemon/gen_4/toxicroak/anim_front.png
diff --git a/graphics/pokemon/toxicroak/anim_frontf.png b/graphics/pokemon/gen_4/toxicroak/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/toxicroak/anim_frontf.png
rename to graphics/pokemon/gen_4/toxicroak/anim_frontf.png
diff --git a/graphics/pokemon/toxicroak/back.png b/graphics/pokemon/gen_4/toxicroak/back.png
similarity index 100%
rename from graphics/pokemon/toxicroak/back.png
rename to graphics/pokemon/gen_4/toxicroak/back.png
diff --git a/graphics/pokemon/toxicroak/backf.png b/graphics/pokemon/gen_4/toxicroak/backf.png
similarity index 100%
rename from graphics/pokemon/toxicroak/backf.png
rename to graphics/pokemon/gen_4/toxicroak/backf.png
diff --git a/graphics/pokemon/toxicroak/footprint.png b/graphics/pokemon/gen_4/toxicroak/footprint.png
similarity index 100%
rename from graphics/pokemon/toxicroak/footprint.png
rename to graphics/pokemon/gen_4/toxicroak/footprint.png
diff --git a/graphics/pokemon/toxicroak/icon.png b/graphics/pokemon/gen_4/toxicroak/icon.png
similarity index 100%
rename from graphics/pokemon/toxicroak/icon.png
rename to graphics/pokemon/gen_4/toxicroak/icon.png
diff --git a/graphics/pokemon/toxicroak/normal.pal b/graphics/pokemon/gen_4/toxicroak/normal.pal
similarity index 100%
rename from graphics/pokemon/toxicroak/normal.pal
rename to graphics/pokemon/gen_4/toxicroak/normal.pal
diff --git a/graphics/pokemon/toxicroak/shiny.pal b/graphics/pokemon/gen_4/toxicroak/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxicroak/shiny.pal
rename to graphics/pokemon/gen_4/toxicroak/shiny.pal
diff --git a/graphics/pokemon/turtwig/anim_front.png b/graphics/pokemon/gen_4/turtwig/anim_front.png
similarity index 100%
rename from graphics/pokemon/turtwig/anim_front.png
rename to graphics/pokemon/gen_4/turtwig/anim_front.png
diff --git a/graphics/pokemon/turtwig/back.png b/graphics/pokemon/gen_4/turtwig/back.png
similarity index 100%
rename from graphics/pokemon/turtwig/back.png
rename to graphics/pokemon/gen_4/turtwig/back.png
diff --git a/graphics/pokemon/turtwig/footprint.png b/graphics/pokemon/gen_4/turtwig/footprint.png
similarity index 100%
rename from graphics/pokemon/turtwig/footprint.png
rename to graphics/pokemon/gen_4/turtwig/footprint.png
diff --git a/graphics/pokemon/turtwig/icon.png b/graphics/pokemon/gen_4/turtwig/icon.png
similarity index 100%
rename from graphics/pokemon/turtwig/icon.png
rename to graphics/pokemon/gen_4/turtwig/icon.png
diff --git a/graphics/pokemon/turtwig/normal.pal b/graphics/pokemon/gen_4/turtwig/normal.pal
similarity index 100%
rename from graphics/pokemon/turtwig/normal.pal
rename to graphics/pokemon/gen_4/turtwig/normal.pal
diff --git a/graphics/pokemon/turtwig/shiny.pal b/graphics/pokemon/gen_4/turtwig/shiny.pal
similarity index 100%
rename from graphics/pokemon/turtwig/shiny.pal
rename to graphics/pokemon/gen_4/turtwig/shiny.pal
diff --git a/graphics/pokemon/uxie/anim_front.png b/graphics/pokemon/gen_4/uxie/anim_front.png
similarity index 100%
rename from graphics/pokemon/uxie/anim_front.png
rename to graphics/pokemon/gen_4/uxie/anim_front.png
diff --git a/graphics/pokemon/uxie/back.png b/graphics/pokemon/gen_4/uxie/back.png
similarity index 100%
rename from graphics/pokemon/uxie/back.png
rename to graphics/pokemon/gen_4/uxie/back.png
diff --git a/graphics/pokemon/uxie/footprint.png b/graphics/pokemon/gen_4/uxie/footprint.png
similarity index 100%
rename from graphics/pokemon/uxie/footprint.png
rename to graphics/pokemon/gen_4/uxie/footprint.png
diff --git a/graphics/pokemon/uxie/icon.png b/graphics/pokemon/gen_4/uxie/icon.png
similarity index 100%
rename from graphics/pokemon/uxie/icon.png
rename to graphics/pokemon/gen_4/uxie/icon.png
diff --git a/graphics/pokemon/uxie/normal.pal b/graphics/pokemon/gen_4/uxie/normal.pal
similarity index 100%
rename from graphics/pokemon/uxie/normal.pal
rename to graphics/pokemon/gen_4/uxie/normal.pal
diff --git a/graphics/pokemon/uxie/shiny.pal b/graphics/pokemon/gen_4/uxie/shiny.pal
similarity index 100%
rename from graphics/pokemon/uxie/shiny.pal
rename to graphics/pokemon/gen_4/uxie/shiny.pal
diff --git a/graphics/pokemon/vespiquen/anim_front.png b/graphics/pokemon/gen_4/vespiquen/anim_front.png
similarity index 100%
rename from graphics/pokemon/vespiquen/anim_front.png
rename to graphics/pokemon/gen_4/vespiquen/anim_front.png
diff --git a/graphics/pokemon/vespiquen/back.png b/graphics/pokemon/gen_4/vespiquen/back.png
similarity index 100%
rename from graphics/pokemon/vespiquen/back.png
rename to graphics/pokemon/gen_4/vespiquen/back.png
diff --git a/graphics/pokemon/lanturn/footprint.png b/graphics/pokemon/gen_4/vespiquen/footprint.png
similarity index 100%
rename from graphics/pokemon/lanturn/footprint.png
rename to graphics/pokemon/gen_4/vespiquen/footprint.png
diff --git a/graphics/pokemon/vespiquen/icon.png b/graphics/pokemon/gen_4/vespiquen/icon.png
similarity index 100%
rename from graphics/pokemon/vespiquen/icon.png
rename to graphics/pokemon/gen_4/vespiquen/icon.png
diff --git a/graphics/pokemon/vespiquen/normal.pal b/graphics/pokemon/gen_4/vespiquen/normal.pal
similarity index 100%
rename from graphics/pokemon/vespiquen/normal.pal
rename to graphics/pokemon/gen_4/vespiquen/normal.pal
diff --git a/graphics/pokemon/vespiquen/shiny.pal b/graphics/pokemon/gen_4/vespiquen/shiny.pal
similarity index 100%
rename from graphics/pokemon/vespiquen/shiny.pal
rename to graphics/pokemon/gen_4/vespiquen/shiny.pal
diff --git a/graphics/pokemon/weavile/anim_front.png b/graphics/pokemon/gen_4/weavile/anim_front.png
similarity index 100%
rename from graphics/pokemon/weavile/anim_front.png
rename to graphics/pokemon/gen_4/weavile/anim_front.png
diff --git a/graphics/pokemon/weavile/anim_frontf.png b/graphics/pokemon/gen_4/weavile/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/weavile/anim_frontf.png
rename to graphics/pokemon/gen_4/weavile/anim_frontf.png
diff --git a/graphics/pokemon/weavile/back.png b/graphics/pokemon/gen_4/weavile/back.png
similarity index 100%
rename from graphics/pokemon/weavile/back.png
rename to graphics/pokemon/gen_4/weavile/back.png
diff --git a/graphics/pokemon/weavile/backf.png b/graphics/pokemon/gen_4/weavile/backf.png
similarity index 100%
rename from graphics/pokemon/weavile/backf.png
rename to graphics/pokemon/gen_4/weavile/backf.png
diff --git a/graphics/pokemon/weavile/footprint.png b/graphics/pokemon/gen_4/weavile/footprint.png
similarity index 100%
rename from graphics/pokemon/weavile/footprint.png
rename to graphics/pokemon/gen_4/weavile/footprint.png
diff --git a/graphics/pokemon/weavile/icon.png b/graphics/pokemon/gen_4/weavile/icon.png
similarity index 100%
rename from graphics/pokemon/weavile/icon.png
rename to graphics/pokemon/gen_4/weavile/icon.png
diff --git a/graphics/pokemon/weavile/normal.pal b/graphics/pokemon/gen_4/weavile/normal.pal
similarity index 100%
rename from graphics/pokemon/weavile/normal.pal
rename to graphics/pokemon/gen_4/weavile/normal.pal
diff --git a/graphics/pokemon/weavile/shiny.pal b/graphics/pokemon/gen_4/weavile/shiny.pal
similarity index 100%
rename from graphics/pokemon/weavile/shiny.pal
rename to graphics/pokemon/gen_4/weavile/shiny.pal
diff --git a/graphics/pokemon/wormadam/anim_front.png b/graphics/pokemon/gen_4/wormadam/anim_front.png
similarity index 100%
rename from graphics/pokemon/wormadam/anim_front.png
rename to graphics/pokemon/gen_4/wormadam/anim_front.png
diff --git a/graphics/pokemon/wormadam/back.png b/graphics/pokemon/gen_4/wormadam/back.png
similarity index 100%
rename from graphics/pokemon/wormadam/back.png
rename to graphics/pokemon/gen_4/wormadam/back.png
diff --git a/graphics/pokemon/wormadam/icon.png b/graphics/pokemon/gen_4/wormadam/icon.png
similarity index 100%
rename from graphics/pokemon/wormadam/icon.png
rename to graphics/pokemon/gen_4/wormadam/icon.png
diff --git a/graphics/pokemon/wormadam/normal.pal b/graphics/pokemon/gen_4/wormadam/normal.pal
similarity index 100%
rename from graphics/pokemon/wormadam/normal.pal
rename to graphics/pokemon/gen_4/wormadam/normal.pal
diff --git a/graphics/pokemon/lapras/footprint.png b/graphics/pokemon/gen_4/wormadam/plant/footprint.png
similarity index 100%
rename from graphics/pokemon/lapras/footprint.png
rename to graphics/pokemon/gen_4/wormadam/plant/footprint.png
diff --git a/graphics/pokemon/wormadam/sandy_cloak/anim_front.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.png
similarity index 100%
rename from graphics/pokemon/wormadam/sandy_cloak/anim_front.png
rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.png
diff --git a/graphics/pokemon/wormadam/sandy_cloak/back.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/back.png
similarity index 100%
rename from graphics/pokemon/wormadam/sandy_cloak/back.png
rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/back.png
diff --git a/graphics/pokemon/wormadam/sandy_cloak/icon.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.png
similarity index 100%
rename from graphics/pokemon/wormadam/sandy_cloak/icon.png
rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.png
diff --git a/graphics/pokemon/wormadam/sandy_cloak/normal.pal b/graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.pal
similarity index 100%
rename from graphics/pokemon/wormadam/sandy_cloak/normal.pal
rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.pal
diff --git a/graphics/pokemon/wormadam/sandy_cloak/shiny.pal b/graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.pal
similarity index 100%
rename from graphics/pokemon/wormadam/sandy_cloak/shiny.pal
rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.pal
diff --git a/graphics/pokemon/wormadam/shiny.pal b/graphics/pokemon/gen_4/wormadam/shiny.pal
similarity index 100%
rename from graphics/pokemon/wormadam/shiny.pal
rename to graphics/pokemon/gen_4/wormadam/shiny.pal
diff --git a/graphics/pokemon/wormadam/trash_cloak/anim_front.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.png
similarity index 100%
rename from graphics/pokemon/wormadam/trash_cloak/anim_front.png
rename to graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.png
diff --git a/graphics/pokemon/wormadam/trash_cloak/back.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/back.png
similarity index 100%
rename from graphics/pokemon/wormadam/trash_cloak/back.png
rename to graphics/pokemon/gen_4/wormadam/trash_cloak/back.png
diff --git a/graphics/pokemon/wormadam/trash_cloak/icon.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/icon.png
similarity index 100%
rename from graphics/pokemon/wormadam/trash_cloak/icon.png
rename to graphics/pokemon/gen_4/wormadam/trash_cloak/icon.png
diff --git a/graphics/pokemon/wormadam/trash_cloak/normal.pal b/graphics/pokemon/gen_4/wormadam/trash_cloak/normal.pal
similarity index 100%
rename from graphics/pokemon/wormadam/trash_cloak/normal.pal
rename to graphics/pokemon/gen_4/wormadam/trash_cloak/normal.pal
diff --git a/graphics/pokemon/wormadam/trash_cloak/shiny.pal b/graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.pal
similarity index 100%
rename from graphics/pokemon/wormadam/trash_cloak/shiny.pal
rename to graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.pal
diff --git a/graphics/pokemon/yanmega/anim_front.png b/graphics/pokemon/gen_4/yanmega/anim_front.png
similarity index 100%
rename from graphics/pokemon/yanmega/anim_front.png
rename to graphics/pokemon/gen_4/yanmega/anim_front.png
diff --git a/graphics/pokemon/yanmega/back.png b/graphics/pokemon/gen_4/yanmega/back.png
similarity index 100%
rename from graphics/pokemon/yanmega/back.png
rename to graphics/pokemon/gen_4/yanmega/back.png
diff --git a/graphics/pokemon/yanmega/footprint.png b/graphics/pokemon/gen_4/yanmega/footprint.png
similarity index 100%
rename from graphics/pokemon/yanmega/footprint.png
rename to graphics/pokemon/gen_4/yanmega/footprint.png
diff --git a/graphics/pokemon/yanmega/icon.png b/graphics/pokemon/gen_4/yanmega/icon.png
similarity index 100%
rename from graphics/pokemon/yanmega/icon.png
rename to graphics/pokemon/gen_4/yanmega/icon.png
diff --git a/graphics/pokemon/yanmega/normal.pal b/graphics/pokemon/gen_4/yanmega/normal.pal
similarity index 100%
rename from graphics/pokemon/yanmega/normal.pal
rename to graphics/pokemon/gen_4/yanmega/normal.pal
diff --git a/graphics/pokemon/yanmega/shiny.pal b/graphics/pokemon/gen_4/yanmega/shiny.pal
similarity index 100%
rename from graphics/pokemon/yanmega/shiny.pal
rename to graphics/pokemon/gen_4/yanmega/shiny.pal
diff --git a/graphics/pokemon/accelgor/anim_front.png b/graphics/pokemon/gen_5/accelgor/anim_front.png
similarity index 100%
rename from graphics/pokemon/accelgor/anim_front.png
rename to graphics/pokemon/gen_5/accelgor/anim_front.png
diff --git a/graphics/pokemon/accelgor/back.png b/graphics/pokemon/gen_5/accelgor/back.png
similarity index 100%
rename from graphics/pokemon/accelgor/back.png
rename to graphics/pokemon/gen_5/accelgor/back.png
diff --git a/graphics/pokemon/litwick/footprint.png b/graphics/pokemon/gen_5/accelgor/footprint.png
similarity index 100%
rename from graphics/pokemon/litwick/footprint.png
rename to graphics/pokemon/gen_5/accelgor/footprint.png
diff --git a/graphics/pokemon/accelgor/icon.png b/graphics/pokemon/gen_5/accelgor/icon.png
similarity index 100%
rename from graphics/pokemon/accelgor/icon.png
rename to graphics/pokemon/gen_5/accelgor/icon.png
diff --git a/graphics/pokemon/accelgor/normal.pal b/graphics/pokemon/gen_5/accelgor/normal.pal
similarity index 100%
rename from graphics/pokemon/accelgor/normal.pal
rename to graphics/pokemon/gen_5/accelgor/normal.pal
diff --git a/graphics/pokemon/accelgor/shiny.pal b/graphics/pokemon/gen_5/accelgor/shiny.pal
similarity index 100%
rename from graphics/pokemon/accelgor/shiny.pal
rename to graphics/pokemon/gen_5/accelgor/shiny.pal
diff --git a/graphics/pokemon/alomomola/anim_front.png b/graphics/pokemon/gen_5/alomomola/anim_front.png
similarity index 100%
rename from graphics/pokemon/alomomola/anim_front.png
rename to graphics/pokemon/gen_5/alomomola/anim_front.png
diff --git a/graphics/pokemon/alomomola/back.png b/graphics/pokemon/gen_5/alomomola/back.png
similarity index 100%
rename from graphics/pokemon/alomomola/back.png
rename to graphics/pokemon/gen_5/alomomola/back.png
diff --git a/graphics/pokemon/lumineon/footprint.png b/graphics/pokemon/gen_5/alomomola/footprint.png
similarity index 100%
rename from graphics/pokemon/lumineon/footprint.png
rename to graphics/pokemon/gen_5/alomomola/footprint.png
diff --git a/graphics/pokemon/alomomola/icon.png b/graphics/pokemon/gen_5/alomomola/icon.png
similarity index 100%
rename from graphics/pokemon/alomomola/icon.png
rename to graphics/pokemon/gen_5/alomomola/icon.png
diff --git a/graphics/pokemon/alomomola/normal.pal b/graphics/pokemon/gen_5/alomomola/normal.pal
similarity index 100%
rename from graphics/pokemon/alomomola/normal.pal
rename to graphics/pokemon/gen_5/alomomola/normal.pal
diff --git a/graphics/pokemon/alomomola/shiny.pal b/graphics/pokemon/gen_5/alomomola/shiny.pal
similarity index 100%
rename from graphics/pokemon/alomomola/shiny.pal
rename to graphics/pokemon/gen_5/alomomola/shiny.pal
diff --git a/graphics/pokemon/amoonguss/anim_front.png b/graphics/pokemon/gen_5/amoonguss/anim_front.png
similarity index 100%
rename from graphics/pokemon/amoonguss/anim_front.png
rename to graphics/pokemon/gen_5/amoonguss/anim_front.png
diff --git a/graphics/pokemon/amoonguss/back.png b/graphics/pokemon/gen_5/amoonguss/back.png
similarity index 100%
rename from graphics/pokemon/amoonguss/back.png
rename to graphics/pokemon/gen_5/amoonguss/back.png
diff --git a/graphics/pokemon/lunala/footprint.png b/graphics/pokemon/gen_5/amoonguss/footprint.png
similarity index 100%
rename from graphics/pokemon/lunala/footprint.png
rename to graphics/pokemon/gen_5/amoonguss/footprint.png
diff --git a/graphics/pokemon/amoonguss/icon.png b/graphics/pokemon/gen_5/amoonguss/icon.png
similarity index 100%
rename from graphics/pokemon/amoonguss/icon.png
rename to graphics/pokemon/gen_5/amoonguss/icon.png
diff --git a/graphics/pokemon/amoonguss/normal.pal b/graphics/pokemon/gen_5/amoonguss/normal.pal
similarity index 100%
rename from graphics/pokemon/amoonguss/normal.pal
rename to graphics/pokemon/gen_5/amoonguss/normal.pal
diff --git a/graphics/pokemon/amoonguss/shiny.pal b/graphics/pokemon/gen_5/amoonguss/shiny.pal
similarity index 100%
rename from graphics/pokemon/amoonguss/shiny.pal
rename to graphics/pokemon/gen_5/amoonguss/shiny.pal
diff --git a/graphics/pokemon/archen/anim_front.png b/graphics/pokemon/gen_5/archen/anim_front.png
similarity index 100%
rename from graphics/pokemon/archen/anim_front.png
rename to graphics/pokemon/gen_5/archen/anim_front.png
diff --git a/graphics/pokemon/archen/back.png b/graphics/pokemon/gen_5/archen/back.png
similarity index 100%
rename from graphics/pokemon/archen/back.png
rename to graphics/pokemon/gen_5/archen/back.png
diff --git a/graphics/pokemon/archen/footprint.png b/graphics/pokemon/gen_5/archen/footprint.png
similarity index 100%
rename from graphics/pokemon/archen/footprint.png
rename to graphics/pokemon/gen_5/archen/footprint.png
diff --git a/graphics/pokemon/archen/icon.png b/graphics/pokemon/gen_5/archen/icon.png
similarity index 100%
rename from graphics/pokemon/archen/icon.png
rename to graphics/pokemon/gen_5/archen/icon.png
diff --git a/graphics/pokemon/archen/normal.pal b/graphics/pokemon/gen_5/archen/normal.pal
similarity index 100%
rename from graphics/pokemon/archen/normal.pal
rename to graphics/pokemon/gen_5/archen/normal.pal
diff --git a/graphics/pokemon/archen/shiny.pal b/graphics/pokemon/gen_5/archen/shiny.pal
similarity index 100%
rename from graphics/pokemon/archen/shiny.pal
rename to graphics/pokemon/gen_5/archen/shiny.pal
diff --git a/graphics/pokemon/archeops/anim_front.png b/graphics/pokemon/gen_5/archeops/anim_front.png
similarity index 100%
rename from graphics/pokemon/archeops/anim_front.png
rename to graphics/pokemon/gen_5/archeops/anim_front.png
diff --git a/graphics/pokemon/archeops/back.png b/graphics/pokemon/gen_5/archeops/back.png
similarity index 100%
rename from graphics/pokemon/archeops/back.png
rename to graphics/pokemon/gen_5/archeops/back.png
diff --git a/graphics/pokemon/archeops/footprint.png b/graphics/pokemon/gen_5/archeops/footprint.png
similarity index 100%
rename from graphics/pokemon/archeops/footprint.png
rename to graphics/pokemon/gen_5/archeops/footprint.png
diff --git a/graphics/pokemon/archeops/icon.png b/graphics/pokemon/gen_5/archeops/icon.png
similarity index 100%
rename from graphics/pokemon/archeops/icon.png
rename to graphics/pokemon/gen_5/archeops/icon.png
diff --git a/graphics/pokemon/archeops/normal.pal b/graphics/pokemon/gen_5/archeops/normal.pal
similarity index 100%
rename from graphics/pokemon/archeops/normal.pal
rename to graphics/pokemon/gen_5/archeops/normal.pal
diff --git a/graphics/pokemon/archeops/shiny.pal b/graphics/pokemon/gen_5/archeops/shiny.pal
similarity index 100%
rename from graphics/pokemon/archeops/shiny.pal
rename to graphics/pokemon/gen_5/archeops/shiny.pal
diff --git a/graphics/pokemon/audino/anim_front.png b/graphics/pokemon/gen_5/audino/anim_front.png
similarity index 100%
rename from graphics/pokemon/audino/anim_front.png
rename to graphics/pokemon/gen_5/audino/anim_front.png
diff --git a/graphics/pokemon/audino/back.png b/graphics/pokemon/gen_5/audino/back.png
similarity index 100%
rename from graphics/pokemon/audino/back.png
rename to graphics/pokemon/gen_5/audino/back.png
diff --git a/graphics/pokemon/audino/footprint.png b/graphics/pokemon/gen_5/audino/footprint.png
similarity index 100%
rename from graphics/pokemon/audino/footprint.png
rename to graphics/pokemon/gen_5/audino/footprint.png
diff --git a/graphics/pokemon/audino/icon.png b/graphics/pokemon/gen_5/audino/icon.png
similarity index 100%
rename from graphics/pokemon/audino/icon.png
rename to graphics/pokemon/gen_5/audino/icon.png
diff --git a/graphics/pokemon/audino/mega/back.png b/graphics/pokemon/gen_5/audino/mega/back.png
similarity index 100%
rename from graphics/pokemon/audino/mega/back.png
rename to graphics/pokemon/gen_5/audino/mega/back.png
diff --git a/graphics/pokemon/audino/mega/front.png b/graphics/pokemon/gen_5/audino/mega/front.png
similarity index 100%
rename from graphics/pokemon/audino/mega/front.png
rename to graphics/pokemon/gen_5/audino/mega/front.png
diff --git a/graphics/pokemon/audino/mega/icon.png b/graphics/pokemon/gen_5/audino/mega/icon.png
similarity index 100%
rename from graphics/pokemon/audino/mega/icon.png
rename to graphics/pokemon/gen_5/audino/mega/icon.png
diff --git a/graphics/pokemon/audino/mega/normal.pal b/graphics/pokemon/gen_5/audino/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/audino/mega/normal.pal
rename to graphics/pokemon/gen_5/audino/mega/normal.pal
diff --git a/graphics/pokemon/audino/mega/shiny.pal b/graphics/pokemon/gen_5/audino/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/audino/mega/shiny.pal
rename to graphics/pokemon/gen_5/audino/mega/shiny.pal
diff --git a/graphics/pokemon/audino/normal.pal b/graphics/pokemon/gen_5/audino/normal.pal
similarity index 100%
rename from graphics/pokemon/audino/normal.pal
rename to graphics/pokemon/gen_5/audino/normal.pal
diff --git a/graphics/pokemon/audino/shiny.pal b/graphics/pokemon/gen_5/audino/shiny.pal
similarity index 100%
rename from graphics/pokemon/audino/shiny.pal
rename to graphics/pokemon/gen_5/audino/shiny.pal
diff --git a/graphics/pokemon/axew/anim_front.png b/graphics/pokemon/gen_5/axew/anim_front.png
similarity index 100%
rename from graphics/pokemon/axew/anim_front.png
rename to graphics/pokemon/gen_5/axew/anim_front.png
diff --git a/graphics/pokemon/axew/back.png b/graphics/pokemon/gen_5/axew/back.png
similarity index 100%
rename from graphics/pokemon/axew/back.png
rename to graphics/pokemon/gen_5/axew/back.png
diff --git a/graphics/pokemon/axew/footprint.png b/graphics/pokemon/gen_5/axew/footprint.png
similarity index 100%
rename from graphics/pokemon/axew/footprint.png
rename to graphics/pokemon/gen_5/axew/footprint.png
diff --git a/graphics/pokemon/axew/icon.png b/graphics/pokemon/gen_5/axew/icon.png
similarity index 100%
rename from graphics/pokemon/axew/icon.png
rename to graphics/pokemon/gen_5/axew/icon.png
diff --git a/graphics/pokemon/axew/normal.pal b/graphics/pokemon/gen_5/axew/normal.pal
similarity index 100%
rename from graphics/pokemon/axew/normal.pal
rename to graphics/pokemon/gen_5/axew/normal.pal
diff --git a/graphics/pokemon/axew/shiny.pal b/graphics/pokemon/gen_5/axew/shiny.pal
similarity index 100%
rename from graphics/pokemon/axew/shiny.pal
rename to graphics/pokemon/gen_5/axew/shiny.pal
diff --git a/graphics/pokemon/basculin/anim_front.png b/graphics/pokemon/gen_5/basculin/anim_front.png
similarity index 100%
rename from graphics/pokemon/basculin/anim_front.png
rename to graphics/pokemon/gen_5/basculin/anim_front.png
diff --git a/graphics/pokemon/basculin/back.png b/graphics/pokemon/gen_5/basculin/back.png
similarity index 100%
rename from graphics/pokemon/basculin/back.png
rename to graphics/pokemon/gen_5/basculin/back.png
diff --git a/graphics/pokemon/basculin/blue_striped/back.png b/graphics/pokemon/gen_5/basculin/blue_striped/back.png
similarity index 100%
rename from graphics/pokemon/basculin/blue_striped/back.png
rename to graphics/pokemon/gen_5/basculin/blue_striped/back.png
diff --git a/graphics/pokemon/basculin/blue_striped/front.png b/graphics/pokemon/gen_5/basculin/blue_striped/front.png
similarity index 100%
rename from graphics/pokemon/basculin/blue_striped/front.png
rename to graphics/pokemon/gen_5/basculin/blue_striped/front.png
diff --git a/graphics/pokemon/basculin/blue_striped/icon.png b/graphics/pokemon/gen_5/basculin/blue_striped/icon.png
similarity index 100%
rename from graphics/pokemon/basculin/blue_striped/icon.png
rename to graphics/pokemon/gen_5/basculin/blue_striped/icon.png
diff --git a/graphics/pokemon/basculin/blue_striped/normal.pal b/graphics/pokemon/gen_5/basculin/blue_striped/normal.pal
similarity index 100%
rename from graphics/pokemon/basculin/blue_striped/normal.pal
rename to graphics/pokemon/gen_5/basculin/blue_striped/normal.pal
diff --git a/graphics/pokemon/basculin/blue_striped/shiny.pal b/graphics/pokemon/gen_5/basculin/blue_striped/shiny.pal
similarity index 100%
rename from graphics/pokemon/basculin/blue_striped/shiny.pal
rename to graphics/pokemon/gen_5/basculin/blue_striped/shiny.pal
diff --git a/graphics/pokemon/lunatone/footprint.png b/graphics/pokemon/gen_5/basculin/footprint.png
similarity index 100%
rename from graphics/pokemon/lunatone/footprint.png
rename to graphics/pokemon/gen_5/basculin/footprint.png
diff --git a/graphics/pokemon/basculin/icon.png b/graphics/pokemon/gen_5/basculin/icon.png
similarity index 100%
rename from graphics/pokemon/basculin/icon.png
rename to graphics/pokemon/gen_5/basculin/icon.png
diff --git a/graphics/pokemon/basculin/normal.pal b/graphics/pokemon/gen_5/basculin/normal.pal
similarity index 100%
rename from graphics/pokemon/basculin/normal.pal
rename to graphics/pokemon/gen_5/basculin/normal.pal
diff --git a/graphics/pokemon/basculin/shiny.pal b/graphics/pokemon/gen_5/basculin/shiny.pal
similarity index 100%
rename from graphics/pokemon/basculin/shiny.pal
rename to graphics/pokemon/gen_5/basculin/shiny.pal
diff --git a/graphics/pokemon/basculin/white_striped/back.png b/graphics/pokemon/gen_5/basculin/white_striped/back.png
similarity index 100%
rename from graphics/pokemon/basculin/white_striped/back.png
rename to graphics/pokemon/gen_5/basculin/white_striped/back.png
diff --git a/graphics/pokemon/basculin/white_striped/front.png b/graphics/pokemon/gen_5/basculin/white_striped/front.png
similarity index 100%
rename from graphics/pokemon/basculin/white_striped/front.png
rename to graphics/pokemon/gen_5/basculin/white_striped/front.png
diff --git a/graphics/pokemon/basculin/white_striped/icon.png b/graphics/pokemon/gen_5/basculin/white_striped/icon.png
similarity index 100%
rename from graphics/pokemon/basculin/white_striped/icon.png
rename to graphics/pokemon/gen_5/basculin/white_striped/icon.png
diff --git a/graphics/pokemon/basculin/white_striped/normal.pal b/graphics/pokemon/gen_5/basculin/white_striped/normal.pal
similarity index 100%
rename from graphics/pokemon/basculin/white_striped/normal.pal
rename to graphics/pokemon/gen_5/basculin/white_striped/normal.pal
diff --git a/graphics/pokemon/basculin/white_striped/shiny.pal b/graphics/pokemon/gen_5/basculin/white_striped/shiny.pal
similarity index 100%
rename from graphics/pokemon/basculin/white_striped/shiny.pal
rename to graphics/pokemon/gen_5/basculin/white_striped/shiny.pal
diff --git a/graphics/pokemon/beartic/anim_front.png b/graphics/pokemon/gen_5/beartic/anim_front.png
similarity index 100%
rename from graphics/pokemon/beartic/anim_front.png
rename to graphics/pokemon/gen_5/beartic/anim_front.png
diff --git a/graphics/pokemon/beartic/back.png b/graphics/pokemon/gen_5/beartic/back.png
similarity index 100%
rename from graphics/pokemon/beartic/back.png
rename to graphics/pokemon/gen_5/beartic/back.png
diff --git a/graphics/pokemon/beartic/footprint.png b/graphics/pokemon/gen_5/beartic/footprint.png
similarity index 100%
rename from graphics/pokemon/beartic/footprint.png
rename to graphics/pokemon/gen_5/beartic/footprint.png
diff --git a/graphics/pokemon/beartic/icon.png b/graphics/pokemon/gen_5/beartic/icon.png
similarity index 100%
rename from graphics/pokemon/beartic/icon.png
rename to graphics/pokemon/gen_5/beartic/icon.png
diff --git a/graphics/pokemon/beartic/normal.pal b/graphics/pokemon/gen_5/beartic/normal.pal
similarity index 100%
rename from graphics/pokemon/beartic/normal.pal
rename to graphics/pokemon/gen_5/beartic/normal.pal
diff --git a/graphics/pokemon/beartic/shiny.pal b/graphics/pokemon/gen_5/beartic/shiny.pal
similarity index 100%
rename from graphics/pokemon/beartic/shiny.pal
rename to graphics/pokemon/gen_5/beartic/shiny.pal
diff --git a/graphics/pokemon/beheeyem/anim_front.png b/graphics/pokemon/gen_5/beheeyem/anim_front.png
similarity index 100%
rename from graphics/pokemon/beheeyem/anim_front.png
rename to graphics/pokemon/gen_5/beheeyem/anim_front.png
diff --git a/graphics/pokemon/beheeyem/back.png b/graphics/pokemon/gen_5/beheeyem/back.png
similarity index 100%
rename from graphics/pokemon/beheeyem/back.png
rename to graphics/pokemon/gen_5/beheeyem/back.png
diff --git a/graphics/pokemon/beheeyem/footprint.png b/graphics/pokemon/gen_5/beheeyem/footprint.png
similarity index 100%
rename from graphics/pokemon/beheeyem/footprint.png
rename to graphics/pokemon/gen_5/beheeyem/footprint.png
diff --git a/graphics/pokemon/beheeyem/icon.png b/graphics/pokemon/gen_5/beheeyem/icon.png
similarity index 100%
rename from graphics/pokemon/beheeyem/icon.png
rename to graphics/pokemon/gen_5/beheeyem/icon.png
diff --git a/graphics/pokemon/beheeyem/normal.pal b/graphics/pokemon/gen_5/beheeyem/normal.pal
similarity index 100%
rename from graphics/pokemon/beheeyem/normal.pal
rename to graphics/pokemon/gen_5/beheeyem/normal.pal
diff --git a/graphics/pokemon/beheeyem/shiny.pal b/graphics/pokemon/gen_5/beheeyem/shiny.pal
similarity index 100%
rename from graphics/pokemon/beheeyem/shiny.pal
rename to graphics/pokemon/gen_5/beheeyem/shiny.pal
diff --git a/graphics/pokemon/bisharp/anim_front.png b/graphics/pokemon/gen_5/bisharp/anim_front.png
similarity index 100%
rename from graphics/pokemon/bisharp/anim_front.png
rename to graphics/pokemon/gen_5/bisharp/anim_front.png
diff --git a/graphics/pokemon/bisharp/back.png b/graphics/pokemon/gen_5/bisharp/back.png
similarity index 100%
rename from graphics/pokemon/bisharp/back.png
rename to graphics/pokemon/gen_5/bisharp/back.png
diff --git a/graphics/pokemon/bisharp/footprint.png b/graphics/pokemon/gen_5/bisharp/footprint.png
similarity index 100%
rename from graphics/pokemon/bisharp/footprint.png
rename to graphics/pokemon/gen_5/bisharp/footprint.png
diff --git a/graphics/pokemon/bisharp/icon.png b/graphics/pokemon/gen_5/bisharp/icon.png
similarity index 100%
rename from graphics/pokemon/bisharp/icon.png
rename to graphics/pokemon/gen_5/bisharp/icon.png
diff --git a/graphics/pokemon/bisharp/normal.pal b/graphics/pokemon/gen_5/bisharp/normal.pal
similarity index 100%
rename from graphics/pokemon/bisharp/normal.pal
rename to graphics/pokemon/gen_5/bisharp/normal.pal
diff --git a/graphics/pokemon/bisharp/shiny.pal b/graphics/pokemon/gen_5/bisharp/shiny.pal
similarity index 100%
rename from graphics/pokemon/bisharp/shiny.pal
rename to graphics/pokemon/gen_5/bisharp/shiny.pal
diff --git a/graphics/pokemon/blitzle/anim_front.png b/graphics/pokemon/gen_5/blitzle/anim_front.png
similarity index 100%
rename from graphics/pokemon/blitzle/anim_front.png
rename to graphics/pokemon/gen_5/blitzle/anim_front.png
diff --git a/graphics/pokemon/blitzle/back.png b/graphics/pokemon/gen_5/blitzle/back.png
similarity index 100%
rename from graphics/pokemon/blitzle/back.png
rename to graphics/pokemon/gen_5/blitzle/back.png
diff --git a/graphics/pokemon/blitzle/footprint.png b/graphics/pokemon/gen_5/blitzle/footprint.png
similarity index 100%
rename from graphics/pokemon/blitzle/footprint.png
rename to graphics/pokemon/gen_5/blitzle/footprint.png
diff --git a/graphics/pokemon/blitzle/icon.png b/graphics/pokemon/gen_5/blitzle/icon.png
similarity index 100%
rename from graphics/pokemon/blitzle/icon.png
rename to graphics/pokemon/gen_5/blitzle/icon.png
diff --git a/graphics/pokemon/blitzle/normal.pal b/graphics/pokemon/gen_5/blitzle/normal.pal
similarity index 100%
rename from graphics/pokemon/blitzle/normal.pal
rename to graphics/pokemon/gen_5/blitzle/normal.pal
diff --git a/graphics/pokemon/blitzle/shiny.pal b/graphics/pokemon/gen_5/blitzle/shiny.pal
similarity index 100%
rename from graphics/pokemon/blitzle/shiny.pal
rename to graphics/pokemon/gen_5/blitzle/shiny.pal
diff --git a/graphics/pokemon/boldore/anim_front.png b/graphics/pokemon/gen_5/boldore/anim_front.png
similarity index 100%
rename from graphics/pokemon/boldore/anim_front.png
rename to graphics/pokemon/gen_5/boldore/anim_front.png
diff --git a/graphics/pokemon/boldore/back.png b/graphics/pokemon/gen_5/boldore/back.png
similarity index 100%
rename from graphics/pokemon/boldore/back.png
rename to graphics/pokemon/gen_5/boldore/back.png
diff --git a/graphics/pokemon/boldore/footprint.png b/graphics/pokemon/gen_5/boldore/footprint.png
similarity index 100%
rename from graphics/pokemon/boldore/footprint.png
rename to graphics/pokemon/gen_5/boldore/footprint.png
diff --git a/graphics/pokemon/boldore/icon.png b/graphics/pokemon/gen_5/boldore/icon.png
similarity index 100%
rename from graphics/pokemon/boldore/icon.png
rename to graphics/pokemon/gen_5/boldore/icon.png
diff --git a/graphics/pokemon/boldore/normal.pal b/graphics/pokemon/gen_5/boldore/normal.pal
similarity index 100%
rename from graphics/pokemon/boldore/normal.pal
rename to graphics/pokemon/gen_5/boldore/normal.pal
diff --git a/graphics/pokemon/boldore/shiny.pal b/graphics/pokemon/gen_5/boldore/shiny.pal
similarity index 100%
rename from graphics/pokemon/boldore/shiny.pal
rename to graphics/pokemon/gen_5/boldore/shiny.pal
diff --git a/graphics/pokemon/bouffalant/anim_front.png b/graphics/pokemon/gen_5/bouffalant/anim_front.png
similarity index 100%
rename from graphics/pokemon/bouffalant/anim_front.png
rename to graphics/pokemon/gen_5/bouffalant/anim_front.png
diff --git a/graphics/pokemon/bouffalant/back.png b/graphics/pokemon/gen_5/bouffalant/back.png
similarity index 100%
rename from graphics/pokemon/bouffalant/back.png
rename to graphics/pokemon/gen_5/bouffalant/back.png
diff --git a/graphics/pokemon/bouffalant/footprint.png b/graphics/pokemon/gen_5/bouffalant/footprint.png
similarity index 100%
rename from graphics/pokemon/bouffalant/footprint.png
rename to graphics/pokemon/gen_5/bouffalant/footprint.png
diff --git a/graphics/pokemon/bouffalant/icon.png b/graphics/pokemon/gen_5/bouffalant/icon.png
similarity index 100%
rename from graphics/pokemon/bouffalant/icon.png
rename to graphics/pokemon/gen_5/bouffalant/icon.png
diff --git a/graphics/pokemon/bouffalant/normal.pal b/graphics/pokemon/gen_5/bouffalant/normal.pal
similarity index 100%
rename from graphics/pokemon/bouffalant/normal.pal
rename to graphics/pokemon/gen_5/bouffalant/normal.pal
diff --git a/graphics/pokemon/bouffalant/shiny.pal b/graphics/pokemon/gen_5/bouffalant/shiny.pal
similarity index 100%
rename from graphics/pokemon/bouffalant/shiny.pal
rename to graphics/pokemon/gen_5/bouffalant/shiny.pal
diff --git a/graphics/pokemon/braviary/anim_front.png b/graphics/pokemon/gen_5/braviary/anim_front.png
similarity index 100%
rename from graphics/pokemon/braviary/anim_front.png
rename to graphics/pokemon/gen_5/braviary/anim_front.png
diff --git a/graphics/pokemon/braviary/back.png b/graphics/pokemon/gen_5/braviary/back.png
similarity index 100%
rename from graphics/pokemon/braviary/back.png
rename to graphics/pokemon/gen_5/braviary/back.png
diff --git a/graphics/pokemon/braviary/footprint.png b/graphics/pokemon/gen_5/braviary/footprint.png
similarity index 100%
rename from graphics/pokemon/braviary/footprint.png
rename to graphics/pokemon/gen_5/braviary/footprint.png
diff --git a/graphics/pokemon/braviary/hisuian/back.png b/graphics/pokemon/gen_5/braviary/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/braviary/hisuian/back.png
rename to graphics/pokemon/gen_5/braviary/hisuian/back.png
diff --git a/graphics/pokemon/braviary/hisuian/front.png b/graphics/pokemon/gen_5/braviary/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/braviary/hisuian/front.png
rename to graphics/pokemon/gen_5/braviary/hisuian/front.png
diff --git a/graphics/pokemon/braviary/hisuian/icon.png b/graphics/pokemon/gen_5/braviary/hisuian/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/braviary/hisuian/icon.png
rename to graphics/pokemon/gen_5/braviary/hisuian/icon.png
diff --git a/graphics/pokemon/braviary/hisuian/normal.pal b/graphics/pokemon/gen_5/braviary/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/braviary/hisuian/normal.pal
rename to graphics/pokemon/gen_5/braviary/hisuian/normal.pal
diff --git a/graphics/pokemon/braviary/hisuian/shiny.pal b/graphics/pokemon/gen_5/braviary/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/braviary/hisuian/shiny.pal
rename to graphics/pokemon/gen_5/braviary/hisuian/shiny.pal
diff --git a/graphics/pokemon/braviary/icon.png b/graphics/pokemon/gen_5/braviary/icon.png
similarity index 100%
rename from graphics/pokemon/braviary/icon.png
rename to graphics/pokemon/gen_5/braviary/icon.png
diff --git a/graphics/pokemon/braviary/normal.pal b/graphics/pokemon/gen_5/braviary/normal.pal
similarity index 100%
rename from graphics/pokemon/braviary/normal.pal
rename to graphics/pokemon/gen_5/braviary/normal.pal
diff --git a/graphics/pokemon/braviary/shiny.pal b/graphics/pokemon/gen_5/braviary/shiny.pal
similarity index 100%
rename from graphics/pokemon/braviary/shiny.pal
rename to graphics/pokemon/gen_5/braviary/shiny.pal
diff --git a/graphics/pokemon/carracosta/anim_front.png b/graphics/pokemon/gen_5/carracosta/anim_front.png
similarity index 100%
rename from graphics/pokemon/carracosta/anim_front.png
rename to graphics/pokemon/gen_5/carracosta/anim_front.png
diff --git a/graphics/pokemon/carracosta/back.png b/graphics/pokemon/gen_5/carracosta/back.png
similarity index 100%
rename from graphics/pokemon/carracosta/back.png
rename to graphics/pokemon/gen_5/carracosta/back.png
diff --git a/graphics/pokemon/carracosta/footprint.png b/graphics/pokemon/gen_5/carracosta/footprint.png
similarity index 100%
rename from graphics/pokemon/carracosta/footprint.png
rename to graphics/pokemon/gen_5/carracosta/footprint.png
diff --git a/graphics/pokemon/carracosta/icon.png b/graphics/pokemon/gen_5/carracosta/icon.png
similarity index 100%
rename from graphics/pokemon/carracosta/icon.png
rename to graphics/pokemon/gen_5/carracosta/icon.png
diff --git a/graphics/pokemon/carracosta/normal.pal b/graphics/pokemon/gen_5/carracosta/normal.pal
similarity index 100%
rename from graphics/pokemon/carracosta/normal.pal
rename to graphics/pokemon/gen_5/carracosta/normal.pal
diff --git a/graphics/pokemon/carracosta/shiny.pal b/graphics/pokemon/gen_5/carracosta/shiny.pal
similarity index 100%
rename from graphics/pokemon/carracosta/shiny.pal
rename to graphics/pokemon/gen_5/carracosta/shiny.pal
diff --git a/graphics/pokemon/chandelure/anim_front.png b/graphics/pokemon/gen_5/chandelure/anim_front.png
similarity index 100%
rename from graphics/pokemon/chandelure/anim_front.png
rename to graphics/pokemon/gen_5/chandelure/anim_front.png
diff --git a/graphics/pokemon/chandelure/back.png b/graphics/pokemon/gen_5/chandelure/back.png
similarity index 100%
rename from graphics/pokemon/chandelure/back.png
rename to graphics/pokemon/gen_5/chandelure/back.png
diff --git a/graphics/pokemon/luvdisc/footprint.png b/graphics/pokemon/gen_5/chandelure/footprint.png
similarity index 100%
rename from graphics/pokemon/luvdisc/footprint.png
rename to graphics/pokemon/gen_5/chandelure/footprint.png
diff --git a/graphics/pokemon/chandelure/icon.png b/graphics/pokemon/gen_5/chandelure/icon.png
similarity index 100%
rename from graphics/pokemon/chandelure/icon.png
rename to graphics/pokemon/gen_5/chandelure/icon.png
diff --git a/graphics/pokemon/chandelure/normal.pal b/graphics/pokemon/gen_5/chandelure/normal.pal
similarity index 100%
rename from graphics/pokemon/chandelure/normal.pal
rename to graphics/pokemon/gen_5/chandelure/normal.pal
diff --git a/graphics/pokemon/chandelure/shiny.pal b/graphics/pokemon/gen_5/chandelure/shiny.pal
similarity index 100%
rename from graphics/pokemon/chandelure/shiny.pal
rename to graphics/pokemon/gen_5/chandelure/shiny.pal
diff --git a/graphics/pokemon/cinccino/anim_front.png b/graphics/pokemon/gen_5/cinccino/anim_front.png
similarity index 100%
rename from graphics/pokemon/cinccino/anim_front.png
rename to graphics/pokemon/gen_5/cinccino/anim_front.png
diff --git a/graphics/pokemon/cinccino/back.png b/graphics/pokemon/gen_5/cinccino/back.png
similarity index 100%
rename from graphics/pokemon/cinccino/back.png
rename to graphics/pokemon/gen_5/cinccino/back.png
diff --git a/graphics/pokemon/cinccino/footprint.png b/graphics/pokemon/gen_5/cinccino/footprint.png
similarity index 100%
rename from graphics/pokemon/cinccino/footprint.png
rename to graphics/pokemon/gen_5/cinccino/footprint.png
diff --git a/graphics/pokemon/cinccino/icon.png b/graphics/pokemon/gen_5/cinccino/icon.png
similarity index 100%
rename from graphics/pokemon/cinccino/icon.png
rename to graphics/pokemon/gen_5/cinccino/icon.png
diff --git a/graphics/pokemon/cinccino/normal.pal b/graphics/pokemon/gen_5/cinccino/normal.pal
similarity index 100%
rename from graphics/pokemon/cinccino/normal.pal
rename to graphics/pokemon/gen_5/cinccino/normal.pal
diff --git a/graphics/pokemon/cinccino/shiny.pal b/graphics/pokemon/gen_5/cinccino/shiny.pal
similarity index 100%
rename from graphics/pokemon/cinccino/shiny.pal
rename to graphics/pokemon/gen_5/cinccino/shiny.pal
diff --git a/graphics/pokemon/cobalion/anim_front.png b/graphics/pokemon/gen_5/cobalion/anim_front.png
similarity index 100%
rename from graphics/pokemon/cobalion/anim_front.png
rename to graphics/pokemon/gen_5/cobalion/anim_front.png
diff --git a/graphics/pokemon/cobalion/back.png b/graphics/pokemon/gen_5/cobalion/back.png
similarity index 100%
rename from graphics/pokemon/cobalion/back.png
rename to graphics/pokemon/gen_5/cobalion/back.png
diff --git a/graphics/pokemon/cobalion/footprint.png b/graphics/pokemon/gen_5/cobalion/footprint.png
similarity index 100%
rename from graphics/pokemon/cobalion/footprint.png
rename to graphics/pokemon/gen_5/cobalion/footprint.png
diff --git a/graphics/pokemon/cobalion/icon.png b/graphics/pokemon/gen_5/cobalion/icon.png
similarity index 100%
rename from graphics/pokemon/cobalion/icon.png
rename to graphics/pokemon/gen_5/cobalion/icon.png
diff --git a/graphics/pokemon/cobalion/normal.pal b/graphics/pokemon/gen_5/cobalion/normal.pal
similarity index 100%
rename from graphics/pokemon/cobalion/normal.pal
rename to graphics/pokemon/gen_5/cobalion/normal.pal
diff --git a/graphics/pokemon/cobalion/shiny.pal b/graphics/pokemon/gen_5/cobalion/shiny.pal
similarity index 100%
rename from graphics/pokemon/cobalion/shiny.pal
rename to graphics/pokemon/gen_5/cobalion/shiny.pal
diff --git a/graphics/pokemon/cofagrigus/anim_front.png b/graphics/pokemon/gen_5/cofagrigus/anim_front.png
similarity index 100%
rename from graphics/pokemon/cofagrigus/anim_front.png
rename to graphics/pokemon/gen_5/cofagrigus/anim_front.png
diff --git a/graphics/pokemon/cofagrigus/back.png b/graphics/pokemon/gen_5/cofagrigus/back.png
similarity index 100%
rename from graphics/pokemon/cofagrigus/back.png
rename to graphics/pokemon/gen_5/cofagrigus/back.png
diff --git a/graphics/pokemon/magcargo/footprint.png b/graphics/pokemon/gen_5/cofagrigus/footprint.png
similarity index 100%
rename from graphics/pokemon/magcargo/footprint.png
rename to graphics/pokemon/gen_5/cofagrigus/footprint.png
diff --git a/graphics/pokemon/cofagrigus/icon.png b/graphics/pokemon/gen_5/cofagrigus/icon.png
similarity index 100%
rename from graphics/pokemon/cofagrigus/icon.png
rename to graphics/pokemon/gen_5/cofagrigus/icon.png
diff --git a/graphics/pokemon/cofagrigus/normal.pal b/graphics/pokemon/gen_5/cofagrigus/normal.pal
similarity index 100%
rename from graphics/pokemon/cofagrigus/normal.pal
rename to graphics/pokemon/gen_5/cofagrigus/normal.pal
diff --git a/graphics/pokemon/cofagrigus/shiny.pal b/graphics/pokemon/gen_5/cofagrigus/shiny.pal
similarity index 100%
rename from graphics/pokemon/cofagrigus/shiny.pal
rename to graphics/pokemon/gen_5/cofagrigus/shiny.pal
diff --git a/graphics/pokemon/conkeldurr/anim_front.png b/graphics/pokemon/gen_5/conkeldurr/anim_front.png
similarity index 100%
rename from graphics/pokemon/conkeldurr/anim_front.png
rename to graphics/pokemon/gen_5/conkeldurr/anim_front.png
diff --git a/graphics/pokemon/conkeldurr/back.png b/graphics/pokemon/gen_5/conkeldurr/back.png
similarity index 100%
rename from graphics/pokemon/conkeldurr/back.png
rename to graphics/pokemon/gen_5/conkeldurr/back.png
diff --git a/graphics/pokemon/conkeldurr/footprint.png b/graphics/pokemon/gen_5/conkeldurr/footprint.png
similarity index 100%
rename from graphics/pokemon/conkeldurr/footprint.png
rename to graphics/pokemon/gen_5/conkeldurr/footprint.png
diff --git a/graphics/pokemon/conkeldurr/icon.png b/graphics/pokemon/gen_5/conkeldurr/icon.png
similarity index 100%
rename from graphics/pokemon/conkeldurr/icon.png
rename to graphics/pokemon/gen_5/conkeldurr/icon.png
diff --git a/graphics/pokemon/conkeldurr/normal.pal b/graphics/pokemon/gen_5/conkeldurr/normal.pal
similarity index 100%
rename from graphics/pokemon/conkeldurr/normal.pal
rename to graphics/pokemon/gen_5/conkeldurr/normal.pal
diff --git a/graphics/pokemon/conkeldurr/shiny.pal b/graphics/pokemon/gen_5/conkeldurr/shiny.pal
similarity index 100%
rename from graphics/pokemon/conkeldurr/shiny.pal
rename to graphics/pokemon/gen_5/conkeldurr/shiny.pal
diff --git a/graphics/pokemon/cottonee/anim_front.png b/graphics/pokemon/gen_5/cottonee/anim_front.png
similarity index 100%
rename from graphics/pokemon/cottonee/anim_front.png
rename to graphics/pokemon/gen_5/cottonee/anim_front.png
diff --git a/graphics/pokemon/cottonee/back.png b/graphics/pokemon/gen_5/cottonee/back.png
similarity index 100%
rename from graphics/pokemon/cottonee/back.png
rename to graphics/pokemon/gen_5/cottonee/back.png
diff --git a/graphics/pokemon/magikarp/footprint.png b/graphics/pokemon/gen_5/cottonee/footprint.png
similarity index 100%
rename from graphics/pokemon/magikarp/footprint.png
rename to graphics/pokemon/gen_5/cottonee/footprint.png
diff --git a/graphics/pokemon/cottonee/icon.png b/graphics/pokemon/gen_5/cottonee/icon.png
similarity index 100%
rename from graphics/pokemon/cottonee/icon.png
rename to graphics/pokemon/gen_5/cottonee/icon.png
diff --git a/graphics/pokemon/cottonee/normal.pal b/graphics/pokemon/gen_5/cottonee/normal.pal
similarity index 100%
rename from graphics/pokemon/cottonee/normal.pal
rename to graphics/pokemon/gen_5/cottonee/normal.pal
diff --git a/graphics/pokemon/cottonee/shiny.pal b/graphics/pokemon/gen_5/cottonee/shiny.pal
similarity index 100%
rename from graphics/pokemon/cottonee/shiny.pal
rename to graphics/pokemon/gen_5/cottonee/shiny.pal
diff --git a/graphics/pokemon/crustle/anim_front.png b/graphics/pokemon/gen_5/crustle/anim_front.png
similarity index 100%
rename from graphics/pokemon/crustle/anim_front.png
rename to graphics/pokemon/gen_5/crustle/anim_front.png
diff --git a/graphics/pokemon/crustle/back.png b/graphics/pokemon/gen_5/crustle/back.png
similarity index 100%
rename from graphics/pokemon/crustle/back.png
rename to graphics/pokemon/gen_5/crustle/back.png
diff --git a/graphics/pokemon/cherubi/footprint.png b/graphics/pokemon/gen_5/crustle/footprint.png
similarity index 100%
rename from graphics/pokemon/cherubi/footprint.png
rename to graphics/pokemon/gen_5/crustle/footprint.png
diff --git a/graphics/pokemon/crustle/icon.png b/graphics/pokemon/gen_5/crustle/icon.png
similarity index 100%
rename from graphics/pokemon/crustle/icon.png
rename to graphics/pokemon/gen_5/crustle/icon.png
diff --git a/graphics/pokemon/crustle/normal.pal b/graphics/pokemon/gen_5/crustle/normal.pal
similarity index 100%
rename from graphics/pokemon/crustle/normal.pal
rename to graphics/pokemon/gen_5/crustle/normal.pal
diff --git a/graphics/pokemon/crustle/shiny.pal b/graphics/pokemon/gen_5/crustle/shiny.pal
similarity index 100%
rename from graphics/pokemon/crustle/shiny.pal
rename to graphics/pokemon/gen_5/crustle/shiny.pal
diff --git a/graphics/pokemon/cryogonal/anim_front.png b/graphics/pokemon/gen_5/cryogonal/anim_front.png
similarity index 100%
rename from graphics/pokemon/cryogonal/anim_front.png
rename to graphics/pokemon/gen_5/cryogonal/anim_front.png
diff --git a/graphics/pokemon/cryogonal/back.png b/graphics/pokemon/gen_5/cryogonal/back.png
similarity index 100%
rename from graphics/pokemon/cryogonal/back.png
rename to graphics/pokemon/gen_5/cryogonal/back.png
diff --git a/graphics/pokemon/magnezone/footprint.png b/graphics/pokemon/gen_5/cryogonal/footprint.png
similarity index 100%
rename from graphics/pokemon/magnezone/footprint.png
rename to graphics/pokemon/gen_5/cryogonal/footprint.png
diff --git a/graphics/pokemon/cryogonal/icon.png b/graphics/pokemon/gen_5/cryogonal/icon.png
similarity index 100%
rename from graphics/pokemon/cryogonal/icon.png
rename to graphics/pokemon/gen_5/cryogonal/icon.png
diff --git a/graphics/pokemon/cryogonal/normal.pal b/graphics/pokemon/gen_5/cryogonal/normal.pal
similarity index 100%
rename from graphics/pokemon/cryogonal/normal.pal
rename to graphics/pokemon/gen_5/cryogonal/normal.pal
diff --git a/graphics/pokemon/cryogonal/shiny.pal b/graphics/pokemon/gen_5/cryogonal/shiny.pal
similarity index 100%
rename from graphics/pokemon/cryogonal/shiny.pal
rename to graphics/pokemon/gen_5/cryogonal/shiny.pal
diff --git a/graphics/pokemon/cubchoo/anim_front.png b/graphics/pokemon/gen_5/cubchoo/anim_front.png
similarity index 100%
rename from graphics/pokemon/cubchoo/anim_front.png
rename to graphics/pokemon/gen_5/cubchoo/anim_front.png
diff --git a/graphics/pokemon/cubchoo/back.png b/graphics/pokemon/gen_5/cubchoo/back.png
similarity index 100%
rename from graphics/pokemon/cubchoo/back.png
rename to graphics/pokemon/gen_5/cubchoo/back.png
diff --git a/graphics/pokemon/cubchoo/footprint.png b/graphics/pokemon/gen_5/cubchoo/footprint.png
similarity index 100%
rename from graphics/pokemon/cubchoo/footprint.png
rename to graphics/pokemon/gen_5/cubchoo/footprint.png
diff --git a/graphics/pokemon/cubchoo/icon.png b/graphics/pokemon/gen_5/cubchoo/icon.png
similarity index 100%
rename from graphics/pokemon/cubchoo/icon.png
rename to graphics/pokemon/gen_5/cubchoo/icon.png
diff --git a/graphics/pokemon/cubchoo/normal.pal b/graphics/pokemon/gen_5/cubchoo/normal.pal
similarity index 100%
rename from graphics/pokemon/cubchoo/normal.pal
rename to graphics/pokemon/gen_5/cubchoo/normal.pal
diff --git a/graphics/pokemon/cubchoo/shiny.pal b/graphics/pokemon/gen_5/cubchoo/shiny.pal
similarity index 100%
rename from graphics/pokemon/cubchoo/shiny.pal
rename to graphics/pokemon/gen_5/cubchoo/shiny.pal
diff --git a/graphics/pokemon/darmanitan/anim_front.png b/graphics/pokemon/gen_5/darmanitan/anim_front.png
similarity index 100%
rename from graphics/pokemon/darmanitan/anim_front.png
rename to graphics/pokemon/gen_5/darmanitan/anim_front.png
diff --git a/graphics/pokemon/darmanitan/back.png b/graphics/pokemon/gen_5/darmanitan/back.png
similarity index 100%
rename from graphics/pokemon/darmanitan/back.png
rename to graphics/pokemon/gen_5/darmanitan/back.png
diff --git a/graphics/pokemon/darmanitan/footprint.png b/graphics/pokemon/gen_5/darmanitan/footprint.png
similarity index 100%
rename from graphics/pokemon/darmanitan/footprint.png
rename to graphics/pokemon/gen_5/darmanitan/footprint.png
diff --git a/graphics/pokemon/darmanitan/galarian/back.png b/graphics/pokemon/gen_5/darmanitan/galarian/back.png
similarity index 100%
rename from graphics/pokemon/darmanitan/galarian/back.png
rename to graphics/pokemon/gen_5/darmanitan/galarian/back.png
diff --git a/graphics/pokemon/darmanitan/galarian/front.png b/graphics/pokemon/gen_5/darmanitan/galarian/front.png
similarity index 100%
rename from graphics/pokemon/darmanitan/galarian/front.png
rename to graphics/pokemon/gen_5/darmanitan/galarian/front.png
diff --git a/graphics/pokemon/darmanitan/galarian/icon.png b/graphics/pokemon/gen_5/darmanitan/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/darmanitan/galarian/icon.png
rename to graphics/pokemon/gen_5/darmanitan/galarian/icon.png
diff --git a/graphics/pokemon/darmanitan/galarian/normal.pal b/graphics/pokemon/gen_5/darmanitan/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/galarian/normal.pal
rename to graphics/pokemon/gen_5/darmanitan/galarian/normal.pal
diff --git a/graphics/pokemon/darmanitan/galarian/shiny.pal b/graphics/pokemon/gen_5/darmanitan/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/galarian/shiny.pal
rename to graphics/pokemon/gen_5/darmanitan/galarian/shiny.pal
diff --git a/graphics/pokemon/darmanitan/icon.png b/graphics/pokemon/gen_5/darmanitan/icon.png
similarity index 100%
rename from graphics/pokemon/darmanitan/icon.png
rename to graphics/pokemon/gen_5/darmanitan/icon.png
diff --git a/graphics/pokemon/darmanitan/normal.pal b/graphics/pokemon/gen_5/darmanitan/normal.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/normal.pal
rename to graphics/pokemon/gen_5/darmanitan/normal.pal
diff --git a/graphics/pokemon/darmanitan/shiny.pal b/graphics/pokemon/gen_5/darmanitan/shiny.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/shiny.pal
rename to graphics/pokemon/gen_5/darmanitan/shiny.pal
diff --git a/graphics/pokemon/darmanitan/zen_mode/anim_front.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/anim_front.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/back.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/back.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/back.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/back.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/back.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/galarian/back.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/front.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/galarian/front.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/galarian/icon.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.pal
diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.pal
diff --git a/graphics/pokemon/darmanitan/zen_mode/icon.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/icon.png
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/icon.png
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/icon.png
diff --git a/graphics/pokemon/darmanitan/zen_mode/normal.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/normal.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/normal.pal
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/normal.pal
diff --git a/graphics/pokemon/darmanitan/zen_mode/shiny.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.pal
similarity index 100%
rename from graphics/pokemon/darmanitan/zen_mode/shiny.pal
rename to graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.pal
diff --git a/graphics/pokemon/darumaka/anim_front.png b/graphics/pokemon/gen_5/darumaka/anim_front.png
similarity index 100%
rename from graphics/pokemon/darumaka/anim_front.png
rename to graphics/pokemon/gen_5/darumaka/anim_front.png
diff --git a/graphics/pokemon/darumaka/back.png b/graphics/pokemon/gen_5/darumaka/back.png
similarity index 100%
rename from graphics/pokemon/darumaka/back.png
rename to graphics/pokemon/gen_5/darumaka/back.png
diff --git a/graphics/pokemon/darumaka/footprint.png b/graphics/pokemon/gen_5/darumaka/footprint.png
similarity index 100%
rename from graphics/pokemon/darumaka/footprint.png
rename to graphics/pokemon/gen_5/darumaka/footprint.png
diff --git a/graphics/pokemon/darumaka/galarian/back.png b/graphics/pokemon/gen_5/darumaka/galarian/back.png
similarity index 100%
rename from graphics/pokemon/darumaka/galarian/back.png
rename to graphics/pokemon/gen_5/darumaka/galarian/back.png
diff --git a/graphics/pokemon/darumaka/galarian/front.png b/graphics/pokemon/gen_5/darumaka/galarian/front.png
similarity index 100%
rename from graphics/pokemon/darumaka/galarian/front.png
rename to graphics/pokemon/gen_5/darumaka/galarian/front.png
diff --git a/graphics/pokemon/darumaka/galarian/icon.png b/graphics/pokemon/gen_5/darumaka/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/darumaka/galarian/icon.png
rename to graphics/pokemon/gen_5/darumaka/galarian/icon.png
diff --git a/graphics/pokemon/darumaka/galarian/normal.pal b/graphics/pokemon/gen_5/darumaka/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/darumaka/galarian/normal.pal
rename to graphics/pokemon/gen_5/darumaka/galarian/normal.pal
diff --git a/graphics/pokemon/darumaka/galarian/shiny.pal b/graphics/pokemon/gen_5/darumaka/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/darumaka/galarian/shiny.pal
rename to graphics/pokemon/gen_5/darumaka/galarian/shiny.pal
diff --git a/graphics/pokemon/darumaka/icon.png b/graphics/pokemon/gen_5/darumaka/icon.png
similarity index 100%
rename from graphics/pokemon/darumaka/icon.png
rename to graphics/pokemon/gen_5/darumaka/icon.png
diff --git a/graphics/pokemon/darumaka/normal.pal b/graphics/pokemon/gen_5/darumaka/normal.pal
similarity index 100%
rename from graphics/pokemon/darumaka/normal.pal
rename to graphics/pokemon/gen_5/darumaka/normal.pal
diff --git a/graphics/pokemon/darumaka/shiny.pal b/graphics/pokemon/gen_5/darumaka/shiny.pal
similarity index 100%
rename from graphics/pokemon/darumaka/shiny.pal
rename to graphics/pokemon/gen_5/darumaka/shiny.pal
diff --git a/graphics/pokemon/deerling/anim_front.png b/graphics/pokemon/gen_5/deerling/anim_front.png
similarity index 100%
rename from graphics/pokemon/deerling/anim_front.png
rename to graphics/pokemon/gen_5/deerling/anim_front.png
diff --git a/graphics/pokemon/deerling/autumn/icon.png b/graphics/pokemon/gen_5/deerling/autumn/icon.png
similarity index 100%
rename from graphics/pokemon/deerling/autumn/icon.png
rename to graphics/pokemon/gen_5/deerling/autumn/icon.png
diff --git a/graphics/pokemon/deerling/autumn/normal.pal b/graphics/pokemon/gen_5/deerling/autumn/normal.pal
similarity index 100%
rename from graphics/pokemon/deerling/autumn/normal.pal
rename to graphics/pokemon/gen_5/deerling/autumn/normal.pal
diff --git a/graphics/pokemon/deerling/autumn/shiny.pal b/graphics/pokemon/gen_5/deerling/autumn/shiny.pal
similarity index 100%
rename from graphics/pokemon/deerling/autumn/shiny.pal
rename to graphics/pokemon/gen_5/deerling/autumn/shiny.pal
diff --git a/graphics/pokemon/deerling/back.png b/graphics/pokemon/gen_5/deerling/back.png
similarity index 100%
rename from graphics/pokemon/deerling/back.png
rename to graphics/pokemon/gen_5/deerling/back.png
diff --git a/graphics/pokemon/deerling/footprint.png b/graphics/pokemon/gen_5/deerling/footprint.png
similarity index 100%
rename from graphics/pokemon/deerling/footprint.png
rename to graphics/pokemon/gen_5/deerling/footprint.png
diff --git a/graphics/pokemon/deerling/icon.png b/graphics/pokemon/gen_5/deerling/icon.png
similarity index 100%
rename from graphics/pokemon/deerling/icon.png
rename to graphics/pokemon/gen_5/deerling/icon.png
diff --git a/graphics/pokemon/deerling/normal.pal b/graphics/pokemon/gen_5/deerling/normal.pal
similarity index 100%
rename from graphics/pokemon/deerling/normal.pal
rename to graphics/pokemon/gen_5/deerling/normal.pal
diff --git a/graphics/pokemon/deerling/shiny.pal b/graphics/pokemon/gen_5/deerling/shiny.pal
similarity index 100%
rename from graphics/pokemon/deerling/shiny.pal
rename to graphics/pokemon/gen_5/deerling/shiny.pal
diff --git a/graphics/pokemon/deerling/summer/icon.png b/graphics/pokemon/gen_5/deerling/summer/icon.png
similarity index 100%
rename from graphics/pokemon/deerling/summer/icon.png
rename to graphics/pokemon/gen_5/deerling/summer/icon.png
diff --git a/graphics/pokemon/deerling/summer/normal.pal b/graphics/pokemon/gen_5/deerling/summer/normal.pal
similarity index 100%
rename from graphics/pokemon/deerling/summer/normal.pal
rename to graphics/pokemon/gen_5/deerling/summer/normal.pal
diff --git a/graphics/pokemon/deerling/summer/shiny.pal b/graphics/pokemon/gen_5/deerling/summer/shiny.pal
similarity index 100%
rename from graphics/pokemon/deerling/summer/shiny.pal
rename to graphics/pokemon/gen_5/deerling/summer/shiny.pal
diff --git a/graphics/pokemon/deerling/winter/icon.png b/graphics/pokemon/gen_5/deerling/winter/icon.png
similarity index 100%
rename from graphics/pokemon/deerling/winter/icon.png
rename to graphics/pokemon/gen_5/deerling/winter/icon.png
diff --git a/graphics/pokemon/deerling/winter/normal.pal b/graphics/pokemon/gen_5/deerling/winter/normal.pal
similarity index 100%
rename from graphics/pokemon/deerling/winter/normal.pal
rename to graphics/pokemon/gen_5/deerling/winter/normal.pal
diff --git a/graphics/pokemon/deerling/winter/shiny.pal b/graphics/pokemon/gen_5/deerling/winter/shiny.pal
similarity index 100%
rename from graphics/pokemon/deerling/winter/shiny.pal
rename to graphics/pokemon/gen_5/deerling/winter/shiny.pal
diff --git a/graphics/pokemon/deino/anim_front.png b/graphics/pokemon/gen_5/deino/anim_front.png
similarity index 100%
rename from graphics/pokemon/deino/anim_front.png
rename to graphics/pokemon/gen_5/deino/anim_front.png
diff --git a/graphics/pokemon/deino/back.png b/graphics/pokemon/gen_5/deino/back.png
similarity index 100%
rename from graphics/pokemon/deino/back.png
rename to graphics/pokemon/gen_5/deino/back.png
diff --git a/graphics/pokemon/deino/footprint.png b/graphics/pokemon/gen_5/deino/footprint.png
similarity index 100%
rename from graphics/pokemon/deino/footprint.png
rename to graphics/pokemon/gen_5/deino/footprint.png
diff --git a/graphics/pokemon/deino/icon.png b/graphics/pokemon/gen_5/deino/icon.png
similarity index 100%
rename from graphics/pokemon/deino/icon.png
rename to graphics/pokemon/gen_5/deino/icon.png
diff --git a/graphics/pokemon/deino/normal.pal b/graphics/pokemon/gen_5/deino/normal.pal
similarity index 100%
rename from graphics/pokemon/deino/normal.pal
rename to graphics/pokemon/gen_5/deino/normal.pal
diff --git a/graphics/pokemon/deino/shiny.pal b/graphics/pokemon/gen_5/deino/shiny.pal
similarity index 100%
rename from graphics/pokemon/deino/shiny.pal
rename to graphics/pokemon/gen_5/deino/shiny.pal
diff --git a/graphics/pokemon/dewott/anim_front.png b/graphics/pokemon/gen_5/dewott/anim_front.png
similarity index 100%
rename from graphics/pokemon/dewott/anim_front.png
rename to graphics/pokemon/gen_5/dewott/anim_front.png
diff --git a/graphics/pokemon/dewott/back.png b/graphics/pokemon/gen_5/dewott/back.png
similarity index 100%
rename from graphics/pokemon/dewott/back.png
rename to graphics/pokemon/gen_5/dewott/back.png
diff --git a/graphics/pokemon/dewott/footprint.png b/graphics/pokemon/gen_5/dewott/footprint.png
similarity index 100%
rename from graphics/pokemon/dewott/footprint.png
rename to graphics/pokemon/gen_5/dewott/footprint.png
diff --git a/graphics/pokemon/dewott/icon.png b/graphics/pokemon/gen_5/dewott/icon.png
similarity index 100%
rename from graphics/pokemon/dewott/icon.png
rename to graphics/pokemon/gen_5/dewott/icon.png
diff --git a/graphics/pokemon/dewott/normal.pal b/graphics/pokemon/gen_5/dewott/normal.pal
similarity index 100%
rename from graphics/pokemon/dewott/normal.pal
rename to graphics/pokemon/gen_5/dewott/normal.pal
diff --git a/graphics/pokemon/dewott/shiny.pal b/graphics/pokemon/gen_5/dewott/shiny.pal
similarity index 100%
rename from graphics/pokemon/dewott/shiny.pal
rename to graphics/pokemon/gen_5/dewott/shiny.pal
diff --git a/graphics/pokemon/drilbur/anim_front.png b/graphics/pokemon/gen_5/drilbur/anim_front.png
similarity index 100%
rename from graphics/pokemon/drilbur/anim_front.png
rename to graphics/pokemon/gen_5/drilbur/anim_front.png
diff --git a/graphics/pokemon/drilbur/back.png b/graphics/pokemon/gen_5/drilbur/back.png
similarity index 100%
rename from graphics/pokemon/drilbur/back.png
rename to graphics/pokemon/gen_5/drilbur/back.png
diff --git a/graphics/pokemon/drilbur/footprint.png b/graphics/pokemon/gen_5/drilbur/footprint.png
similarity index 100%
rename from graphics/pokemon/drilbur/footprint.png
rename to graphics/pokemon/gen_5/drilbur/footprint.png
diff --git a/graphics/pokemon/drilbur/icon.png b/graphics/pokemon/gen_5/drilbur/icon.png
similarity index 100%
rename from graphics/pokemon/drilbur/icon.png
rename to graphics/pokemon/gen_5/drilbur/icon.png
diff --git a/graphics/pokemon/drilbur/normal.pal b/graphics/pokemon/gen_5/drilbur/normal.pal
similarity index 100%
rename from graphics/pokemon/drilbur/normal.pal
rename to graphics/pokemon/gen_5/drilbur/normal.pal
diff --git a/graphics/pokemon/drilbur/shiny.pal b/graphics/pokemon/gen_5/drilbur/shiny.pal
similarity index 100%
rename from graphics/pokemon/drilbur/shiny.pal
rename to graphics/pokemon/gen_5/drilbur/shiny.pal
diff --git a/graphics/pokemon/druddigon/anim_front.png b/graphics/pokemon/gen_5/druddigon/anim_front.png
similarity index 100%
rename from graphics/pokemon/druddigon/anim_front.png
rename to graphics/pokemon/gen_5/druddigon/anim_front.png
diff --git a/graphics/pokemon/druddigon/back.png b/graphics/pokemon/gen_5/druddigon/back.png
similarity index 100%
rename from graphics/pokemon/druddigon/back.png
rename to graphics/pokemon/gen_5/druddigon/back.png
diff --git a/graphics/pokemon/druddigon/footprint.png b/graphics/pokemon/gen_5/druddigon/footprint.png
similarity index 100%
rename from graphics/pokemon/druddigon/footprint.png
rename to graphics/pokemon/gen_5/druddigon/footprint.png
diff --git a/graphics/pokemon/druddigon/icon.png b/graphics/pokemon/gen_5/druddigon/icon.png
similarity index 100%
rename from graphics/pokemon/druddigon/icon.png
rename to graphics/pokemon/gen_5/druddigon/icon.png
diff --git a/graphics/pokemon/druddigon/normal.pal b/graphics/pokemon/gen_5/druddigon/normal.pal
similarity index 100%
rename from graphics/pokemon/druddigon/normal.pal
rename to graphics/pokemon/gen_5/druddigon/normal.pal
diff --git a/graphics/pokemon/druddigon/shiny.pal b/graphics/pokemon/gen_5/druddigon/shiny.pal
similarity index 100%
rename from graphics/pokemon/druddigon/shiny.pal
rename to graphics/pokemon/gen_5/druddigon/shiny.pal
diff --git a/graphics/pokemon/ducklett/anim_front.png b/graphics/pokemon/gen_5/ducklett/anim_front.png
similarity index 100%
rename from graphics/pokemon/ducklett/anim_front.png
rename to graphics/pokemon/gen_5/ducklett/anim_front.png
diff --git a/graphics/pokemon/ducklett/back.png b/graphics/pokemon/gen_5/ducklett/back.png
similarity index 100%
rename from graphics/pokemon/ducklett/back.png
rename to graphics/pokemon/gen_5/ducklett/back.png
diff --git a/graphics/pokemon/ducklett/footprint.png b/graphics/pokemon/gen_5/ducklett/footprint.png
similarity index 100%
rename from graphics/pokemon/ducklett/footprint.png
rename to graphics/pokemon/gen_5/ducklett/footprint.png
diff --git a/graphics/pokemon/ducklett/icon.png b/graphics/pokemon/gen_5/ducklett/icon.png
similarity index 100%
rename from graphics/pokemon/ducklett/icon.png
rename to graphics/pokemon/gen_5/ducklett/icon.png
diff --git a/graphics/pokemon/ducklett/normal.pal b/graphics/pokemon/gen_5/ducklett/normal.pal
similarity index 100%
rename from graphics/pokemon/ducklett/normal.pal
rename to graphics/pokemon/gen_5/ducklett/normal.pal
diff --git a/graphics/pokemon/ducklett/shiny.pal b/graphics/pokemon/gen_5/ducklett/shiny.pal
similarity index 100%
rename from graphics/pokemon/ducklett/shiny.pal
rename to graphics/pokemon/gen_5/ducklett/shiny.pal
diff --git a/graphics/pokemon/duosion/anim_front.png b/graphics/pokemon/gen_5/duosion/anim_front.png
similarity index 100%
rename from graphics/pokemon/duosion/anim_front.png
rename to graphics/pokemon/gen_5/duosion/anim_front.png
diff --git a/graphics/pokemon/duosion/back.png b/graphics/pokemon/gen_5/duosion/back.png
similarity index 100%
rename from graphics/pokemon/duosion/back.png
rename to graphics/pokemon/gen_5/duosion/back.png
diff --git a/graphics/pokemon/manaphy/footprint.png b/graphics/pokemon/gen_5/duosion/footprint.png
similarity index 100%
rename from graphics/pokemon/manaphy/footprint.png
rename to graphics/pokemon/gen_5/duosion/footprint.png
diff --git a/graphics/pokemon/duosion/icon.png b/graphics/pokemon/gen_5/duosion/icon.png
similarity index 100%
rename from graphics/pokemon/duosion/icon.png
rename to graphics/pokemon/gen_5/duosion/icon.png
diff --git a/graphics/pokemon/duosion/normal.pal b/graphics/pokemon/gen_5/duosion/normal.pal
similarity index 100%
rename from graphics/pokemon/duosion/normal.pal
rename to graphics/pokemon/gen_5/duosion/normal.pal
diff --git a/graphics/pokemon/duosion/shiny.pal b/graphics/pokemon/gen_5/duosion/shiny.pal
similarity index 100%
rename from graphics/pokemon/duosion/shiny.pal
rename to graphics/pokemon/gen_5/duosion/shiny.pal
diff --git a/graphics/pokemon/durant/anim_front.png b/graphics/pokemon/gen_5/durant/anim_front.png
similarity index 100%
rename from graphics/pokemon/durant/anim_front.png
rename to graphics/pokemon/gen_5/durant/anim_front.png
diff --git a/graphics/pokemon/durant/back.png b/graphics/pokemon/gen_5/durant/back.png
similarity index 100%
rename from graphics/pokemon/durant/back.png
rename to graphics/pokemon/gen_5/durant/back.png
diff --git a/graphics/pokemon/leavanny/footprint.png b/graphics/pokemon/gen_5/durant/footprint.png
similarity index 100%
rename from graphics/pokemon/leavanny/footprint.png
rename to graphics/pokemon/gen_5/durant/footprint.png
diff --git a/graphics/pokemon/durant/icon.png b/graphics/pokemon/gen_5/durant/icon.png
similarity index 100%
rename from graphics/pokemon/durant/icon.png
rename to graphics/pokemon/gen_5/durant/icon.png
diff --git a/graphics/pokemon/durant/normal.pal b/graphics/pokemon/gen_5/durant/normal.pal
similarity index 100%
rename from graphics/pokemon/durant/normal.pal
rename to graphics/pokemon/gen_5/durant/normal.pal
diff --git a/graphics/pokemon/durant/shiny.pal b/graphics/pokemon/gen_5/durant/shiny.pal
similarity index 100%
rename from graphics/pokemon/durant/shiny.pal
rename to graphics/pokemon/gen_5/durant/shiny.pal
diff --git a/graphics/pokemon/dwebble/anim_front.png b/graphics/pokemon/gen_5/dwebble/anim_front.png
similarity index 100%
rename from graphics/pokemon/dwebble/anim_front.png
rename to graphics/pokemon/gen_5/dwebble/anim_front.png
diff --git a/graphics/pokemon/dwebble/back.png b/graphics/pokemon/gen_5/dwebble/back.png
similarity index 100%
rename from graphics/pokemon/dwebble/back.png
rename to graphics/pokemon/gen_5/dwebble/back.png
diff --git a/graphics/pokemon/meowstic/footprint.png b/graphics/pokemon/gen_5/dwebble/footprint.png
similarity index 100%
rename from graphics/pokemon/meowstic/footprint.png
rename to graphics/pokemon/gen_5/dwebble/footprint.png
diff --git a/graphics/pokemon/dwebble/icon.png b/graphics/pokemon/gen_5/dwebble/icon.png
similarity index 100%
rename from graphics/pokemon/dwebble/icon.png
rename to graphics/pokemon/gen_5/dwebble/icon.png
diff --git a/graphics/pokemon/dwebble/normal.pal b/graphics/pokemon/gen_5/dwebble/normal.pal
similarity index 100%
rename from graphics/pokemon/dwebble/normal.pal
rename to graphics/pokemon/gen_5/dwebble/normal.pal
diff --git a/graphics/pokemon/dwebble/shiny.pal b/graphics/pokemon/gen_5/dwebble/shiny.pal
similarity index 100%
rename from graphics/pokemon/dwebble/shiny.pal
rename to graphics/pokemon/gen_5/dwebble/shiny.pal
diff --git a/graphics/pokemon/eelektrik/anim_front.png b/graphics/pokemon/gen_5/eelektrik/anim_front.png
similarity index 100%
rename from graphics/pokemon/eelektrik/anim_front.png
rename to graphics/pokemon/gen_5/eelektrik/anim_front.png
diff --git a/graphics/pokemon/eelektrik/back.png b/graphics/pokemon/gen_5/eelektrik/back.png
similarity index 100%
rename from graphics/pokemon/eelektrik/back.png
rename to graphics/pokemon/gen_5/eelektrik/back.png
diff --git a/graphics/pokemon/mantine/footprint.png b/graphics/pokemon/gen_5/eelektrik/footprint.png
similarity index 100%
rename from graphics/pokemon/mantine/footprint.png
rename to graphics/pokemon/gen_5/eelektrik/footprint.png
diff --git a/graphics/pokemon/eelektrik/icon.png b/graphics/pokemon/gen_5/eelektrik/icon.png
similarity index 100%
rename from graphics/pokemon/eelektrik/icon.png
rename to graphics/pokemon/gen_5/eelektrik/icon.png
diff --git a/graphics/pokemon/eelektrik/normal.pal b/graphics/pokemon/gen_5/eelektrik/normal.pal
similarity index 100%
rename from graphics/pokemon/eelektrik/normal.pal
rename to graphics/pokemon/gen_5/eelektrik/normal.pal
diff --git a/graphics/pokemon/eelektrik/shiny.pal b/graphics/pokemon/gen_5/eelektrik/shiny.pal
similarity index 100%
rename from graphics/pokemon/eelektrik/shiny.pal
rename to graphics/pokemon/gen_5/eelektrik/shiny.pal
diff --git a/graphics/pokemon/eelektross/anim_front.png b/graphics/pokemon/gen_5/eelektross/anim_front.png
similarity index 100%
rename from graphics/pokemon/eelektross/anim_front.png
rename to graphics/pokemon/gen_5/eelektross/anim_front.png
diff --git a/graphics/pokemon/eelektross/back.png b/graphics/pokemon/gen_5/eelektross/back.png
similarity index 100%
rename from graphics/pokemon/eelektross/back.png
rename to graphics/pokemon/gen_5/eelektross/back.png
diff --git a/graphics/pokemon/mantyke/footprint.png b/graphics/pokemon/gen_5/eelektross/footprint.png
similarity index 100%
rename from graphics/pokemon/mantyke/footprint.png
rename to graphics/pokemon/gen_5/eelektross/footprint.png
diff --git a/graphics/pokemon/eelektross/icon.png b/graphics/pokemon/gen_5/eelektross/icon.png
similarity index 100%
rename from graphics/pokemon/eelektross/icon.png
rename to graphics/pokemon/gen_5/eelektross/icon.png
diff --git a/graphics/pokemon/eelektross/normal.pal b/graphics/pokemon/gen_5/eelektross/normal.pal
similarity index 100%
rename from graphics/pokemon/eelektross/normal.pal
rename to graphics/pokemon/gen_5/eelektross/normal.pal
diff --git a/graphics/pokemon/eelektross/shiny.pal b/graphics/pokemon/gen_5/eelektross/shiny.pal
similarity index 100%
rename from graphics/pokemon/eelektross/shiny.pal
rename to graphics/pokemon/gen_5/eelektross/shiny.pal
diff --git a/graphics/pokemon/elgyem/anim_front.png b/graphics/pokemon/gen_5/elgyem/anim_front.png
similarity index 100%
rename from graphics/pokemon/elgyem/anim_front.png
rename to graphics/pokemon/gen_5/elgyem/anim_front.png
diff --git a/graphics/pokemon/elgyem/back.png b/graphics/pokemon/gen_5/elgyem/back.png
similarity index 100%
rename from graphics/pokemon/elgyem/back.png
rename to graphics/pokemon/gen_5/elgyem/back.png
diff --git a/graphics/pokemon/bunnelby/footprint.png b/graphics/pokemon/gen_5/elgyem/footprint.png
similarity index 100%
rename from graphics/pokemon/bunnelby/footprint.png
rename to graphics/pokemon/gen_5/elgyem/footprint.png
diff --git a/graphics/pokemon/elgyem/icon.png b/graphics/pokemon/gen_5/elgyem/icon.png
similarity index 100%
rename from graphics/pokemon/elgyem/icon.png
rename to graphics/pokemon/gen_5/elgyem/icon.png
diff --git a/graphics/pokemon/elgyem/normal.pal b/graphics/pokemon/gen_5/elgyem/normal.pal
similarity index 100%
rename from graphics/pokemon/elgyem/normal.pal
rename to graphics/pokemon/gen_5/elgyem/normal.pal
diff --git a/graphics/pokemon/elgyem/shiny.pal b/graphics/pokemon/gen_5/elgyem/shiny.pal
similarity index 100%
rename from graphics/pokemon/elgyem/shiny.pal
rename to graphics/pokemon/gen_5/elgyem/shiny.pal
diff --git a/graphics/pokemon/emboar/anim_front.png b/graphics/pokemon/gen_5/emboar/anim_front.png
similarity index 100%
rename from graphics/pokemon/emboar/anim_front.png
rename to graphics/pokemon/gen_5/emboar/anim_front.png
diff --git a/graphics/pokemon/emboar/back.png b/graphics/pokemon/gen_5/emboar/back.png
similarity index 100%
rename from graphics/pokemon/emboar/back.png
rename to graphics/pokemon/gen_5/emboar/back.png
diff --git a/graphics/pokemon/emboar/footprint.png b/graphics/pokemon/gen_5/emboar/footprint.png
similarity index 100%
rename from graphics/pokemon/emboar/footprint.png
rename to graphics/pokemon/gen_5/emboar/footprint.png
diff --git a/graphics/pokemon/emboar/icon.png b/graphics/pokemon/gen_5/emboar/icon.png
similarity index 100%
rename from graphics/pokemon/emboar/icon.png
rename to graphics/pokemon/gen_5/emboar/icon.png
diff --git a/graphics/pokemon/emboar/normal.pal b/graphics/pokemon/gen_5/emboar/normal.pal
similarity index 100%
rename from graphics/pokemon/emboar/normal.pal
rename to graphics/pokemon/gen_5/emboar/normal.pal
diff --git a/graphics/pokemon/emboar/shiny.pal b/graphics/pokemon/gen_5/emboar/shiny.pal
similarity index 100%
rename from graphics/pokemon/emboar/shiny.pal
rename to graphics/pokemon/gen_5/emboar/shiny.pal
diff --git a/graphics/pokemon/emolga/anim_front.png b/graphics/pokemon/gen_5/emolga/anim_front.png
similarity index 100%
rename from graphics/pokemon/emolga/anim_front.png
rename to graphics/pokemon/gen_5/emolga/anim_front.png
diff --git a/graphics/pokemon/emolga/back.png b/graphics/pokemon/gen_5/emolga/back.png
similarity index 100%
rename from graphics/pokemon/emolga/back.png
rename to graphics/pokemon/gen_5/emolga/back.png
diff --git a/graphics/pokemon/emolga/footprint.png b/graphics/pokemon/gen_5/emolga/footprint.png
similarity index 100%
rename from graphics/pokemon/emolga/footprint.png
rename to graphics/pokemon/gen_5/emolga/footprint.png
diff --git a/graphics/pokemon/emolga/icon.png b/graphics/pokemon/gen_5/emolga/icon.png
similarity index 100%
rename from graphics/pokemon/emolga/icon.png
rename to graphics/pokemon/gen_5/emolga/icon.png
diff --git a/graphics/pokemon/emolga/normal.pal b/graphics/pokemon/gen_5/emolga/normal.pal
similarity index 100%
rename from graphics/pokemon/emolga/normal.pal
rename to graphics/pokemon/gen_5/emolga/normal.pal
diff --git a/graphics/pokemon/emolga/shiny.pal b/graphics/pokemon/gen_5/emolga/shiny.pal
similarity index 100%
rename from graphics/pokemon/emolga/shiny.pal
rename to graphics/pokemon/gen_5/emolga/shiny.pal
diff --git a/graphics/pokemon/escavalier/anim_front.png b/graphics/pokemon/gen_5/escavalier/anim_front.png
similarity index 100%
rename from graphics/pokemon/escavalier/anim_front.png
rename to graphics/pokemon/gen_5/escavalier/anim_front.png
diff --git a/graphics/pokemon/escavalier/back.png b/graphics/pokemon/gen_5/escavalier/back.png
similarity index 100%
rename from graphics/pokemon/escavalier/back.png
rename to graphics/pokemon/gen_5/escavalier/back.png
diff --git a/graphics/pokemon/mareanie/footprint.png b/graphics/pokemon/gen_5/escavalier/footprint.png
similarity index 100%
rename from graphics/pokemon/mareanie/footprint.png
rename to graphics/pokemon/gen_5/escavalier/footprint.png
diff --git a/graphics/pokemon/escavalier/icon.png b/graphics/pokemon/gen_5/escavalier/icon.png
similarity index 100%
rename from graphics/pokemon/escavalier/icon.png
rename to graphics/pokemon/gen_5/escavalier/icon.png
diff --git a/graphics/pokemon/escavalier/normal.pal b/graphics/pokemon/gen_5/escavalier/normal.pal
similarity index 100%
rename from graphics/pokemon/escavalier/normal.pal
rename to graphics/pokemon/gen_5/escavalier/normal.pal
diff --git a/graphics/pokemon/escavalier/shiny.pal b/graphics/pokemon/gen_5/escavalier/shiny.pal
similarity index 100%
rename from graphics/pokemon/escavalier/shiny.pal
rename to graphics/pokemon/gen_5/escavalier/shiny.pal
diff --git a/graphics/pokemon/excadrill/anim_front.png b/graphics/pokemon/gen_5/excadrill/anim_front.png
similarity index 100%
rename from graphics/pokemon/excadrill/anim_front.png
rename to graphics/pokemon/gen_5/excadrill/anim_front.png
diff --git a/graphics/pokemon/excadrill/back.png b/graphics/pokemon/gen_5/excadrill/back.png
similarity index 100%
rename from graphics/pokemon/excadrill/back.png
rename to graphics/pokemon/gen_5/excadrill/back.png
diff --git a/graphics/pokemon/excadrill/footprint.png b/graphics/pokemon/gen_5/excadrill/footprint.png
similarity index 100%
rename from graphics/pokemon/excadrill/footprint.png
rename to graphics/pokemon/gen_5/excadrill/footprint.png
diff --git a/graphics/pokemon/excadrill/icon.png b/graphics/pokemon/gen_5/excadrill/icon.png
similarity index 100%
rename from graphics/pokemon/excadrill/icon.png
rename to graphics/pokemon/gen_5/excadrill/icon.png
diff --git a/graphics/pokemon/excadrill/normal.pal b/graphics/pokemon/gen_5/excadrill/normal.pal
similarity index 100%
rename from graphics/pokemon/excadrill/normal.pal
rename to graphics/pokemon/gen_5/excadrill/normal.pal
diff --git a/graphics/pokemon/excadrill/shiny.pal b/graphics/pokemon/gen_5/excadrill/shiny.pal
similarity index 100%
rename from graphics/pokemon/excadrill/shiny.pal
rename to graphics/pokemon/gen_5/excadrill/shiny.pal
diff --git a/graphics/pokemon/ferroseed/anim_front.png b/graphics/pokemon/gen_5/ferroseed/anim_front.png
similarity index 100%
rename from graphics/pokemon/ferroseed/anim_front.png
rename to graphics/pokemon/gen_5/ferroseed/anim_front.png
diff --git a/graphics/pokemon/ferroseed/back.png b/graphics/pokemon/gen_5/ferroseed/back.png
similarity index 100%
rename from graphics/pokemon/ferroseed/back.png
rename to graphics/pokemon/gen_5/ferroseed/back.png
diff --git a/graphics/pokemon/masquerain/footprint.png b/graphics/pokemon/gen_5/ferroseed/footprint.png
similarity index 100%
rename from graphics/pokemon/masquerain/footprint.png
rename to graphics/pokemon/gen_5/ferroseed/footprint.png
diff --git a/graphics/pokemon/ferroseed/icon.png b/graphics/pokemon/gen_5/ferroseed/icon.png
similarity index 100%
rename from graphics/pokemon/ferroseed/icon.png
rename to graphics/pokemon/gen_5/ferroseed/icon.png
diff --git a/graphics/pokemon/ferroseed/normal.pal b/graphics/pokemon/gen_5/ferroseed/normal.pal
similarity index 100%
rename from graphics/pokemon/ferroseed/normal.pal
rename to graphics/pokemon/gen_5/ferroseed/normal.pal
diff --git a/graphics/pokemon/ferroseed/shiny.pal b/graphics/pokemon/gen_5/ferroseed/shiny.pal
similarity index 100%
rename from graphics/pokemon/ferroseed/shiny.pal
rename to graphics/pokemon/gen_5/ferroseed/shiny.pal
diff --git a/graphics/pokemon/ferrothorn/anim_front.png b/graphics/pokemon/gen_5/ferrothorn/anim_front.png
similarity index 100%
rename from graphics/pokemon/ferrothorn/anim_front.png
rename to graphics/pokemon/gen_5/ferrothorn/anim_front.png
diff --git a/graphics/pokemon/ferrothorn/back.png b/graphics/pokemon/gen_5/ferrothorn/back.png
similarity index 100%
rename from graphics/pokemon/ferrothorn/back.png
rename to graphics/pokemon/gen_5/ferrothorn/back.png
diff --git a/graphics/pokemon/ferrothorn/footprint.png b/graphics/pokemon/gen_5/ferrothorn/footprint.png
similarity index 100%
rename from graphics/pokemon/ferrothorn/footprint.png
rename to graphics/pokemon/gen_5/ferrothorn/footprint.png
diff --git a/graphics/pokemon/ferrothorn/icon.png b/graphics/pokemon/gen_5/ferrothorn/icon.png
similarity index 100%
rename from graphics/pokemon/ferrothorn/icon.png
rename to graphics/pokemon/gen_5/ferrothorn/icon.png
diff --git a/graphics/pokemon/ferrothorn/normal.pal b/graphics/pokemon/gen_5/ferrothorn/normal.pal
similarity index 100%
rename from graphics/pokemon/ferrothorn/normal.pal
rename to graphics/pokemon/gen_5/ferrothorn/normal.pal
diff --git a/graphics/pokemon/ferrothorn/shiny.pal b/graphics/pokemon/gen_5/ferrothorn/shiny.pal
similarity index 100%
rename from graphics/pokemon/ferrothorn/shiny.pal
rename to graphics/pokemon/gen_5/ferrothorn/shiny.pal
diff --git a/graphics/pokemon/foongus/anim_front.png b/graphics/pokemon/gen_5/foongus/anim_front.png
similarity index 100%
rename from graphics/pokemon/foongus/anim_front.png
rename to graphics/pokemon/gen_5/foongus/anim_front.png
diff --git a/graphics/pokemon/foongus/back.png b/graphics/pokemon/gen_5/foongus/back.png
similarity index 100%
rename from graphics/pokemon/foongus/back.png
rename to graphics/pokemon/gen_5/foongus/back.png
diff --git a/graphics/pokemon/meltan/footprint.png b/graphics/pokemon/gen_5/foongus/footprint.png
similarity index 100%
rename from graphics/pokemon/meltan/footprint.png
rename to graphics/pokemon/gen_5/foongus/footprint.png
diff --git a/graphics/pokemon/foongus/icon.png b/graphics/pokemon/gen_5/foongus/icon.png
similarity index 100%
rename from graphics/pokemon/foongus/icon.png
rename to graphics/pokemon/gen_5/foongus/icon.png
diff --git a/graphics/pokemon/foongus/normal.pal b/graphics/pokemon/gen_5/foongus/normal.pal
similarity index 100%
rename from graphics/pokemon/foongus/normal.pal
rename to graphics/pokemon/gen_5/foongus/normal.pal
diff --git a/graphics/pokemon/foongus/shiny.pal b/graphics/pokemon/gen_5/foongus/shiny.pal
similarity index 100%
rename from graphics/pokemon/foongus/shiny.pal
rename to graphics/pokemon/gen_5/foongus/shiny.pal
diff --git a/graphics/pokemon/fraxure/anim_front.png b/graphics/pokemon/gen_5/fraxure/anim_front.png
similarity index 100%
rename from graphics/pokemon/fraxure/anim_front.png
rename to graphics/pokemon/gen_5/fraxure/anim_front.png
diff --git a/graphics/pokemon/fraxure/back.png b/graphics/pokemon/gen_5/fraxure/back.png
similarity index 100%
rename from graphics/pokemon/fraxure/back.png
rename to graphics/pokemon/gen_5/fraxure/back.png
diff --git a/graphics/pokemon/fraxure/footprint.png b/graphics/pokemon/gen_5/fraxure/footprint.png
similarity index 100%
rename from graphics/pokemon/fraxure/footprint.png
rename to graphics/pokemon/gen_5/fraxure/footprint.png
diff --git a/graphics/pokemon/fraxure/icon.png b/graphics/pokemon/gen_5/fraxure/icon.png
similarity index 100%
rename from graphics/pokemon/fraxure/icon.png
rename to graphics/pokemon/gen_5/fraxure/icon.png
diff --git a/graphics/pokemon/fraxure/normal.pal b/graphics/pokemon/gen_5/fraxure/normal.pal
similarity index 100%
rename from graphics/pokemon/fraxure/normal.pal
rename to graphics/pokemon/gen_5/fraxure/normal.pal
diff --git a/graphics/pokemon/fraxure/shiny.pal b/graphics/pokemon/gen_5/fraxure/shiny.pal
similarity index 100%
rename from graphics/pokemon/fraxure/shiny.pal
rename to graphics/pokemon/gen_5/fraxure/shiny.pal
diff --git a/graphics/pokemon/frillish/anim_front.png b/graphics/pokemon/gen_5/frillish/anim_front.png
similarity index 100%
rename from graphics/pokemon/frillish/anim_front.png
rename to graphics/pokemon/gen_5/frillish/anim_front.png
diff --git a/graphics/pokemon/frillish/anim_frontf.png b/graphics/pokemon/gen_5/frillish/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/frillish/anim_frontf.png
rename to graphics/pokemon/gen_5/frillish/anim_frontf.png
diff --git a/graphics/pokemon/frillish/back.png b/graphics/pokemon/gen_5/frillish/back.png
similarity index 100%
rename from graphics/pokemon/frillish/back.png
rename to graphics/pokemon/gen_5/frillish/back.png
diff --git a/graphics/pokemon/frillish/backf.png b/graphics/pokemon/gen_5/frillish/backf.png
similarity index 100%
rename from graphics/pokemon/frillish/backf.png
rename to graphics/pokemon/gen_5/frillish/backf.png
diff --git a/graphics/pokemon/metapod/footprint.png b/graphics/pokemon/gen_5/frillish/footprint.png
similarity index 100%
rename from graphics/pokemon/metapod/footprint.png
rename to graphics/pokemon/gen_5/frillish/footprint.png
diff --git a/graphics/pokemon/frillish/frontf.png b/graphics/pokemon/gen_5/frillish/frontf.png
similarity index 100%
rename from graphics/pokemon/frillish/frontf.png
rename to graphics/pokemon/gen_5/frillish/frontf.png
diff --git a/graphics/pokemon/frillish/icon.png b/graphics/pokemon/gen_5/frillish/icon.png
similarity index 100%
rename from graphics/pokemon/frillish/icon.png
rename to graphics/pokemon/gen_5/frillish/icon.png
diff --git a/graphics/pokemon/frillish/iconf.png b/graphics/pokemon/gen_5/frillish/iconf.png
similarity index 100%
rename from graphics/pokemon/frillish/iconf.png
rename to graphics/pokemon/gen_5/frillish/iconf.png
diff --git a/graphics/pokemon/frillish/normal.pal b/graphics/pokemon/gen_5/frillish/normal.pal
similarity index 100%
rename from graphics/pokemon/frillish/normal.pal
rename to graphics/pokemon/gen_5/frillish/normal.pal
diff --git a/graphics/pokemon/frillish/normalf.pal b/graphics/pokemon/gen_5/frillish/normalf.pal
similarity index 100%
rename from graphics/pokemon/frillish/normalf.pal
rename to graphics/pokemon/gen_5/frillish/normalf.pal
diff --git a/graphics/pokemon/frillish/shiny.pal b/graphics/pokemon/gen_5/frillish/shiny.pal
similarity index 100%
rename from graphics/pokemon/frillish/shiny.pal
rename to graphics/pokemon/gen_5/frillish/shiny.pal
diff --git a/graphics/pokemon/frillish/shinyf.pal b/graphics/pokemon/gen_5/frillish/shinyf.pal
similarity index 100%
rename from graphics/pokemon/frillish/shinyf.pal
rename to graphics/pokemon/gen_5/frillish/shinyf.pal
diff --git a/graphics/pokemon/galvantula/anim_front.png b/graphics/pokemon/gen_5/galvantula/anim_front.png
similarity index 100%
rename from graphics/pokemon/galvantula/anim_front.png
rename to graphics/pokemon/gen_5/galvantula/anim_front.png
diff --git a/graphics/pokemon/galvantula/back.png b/graphics/pokemon/gen_5/galvantula/back.png
similarity index 100%
rename from graphics/pokemon/galvantula/back.png
rename to graphics/pokemon/gen_5/galvantula/back.png
diff --git a/graphics/pokemon/galvantula/footprint.png b/graphics/pokemon/gen_5/galvantula/footprint.png
similarity index 100%
rename from graphics/pokemon/galvantula/footprint.png
rename to graphics/pokemon/gen_5/galvantula/footprint.png
diff --git a/graphics/pokemon/galvantula/icon.png b/graphics/pokemon/gen_5/galvantula/icon.png
similarity index 100%
rename from graphics/pokemon/galvantula/icon.png
rename to graphics/pokemon/gen_5/galvantula/icon.png
diff --git a/graphics/pokemon/galvantula/normal.pal b/graphics/pokemon/gen_5/galvantula/normal.pal
similarity index 100%
rename from graphics/pokemon/galvantula/normal.pal
rename to graphics/pokemon/gen_5/galvantula/normal.pal
diff --git a/graphics/pokemon/galvantula/shiny.pal b/graphics/pokemon/gen_5/galvantula/shiny.pal
similarity index 100%
rename from graphics/pokemon/galvantula/shiny.pal
rename to graphics/pokemon/gen_5/galvantula/shiny.pal
diff --git a/graphics/pokemon/garbodor/anim_front.png b/graphics/pokemon/gen_5/garbodor/anim_front.png
similarity index 100%
rename from graphics/pokemon/garbodor/anim_front.png
rename to graphics/pokemon/gen_5/garbodor/anim_front.png
diff --git a/graphics/pokemon/garbodor/back.png b/graphics/pokemon/gen_5/garbodor/back.png
similarity index 100%
rename from graphics/pokemon/garbodor/back.png
rename to graphics/pokemon/gen_5/garbodor/back.png
diff --git a/graphics/pokemon/garbodor/footprint.png b/graphics/pokemon/gen_5/garbodor/footprint.png
similarity index 100%
rename from graphics/pokemon/garbodor/footprint.png
rename to graphics/pokemon/gen_5/garbodor/footprint.png
diff --git a/graphics/pokemon/garbodor/gigantamax/back.png b/graphics/pokemon/gen_5/garbodor/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/garbodor/gigantamax/back.png
rename to graphics/pokemon/gen_5/garbodor/gigantamax/back.png
diff --git a/graphics/pokemon/garbodor/gigantamax/front.png b/graphics/pokemon/gen_5/garbodor/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/garbodor/gigantamax/front.png
rename to graphics/pokemon/gen_5/garbodor/gigantamax/front.png
diff --git a/graphics/pokemon/garbodor/gigantamax/icon.png b/graphics/pokemon/gen_5/garbodor/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/garbodor/gigantamax/icon.png
rename to graphics/pokemon/gen_5/garbodor/gigantamax/icon.png
diff --git a/graphics/pokemon/garbodor/gigantamax/normal.pal b/graphics/pokemon/gen_5/garbodor/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/garbodor/gigantamax/normal.pal
rename to graphics/pokemon/gen_5/garbodor/gigantamax/normal.pal
diff --git a/graphics/pokemon/garbodor/gigantamax/shiny.pal b/graphics/pokemon/gen_5/garbodor/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/garbodor/gigantamax/shiny.pal
rename to graphics/pokemon/gen_5/garbodor/gigantamax/shiny.pal
diff --git a/graphics/pokemon/garbodor/icon.png b/graphics/pokemon/gen_5/garbodor/icon.png
similarity index 100%
rename from graphics/pokemon/garbodor/icon.png
rename to graphics/pokemon/gen_5/garbodor/icon.png
diff --git a/graphics/pokemon/garbodor/normal.pal b/graphics/pokemon/gen_5/garbodor/normal.pal
similarity index 100%
rename from graphics/pokemon/garbodor/normal.pal
rename to graphics/pokemon/gen_5/garbodor/normal.pal
diff --git a/graphics/pokemon/garbodor/shiny.pal b/graphics/pokemon/gen_5/garbodor/shiny.pal
similarity index 100%
rename from graphics/pokemon/garbodor/shiny.pal
rename to graphics/pokemon/gen_5/garbodor/shiny.pal
diff --git a/graphics/pokemon/genesect/anim_front.png b/graphics/pokemon/gen_5/genesect/anim_front.png
similarity index 100%
rename from graphics/pokemon/genesect/anim_front.png
rename to graphics/pokemon/gen_5/genesect/anim_front.png
diff --git a/graphics/pokemon/genesect/back.png b/graphics/pokemon/gen_5/genesect/back.png
similarity index 100%
rename from graphics/pokemon/genesect/back.png
rename to graphics/pokemon/gen_5/genesect/back.png
diff --git a/graphics/pokemon/genesect/burn_drive/normal.pal b/graphics/pokemon/gen_5/genesect/burn_drive/normal.pal
similarity index 100%
rename from graphics/pokemon/genesect/burn_drive/normal.pal
rename to graphics/pokemon/gen_5/genesect/burn_drive/normal.pal
diff --git a/graphics/pokemon/genesect/burn_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/burn_drive/shiny.pal
similarity index 100%
rename from graphics/pokemon/genesect/burn_drive/shiny.pal
rename to graphics/pokemon/gen_5/genesect/burn_drive/shiny.pal
diff --git a/graphics/pokemon/genesect/chill_drive/normal.pal b/graphics/pokemon/gen_5/genesect/chill_drive/normal.pal
similarity index 100%
rename from graphics/pokemon/genesect/chill_drive/normal.pal
rename to graphics/pokemon/gen_5/genesect/chill_drive/normal.pal
diff --git a/graphics/pokemon/genesect/chill_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/chill_drive/shiny.pal
similarity index 100%
rename from graphics/pokemon/genesect/chill_drive/shiny.pal
rename to graphics/pokemon/gen_5/genesect/chill_drive/shiny.pal
diff --git a/graphics/pokemon/genesect/douse_drive/normal.pal b/graphics/pokemon/gen_5/genesect/douse_drive/normal.pal
similarity index 100%
rename from graphics/pokemon/genesect/douse_drive/normal.pal
rename to graphics/pokemon/gen_5/genesect/douse_drive/normal.pal
diff --git a/graphics/pokemon/genesect/douse_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/douse_drive/shiny.pal
similarity index 100%
rename from graphics/pokemon/genesect/douse_drive/shiny.pal
rename to graphics/pokemon/gen_5/genesect/douse_drive/shiny.pal
diff --git a/graphics/pokemon/genesect/footprint.png b/graphics/pokemon/gen_5/genesect/footprint.png
similarity index 100%
rename from graphics/pokemon/genesect/footprint.png
rename to graphics/pokemon/gen_5/genesect/footprint.png
diff --git a/graphics/pokemon/genesect/icon.png b/graphics/pokemon/gen_5/genesect/icon.png
similarity index 100%
rename from graphics/pokemon/genesect/icon.png
rename to graphics/pokemon/gen_5/genesect/icon.png
diff --git a/graphics/pokemon/genesect/normal.pal b/graphics/pokemon/gen_5/genesect/normal.pal
similarity index 100%
rename from graphics/pokemon/genesect/normal.pal
rename to graphics/pokemon/gen_5/genesect/normal.pal
diff --git a/graphics/pokemon/genesect/shiny.pal b/graphics/pokemon/gen_5/genesect/shiny.pal
similarity index 100%
rename from graphics/pokemon/genesect/shiny.pal
rename to graphics/pokemon/gen_5/genesect/shiny.pal
diff --git a/graphics/pokemon/genesect/shock_drive/normal.pal b/graphics/pokemon/gen_5/genesect/shock_drive/normal.pal
similarity index 100%
rename from graphics/pokemon/genesect/shock_drive/normal.pal
rename to graphics/pokemon/gen_5/genesect/shock_drive/normal.pal
diff --git a/graphics/pokemon/genesect/shock_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/shock_drive/shiny.pal
similarity index 100%
rename from graphics/pokemon/genesect/shock_drive/shiny.pal
rename to graphics/pokemon/gen_5/genesect/shock_drive/shiny.pal
diff --git a/graphics/pokemon/gigalith/anim_front.png b/graphics/pokemon/gen_5/gigalith/anim_front.png
similarity index 100%
rename from graphics/pokemon/gigalith/anim_front.png
rename to graphics/pokemon/gen_5/gigalith/anim_front.png
diff --git a/graphics/pokemon/gigalith/back.png b/graphics/pokemon/gen_5/gigalith/back.png
similarity index 100%
rename from graphics/pokemon/gigalith/back.png
rename to graphics/pokemon/gen_5/gigalith/back.png
diff --git a/graphics/pokemon/gigalith/footprint.png b/graphics/pokemon/gen_5/gigalith/footprint.png
similarity index 100%
rename from graphics/pokemon/gigalith/footprint.png
rename to graphics/pokemon/gen_5/gigalith/footprint.png
diff --git a/graphics/pokemon/gigalith/icon.png b/graphics/pokemon/gen_5/gigalith/icon.png
similarity index 100%
rename from graphics/pokemon/gigalith/icon.png
rename to graphics/pokemon/gen_5/gigalith/icon.png
diff --git a/graphics/pokemon/gigalith/normal.pal b/graphics/pokemon/gen_5/gigalith/normal.pal
similarity index 100%
rename from graphics/pokemon/gigalith/normal.pal
rename to graphics/pokemon/gen_5/gigalith/normal.pal
diff --git a/graphics/pokemon/gigalith/shiny.pal b/graphics/pokemon/gen_5/gigalith/shiny.pal
similarity index 100%
rename from graphics/pokemon/gigalith/shiny.pal
rename to graphics/pokemon/gen_5/gigalith/shiny.pal
diff --git a/graphics/pokemon/golett/anim_front.png b/graphics/pokemon/gen_5/golett/anim_front.png
similarity index 100%
rename from graphics/pokemon/golett/anim_front.png
rename to graphics/pokemon/gen_5/golett/anim_front.png
diff --git a/graphics/pokemon/golett/back.png b/graphics/pokemon/gen_5/golett/back.png
similarity index 100%
rename from graphics/pokemon/golett/back.png
rename to graphics/pokemon/gen_5/golett/back.png
diff --git a/graphics/pokemon/golett/footprint.png b/graphics/pokemon/gen_5/golett/footprint.png
similarity index 100%
rename from graphics/pokemon/golett/footprint.png
rename to graphics/pokemon/gen_5/golett/footprint.png
diff --git a/graphics/pokemon/golett/icon.png b/graphics/pokemon/gen_5/golett/icon.png
similarity index 100%
rename from graphics/pokemon/golett/icon.png
rename to graphics/pokemon/gen_5/golett/icon.png
diff --git a/graphics/pokemon/golett/normal.pal b/graphics/pokemon/gen_5/golett/normal.pal
similarity index 100%
rename from graphics/pokemon/golett/normal.pal
rename to graphics/pokemon/gen_5/golett/normal.pal
diff --git a/graphics/pokemon/golett/shiny.pal b/graphics/pokemon/gen_5/golett/shiny.pal
similarity index 100%
rename from graphics/pokemon/golett/shiny.pal
rename to graphics/pokemon/gen_5/golett/shiny.pal
diff --git a/graphics/pokemon/golurk/anim_front.png b/graphics/pokemon/gen_5/golurk/anim_front.png
similarity index 100%
rename from graphics/pokemon/golurk/anim_front.png
rename to graphics/pokemon/gen_5/golurk/anim_front.png
diff --git a/graphics/pokemon/golurk/back.png b/graphics/pokemon/gen_5/golurk/back.png
similarity index 100%
rename from graphics/pokemon/golurk/back.png
rename to graphics/pokemon/gen_5/golurk/back.png
diff --git a/graphics/pokemon/golurk/footprint.png b/graphics/pokemon/gen_5/golurk/footprint.png
similarity index 100%
rename from graphics/pokemon/golurk/footprint.png
rename to graphics/pokemon/gen_5/golurk/footprint.png
diff --git a/graphics/pokemon/golurk/icon.png b/graphics/pokemon/gen_5/golurk/icon.png
similarity index 100%
rename from graphics/pokemon/golurk/icon.png
rename to graphics/pokemon/gen_5/golurk/icon.png
diff --git a/graphics/pokemon/golurk/normal.pal b/graphics/pokemon/gen_5/golurk/normal.pal
similarity index 100%
rename from graphics/pokemon/golurk/normal.pal
rename to graphics/pokemon/gen_5/golurk/normal.pal
diff --git a/graphics/pokemon/golurk/shiny.pal b/graphics/pokemon/gen_5/golurk/shiny.pal
similarity index 100%
rename from graphics/pokemon/golurk/shiny.pal
rename to graphics/pokemon/gen_5/golurk/shiny.pal
diff --git a/graphics/pokemon/gothita/anim_front.png b/graphics/pokemon/gen_5/gothita/anim_front.png
similarity index 100%
rename from graphics/pokemon/gothita/anim_front.png
rename to graphics/pokemon/gen_5/gothita/anim_front.png
diff --git a/graphics/pokemon/gothita/back.png b/graphics/pokemon/gen_5/gothita/back.png
similarity index 100%
rename from graphics/pokemon/gothita/back.png
rename to graphics/pokemon/gen_5/gothita/back.png
diff --git a/graphics/pokemon/crabrawler/footprint.png b/graphics/pokemon/gen_5/gothita/footprint.png
similarity index 100%
rename from graphics/pokemon/crabrawler/footprint.png
rename to graphics/pokemon/gen_5/gothita/footprint.png
diff --git a/graphics/pokemon/gothita/icon.png b/graphics/pokemon/gen_5/gothita/icon.png
similarity index 100%
rename from graphics/pokemon/gothita/icon.png
rename to graphics/pokemon/gen_5/gothita/icon.png
diff --git a/graphics/pokemon/gothita/normal.pal b/graphics/pokemon/gen_5/gothita/normal.pal
similarity index 100%
rename from graphics/pokemon/gothita/normal.pal
rename to graphics/pokemon/gen_5/gothita/normal.pal
diff --git a/graphics/pokemon/gothita/shiny.pal b/graphics/pokemon/gen_5/gothita/shiny.pal
similarity index 100%
rename from graphics/pokemon/gothita/shiny.pal
rename to graphics/pokemon/gen_5/gothita/shiny.pal
diff --git a/graphics/pokemon/gothitelle/anim_front.png b/graphics/pokemon/gen_5/gothitelle/anim_front.png
similarity index 100%
rename from graphics/pokemon/gothitelle/anim_front.png
rename to graphics/pokemon/gen_5/gothitelle/anim_front.png
diff --git a/graphics/pokemon/gothitelle/back.png b/graphics/pokemon/gen_5/gothitelle/back.png
similarity index 100%
rename from graphics/pokemon/gothitelle/back.png
rename to graphics/pokemon/gen_5/gothitelle/back.png
diff --git a/graphics/pokemon/gothitelle/footprint.png b/graphics/pokemon/gen_5/gothitelle/footprint.png
similarity index 100%
rename from graphics/pokemon/gothitelle/footprint.png
rename to graphics/pokemon/gen_5/gothitelle/footprint.png
diff --git a/graphics/pokemon/gothitelle/icon.png b/graphics/pokemon/gen_5/gothitelle/icon.png
similarity index 100%
rename from graphics/pokemon/gothitelle/icon.png
rename to graphics/pokemon/gen_5/gothitelle/icon.png
diff --git a/graphics/pokemon/gothitelle/normal.pal b/graphics/pokemon/gen_5/gothitelle/normal.pal
similarity index 100%
rename from graphics/pokemon/gothitelle/normal.pal
rename to graphics/pokemon/gen_5/gothitelle/normal.pal
diff --git a/graphics/pokemon/gothitelle/shiny.pal b/graphics/pokemon/gen_5/gothitelle/shiny.pal
similarity index 100%
rename from graphics/pokemon/gothitelle/shiny.pal
rename to graphics/pokemon/gen_5/gothitelle/shiny.pal
diff --git a/graphics/pokemon/gothorita/anim_front.png b/graphics/pokemon/gen_5/gothorita/anim_front.png
similarity index 100%
rename from graphics/pokemon/gothorita/anim_front.png
rename to graphics/pokemon/gen_5/gothorita/anim_front.png
diff --git a/graphics/pokemon/gothorita/back.png b/graphics/pokemon/gen_5/gothorita/back.png
similarity index 100%
rename from graphics/pokemon/gothorita/back.png
rename to graphics/pokemon/gen_5/gothorita/back.png
diff --git a/graphics/pokemon/gothorita/footprint.png b/graphics/pokemon/gen_5/gothorita/footprint.png
similarity index 100%
rename from graphics/pokemon/gothorita/footprint.png
rename to graphics/pokemon/gen_5/gothorita/footprint.png
diff --git a/graphics/pokemon/gothorita/icon.png b/graphics/pokemon/gen_5/gothorita/icon.png
similarity index 100%
rename from graphics/pokemon/gothorita/icon.png
rename to graphics/pokemon/gen_5/gothorita/icon.png
diff --git a/graphics/pokemon/gothorita/normal.pal b/graphics/pokemon/gen_5/gothorita/normal.pal
similarity index 100%
rename from graphics/pokemon/gothorita/normal.pal
rename to graphics/pokemon/gen_5/gothorita/normal.pal
diff --git a/graphics/pokemon/gothorita/shiny.pal b/graphics/pokemon/gen_5/gothorita/shiny.pal
similarity index 100%
rename from graphics/pokemon/gothorita/shiny.pal
rename to graphics/pokemon/gen_5/gothorita/shiny.pal
diff --git a/graphics/pokemon/gurdurr/anim_front.png b/graphics/pokemon/gen_5/gurdurr/anim_front.png
similarity index 100%
rename from graphics/pokemon/gurdurr/anim_front.png
rename to graphics/pokemon/gen_5/gurdurr/anim_front.png
diff --git a/graphics/pokemon/gurdurr/back.png b/graphics/pokemon/gen_5/gurdurr/back.png
similarity index 100%
rename from graphics/pokemon/gurdurr/back.png
rename to graphics/pokemon/gen_5/gurdurr/back.png
diff --git a/graphics/pokemon/gurdurr/footprint.png b/graphics/pokemon/gen_5/gurdurr/footprint.png
similarity index 100%
rename from graphics/pokemon/gurdurr/footprint.png
rename to graphics/pokemon/gen_5/gurdurr/footprint.png
diff --git a/graphics/pokemon/gurdurr/icon.png b/graphics/pokemon/gen_5/gurdurr/icon.png
similarity index 100%
rename from graphics/pokemon/gurdurr/icon.png
rename to graphics/pokemon/gen_5/gurdurr/icon.png
diff --git a/graphics/pokemon/gurdurr/normal.pal b/graphics/pokemon/gen_5/gurdurr/normal.pal
similarity index 100%
rename from graphics/pokemon/gurdurr/normal.pal
rename to graphics/pokemon/gen_5/gurdurr/normal.pal
diff --git a/graphics/pokemon/gurdurr/shiny.pal b/graphics/pokemon/gen_5/gurdurr/shiny.pal
similarity index 100%
rename from graphics/pokemon/gurdurr/shiny.pal
rename to graphics/pokemon/gen_5/gurdurr/shiny.pal
diff --git a/graphics/pokemon/haxorus/anim_front.png b/graphics/pokemon/gen_5/haxorus/anim_front.png
similarity index 100%
rename from graphics/pokemon/haxorus/anim_front.png
rename to graphics/pokemon/gen_5/haxorus/anim_front.png
diff --git a/graphics/pokemon/haxorus/back.png b/graphics/pokemon/gen_5/haxorus/back.png
similarity index 100%
rename from graphics/pokemon/haxorus/back.png
rename to graphics/pokemon/gen_5/haxorus/back.png
diff --git a/graphics/pokemon/haxorus/footprint.png b/graphics/pokemon/gen_5/haxorus/footprint.png
similarity index 100%
rename from graphics/pokemon/haxorus/footprint.png
rename to graphics/pokemon/gen_5/haxorus/footprint.png
diff --git a/graphics/pokemon/haxorus/icon.png b/graphics/pokemon/gen_5/haxorus/icon.png
similarity index 100%
rename from graphics/pokemon/haxorus/icon.png
rename to graphics/pokemon/gen_5/haxorus/icon.png
diff --git a/graphics/pokemon/haxorus/normal.pal b/graphics/pokemon/gen_5/haxorus/normal.pal
similarity index 100%
rename from graphics/pokemon/haxorus/normal.pal
rename to graphics/pokemon/gen_5/haxorus/normal.pal
diff --git a/graphics/pokemon/haxorus/shiny.pal b/graphics/pokemon/gen_5/haxorus/shiny.pal
similarity index 100%
rename from graphics/pokemon/haxorus/shiny.pal
rename to graphics/pokemon/gen_5/haxorus/shiny.pal
diff --git a/graphics/pokemon/heatmor/anim_front.png b/graphics/pokemon/gen_5/heatmor/anim_front.png
similarity index 100%
rename from graphics/pokemon/heatmor/anim_front.png
rename to graphics/pokemon/gen_5/heatmor/anim_front.png
diff --git a/graphics/pokemon/heatmor/back.png b/graphics/pokemon/gen_5/heatmor/back.png
similarity index 100%
rename from graphics/pokemon/heatmor/back.png
rename to graphics/pokemon/gen_5/heatmor/back.png
diff --git a/graphics/pokemon/heatmor/footprint.png b/graphics/pokemon/gen_5/heatmor/footprint.png
similarity index 100%
rename from graphics/pokemon/heatmor/footprint.png
rename to graphics/pokemon/gen_5/heatmor/footprint.png
diff --git a/graphics/pokemon/heatmor/icon.png b/graphics/pokemon/gen_5/heatmor/icon.png
similarity index 100%
rename from graphics/pokemon/heatmor/icon.png
rename to graphics/pokemon/gen_5/heatmor/icon.png
diff --git a/graphics/pokemon/heatmor/normal.pal b/graphics/pokemon/gen_5/heatmor/normal.pal
similarity index 100%
rename from graphics/pokemon/heatmor/normal.pal
rename to graphics/pokemon/gen_5/heatmor/normal.pal
diff --git a/graphics/pokemon/heatmor/shiny.pal b/graphics/pokemon/gen_5/heatmor/shiny.pal
similarity index 100%
rename from graphics/pokemon/heatmor/shiny.pal
rename to graphics/pokemon/gen_5/heatmor/shiny.pal
diff --git a/graphics/pokemon/herdier/anim_front.png b/graphics/pokemon/gen_5/herdier/anim_front.png
similarity index 100%
rename from graphics/pokemon/herdier/anim_front.png
rename to graphics/pokemon/gen_5/herdier/anim_front.png
diff --git a/graphics/pokemon/herdier/back.png b/graphics/pokemon/gen_5/herdier/back.png
similarity index 100%
rename from graphics/pokemon/herdier/back.png
rename to graphics/pokemon/gen_5/herdier/back.png
diff --git a/graphics/pokemon/elgyem/footprint.png b/graphics/pokemon/gen_5/herdier/footprint.png
similarity index 100%
rename from graphics/pokemon/elgyem/footprint.png
rename to graphics/pokemon/gen_5/herdier/footprint.png
diff --git a/graphics/pokemon/herdier/icon.png b/graphics/pokemon/gen_5/herdier/icon.png
similarity index 100%
rename from graphics/pokemon/herdier/icon.png
rename to graphics/pokemon/gen_5/herdier/icon.png
diff --git a/graphics/pokemon/herdier/normal.pal b/graphics/pokemon/gen_5/herdier/normal.pal
similarity index 100%
rename from graphics/pokemon/herdier/normal.pal
rename to graphics/pokemon/gen_5/herdier/normal.pal
diff --git a/graphics/pokemon/herdier/shiny.pal b/graphics/pokemon/gen_5/herdier/shiny.pal
similarity index 100%
rename from graphics/pokemon/herdier/shiny.pal
rename to graphics/pokemon/gen_5/herdier/shiny.pal
diff --git a/graphics/pokemon/hydreigon/anim_front.png b/graphics/pokemon/gen_5/hydreigon/anim_front.png
similarity index 100%
rename from graphics/pokemon/hydreigon/anim_front.png
rename to graphics/pokemon/gen_5/hydreigon/anim_front.png
diff --git a/graphics/pokemon/hydreigon/back.png b/graphics/pokemon/gen_5/hydreigon/back.png
similarity index 100%
rename from graphics/pokemon/hydreigon/back.png
rename to graphics/pokemon/gen_5/hydreigon/back.png
diff --git a/graphics/pokemon/milcery/footprint.png b/graphics/pokemon/gen_5/hydreigon/footprint.png
similarity index 100%
rename from graphics/pokemon/milcery/footprint.png
rename to graphics/pokemon/gen_5/hydreigon/footprint.png
diff --git a/graphics/pokemon/hydreigon/icon.png b/graphics/pokemon/gen_5/hydreigon/icon.png
similarity index 100%
rename from graphics/pokemon/hydreigon/icon.png
rename to graphics/pokemon/gen_5/hydreigon/icon.png
diff --git a/graphics/pokemon/hydreigon/normal.pal b/graphics/pokemon/gen_5/hydreigon/normal.pal
similarity index 100%
rename from graphics/pokemon/hydreigon/normal.pal
rename to graphics/pokemon/gen_5/hydreigon/normal.pal
diff --git a/graphics/pokemon/hydreigon/shiny.pal b/graphics/pokemon/gen_5/hydreigon/shiny.pal
similarity index 100%
rename from graphics/pokemon/hydreigon/shiny.pal
rename to graphics/pokemon/gen_5/hydreigon/shiny.pal
diff --git a/graphics/pokemon/jellicent/anim_front.png b/graphics/pokemon/gen_5/jellicent/anim_front.png
similarity index 100%
rename from graphics/pokemon/jellicent/anim_front.png
rename to graphics/pokemon/gen_5/jellicent/anim_front.png
diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/gen_5/jellicent/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/jellicent/anim_frontf.png
rename to graphics/pokemon/gen_5/jellicent/anim_frontf.png
diff --git a/graphics/pokemon/jellicent/back.png b/graphics/pokemon/gen_5/jellicent/back.png
similarity index 100%
rename from graphics/pokemon/jellicent/back.png
rename to graphics/pokemon/gen_5/jellicent/back.png
diff --git a/graphics/pokemon/jellicent/backf.png b/graphics/pokemon/gen_5/jellicent/backf.png
similarity index 100%
rename from graphics/pokemon/jellicent/backf.png
rename to graphics/pokemon/gen_5/jellicent/backf.png
diff --git a/graphics/pokemon/milotic/footprint.png b/graphics/pokemon/gen_5/jellicent/footprint.png
similarity index 100%
rename from graphics/pokemon/milotic/footprint.png
rename to graphics/pokemon/gen_5/jellicent/footprint.png
diff --git a/graphics/pokemon/jellicent/frontf.png b/graphics/pokemon/gen_5/jellicent/frontf.png
similarity index 100%
rename from graphics/pokemon/jellicent/frontf.png
rename to graphics/pokemon/gen_5/jellicent/frontf.png
diff --git a/graphics/pokemon/jellicent/icon.png b/graphics/pokemon/gen_5/jellicent/icon.png
similarity index 100%
rename from graphics/pokemon/jellicent/icon.png
rename to graphics/pokemon/gen_5/jellicent/icon.png
diff --git a/graphics/pokemon/jellicent/iconf.png b/graphics/pokemon/gen_5/jellicent/iconf.png
similarity index 100%
rename from graphics/pokemon/jellicent/iconf.png
rename to graphics/pokemon/gen_5/jellicent/iconf.png
diff --git a/graphics/pokemon/jellicent/normal.pal b/graphics/pokemon/gen_5/jellicent/normal.pal
similarity index 100%
rename from graphics/pokemon/jellicent/normal.pal
rename to graphics/pokemon/gen_5/jellicent/normal.pal
diff --git a/graphics/pokemon/jellicent/normalf.pal b/graphics/pokemon/gen_5/jellicent/normalf.pal
similarity index 100%
rename from graphics/pokemon/jellicent/normalf.pal
rename to graphics/pokemon/gen_5/jellicent/normalf.pal
diff --git a/graphics/pokemon/jellicent/shiny.pal b/graphics/pokemon/gen_5/jellicent/shiny.pal
similarity index 100%
rename from graphics/pokemon/jellicent/shiny.pal
rename to graphics/pokemon/gen_5/jellicent/shiny.pal
diff --git a/graphics/pokemon/jellicent/shinyf.pal b/graphics/pokemon/gen_5/jellicent/shinyf.pal
similarity index 100%
rename from graphics/pokemon/jellicent/shinyf.pal
rename to graphics/pokemon/gen_5/jellicent/shinyf.pal
diff --git a/graphics/pokemon/joltik/anim_front.png b/graphics/pokemon/gen_5/joltik/anim_front.png
similarity index 100%
rename from graphics/pokemon/joltik/anim_front.png
rename to graphics/pokemon/gen_5/joltik/anim_front.png
diff --git a/graphics/pokemon/joltik/back.png b/graphics/pokemon/gen_5/joltik/back.png
similarity index 100%
rename from graphics/pokemon/joltik/back.png
rename to graphics/pokemon/gen_5/joltik/back.png
diff --git a/graphics/pokemon/crustle/footprint.png b/graphics/pokemon/gen_5/joltik/footprint.png
similarity index 100%
rename from graphics/pokemon/crustle/footprint.png
rename to graphics/pokemon/gen_5/joltik/footprint.png
diff --git a/graphics/pokemon/joltik/icon.png b/graphics/pokemon/gen_5/joltik/icon.png
similarity index 100%
rename from graphics/pokemon/joltik/icon.png
rename to graphics/pokemon/gen_5/joltik/icon.png
diff --git a/graphics/pokemon/joltik/normal.pal b/graphics/pokemon/gen_5/joltik/normal.pal
similarity index 100%
rename from graphics/pokemon/joltik/normal.pal
rename to graphics/pokemon/gen_5/joltik/normal.pal
diff --git a/graphics/pokemon/joltik/shiny.pal b/graphics/pokemon/gen_5/joltik/shiny.pal
similarity index 100%
rename from graphics/pokemon/joltik/shiny.pal
rename to graphics/pokemon/gen_5/joltik/shiny.pal
diff --git a/graphics/pokemon/karrablast/anim_front.png b/graphics/pokemon/gen_5/karrablast/anim_front.png
similarity index 100%
rename from graphics/pokemon/karrablast/anim_front.png
rename to graphics/pokemon/gen_5/karrablast/anim_front.png
diff --git a/graphics/pokemon/karrablast/back.png b/graphics/pokemon/gen_5/karrablast/back.png
similarity index 100%
rename from graphics/pokemon/karrablast/back.png
rename to graphics/pokemon/gen_5/karrablast/back.png
diff --git a/graphics/pokemon/roserade/footprint.png b/graphics/pokemon/gen_5/karrablast/footprint.png
similarity index 100%
rename from graphics/pokemon/roserade/footprint.png
rename to graphics/pokemon/gen_5/karrablast/footprint.png
diff --git a/graphics/pokemon/karrablast/icon.png b/graphics/pokemon/gen_5/karrablast/icon.png
similarity index 100%
rename from graphics/pokemon/karrablast/icon.png
rename to graphics/pokemon/gen_5/karrablast/icon.png
diff --git a/graphics/pokemon/karrablast/normal.pal b/graphics/pokemon/gen_5/karrablast/normal.pal
similarity index 100%
rename from graphics/pokemon/karrablast/normal.pal
rename to graphics/pokemon/gen_5/karrablast/normal.pal
diff --git a/graphics/pokemon/karrablast/shiny.pal b/graphics/pokemon/gen_5/karrablast/shiny.pal
similarity index 100%
rename from graphics/pokemon/karrablast/shiny.pal
rename to graphics/pokemon/gen_5/karrablast/shiny.pal
diff --git a/graphics/pokemon/keldeo/anim_front.png b/graphics/pokemon/gen_5/keldeo/anim_front.png
similarity index 100%
rename from graphics/pokemon/keldeo/anim_front.png
rename to graphics/pokemon/gen_5/keldeo/anim_front.png
diff --git a/graphics/pokemon/keldeo/back.png b/graphics/pokemon/gen_5/keldeo/back.png
similarity index 100%
rename from graphics/pokemon/keldeo/back.png
rename to graphics/pokemon/gen_5/keldeo/back.png
diff --git a/graphics/pokemon/keldeo/footprint.png b/graphics/pokemon/gen_5/keldeo/footprint.png
similarity index 100%
rename from graphics/pokemon/keldeo/footprint.png
rename to graphics/pokemon/gen_5/keldeo/footprint.png
diff --git a/graphics/pokemon/keldeo/icon.png b/graphics/pokemon/gen_5/keldeo/icon.png
similarity index 100%
rename from graphics/pokemon/keldeo/icon.png
rename to graphics/pokemon/gen_5/keldeo/icon.png
diff --git a/graphics/pokemon/keldeo/normal.pal b/graphics/pokemon/gen_5/keldeo/normal.pal
similarity index 100%
rename from graphics/pokemon/keldeo/normal.pal
rename to graphics/pokemon/gen_5/keldeo/normal.pal
diff --git a/graphics/pokemon/keldeo/resolute/back.png b/graphics/pokemon/gen_5/keldeo/resolute/back.png
similarity index 100%
rename from graphics/pokemon/keldeo/resolute/back.png
rename to graphics/pokemon/gen_5/keldeo/resolute/back.png
diff --git a/graphics/pokemon/keldeo/resolute/front.png b/graphics/pokemon/gen_5/keldeo/resolute/front.png
similarity index 100%
rename from graphics/pokemon/keldeo/resolute/front.png
rename to graphics/pokemon/gen_5/keldeo/resolute/front.png
diff --git a/graphics/pokemon/keldeo/resolute/icon.png b/graphics/pokemon/gen_5/keldeo/resolute/icon.png
similarity index 100%
rename from graphics/pokemon/keldeo/resolute/icon.png
rename to graphics/pokemon/gen_5/keldeo/resolute/icon.png
diff --git a/graphics/pokemon/keldeo/resolute/normal.pal b/graphics/pokemon/gen_5/keldeo/resolute/normal.pal
similarity index 100%
rename from graphics/pokemon/keldeo/resolute/normal.pal
rename to graphics/pokemon/gen_5/keldeo/resolute/normal.pal
diff --git a/graphics/pokemon/keldeo/resolute/shiny.pal b/graphics/pokemon/gen_5/keldeo/resolute/shiny.pal
similarity index 100%
rename from graphics/pokemon/keldeo/resolute/shiny.pal
rename to graphics/pokemon/gen_5/keldeo/resolute/shiny.pal
diff --git a/graphics/pokemon/keldeo/shiny.pal b/graphics/pokemon/gen_5/keldeo/shiny.pal
similarity index 100%
rename from graphics/pokemon/keldeo/shiny.pal
rename to graphics/pokemon/gen_5/keldeo/shiny.pal
diff --git a/graphics/pokemon/klang/anim_front.png b/graphics/pokemon/gen_5/klang/anim_front.png
similarity index 100%
rename from graphics/pokemon/klang/anim_front.png
rename to graphics/pokemon/gen_5/klang/anim_front.png
diff --git a/graphics/pokemon/klang/back.png b/graphics/pokemon/gen_5/klang/back.png
similarity index 100%
rename from graphics/pokemon/klang/back.png
rename to graphics/pokemon/gen_5/klang/back.png
diff --git a/graphics/pokemon/mimikyu/footprint.png b/graphics/pokemon/gen_5/klang/footprint.png
similarity index 100%
rename from graphics/pokemon/mimikyu/footprint.png
rename to graphics/pokemon/gen_5/klang/footprint.png
diff --git a/graphics/pokemon/klang/icon.png b/graphics/pokemon/gen_5/klang/icon.png
similarity index 100%
rename from graphics/pokemon/klang/icon.png
rename to graphics/pokemon/gen_5/klang/icon.png
diff --git a/graphics/pokemon/klang/normal.pal b/graphics/pokemon/gen_5/klang/normal.pal
similarity index 100%
rename from graphics/pokemon/klang/normal.pal
rename to graphics/pokemon/gen_5/klang/normal.pal
diff --git a/graphics/pokemon/klang/shiny.pal b/graphics/pokemon/gen_5/klang/shiny.pal
similarity index 100%
rename from graphics/pokemon/klang/shiny.pal
rename to graphics/pokemon/gen_5/klang/shiny.pal
diff --git a/graphics/pokemon/klink/anim_front.png b/graphics/pokemon/gen_5/klink/anim_front.png
similarity index 100%
rename from graphics/pokemon/klink/anim_front.png
rename to graphics/pokemon/gen_5/klink/anim_front.png
diff --git a/graphics/pokemon/klink/back.png b/graphics/pokemon/gen_5/klink/back.png
similarity index 100%
rename from graphics/pokemon/klink/back.png
rename to graphics/pokemon/gen_5/klink/back.png
diff --git a/graphics/pokemon/minior/footprint.png b/graphics/pokemon/gen_5/klink/footprint.png
similarity index 100%
rename from graphics/pokemon/minior/footprint.png
rename to graphics/pokemon/gen_5/klink/footprint.png
diff --git a/graphics/pokemon/klink/icon.png b/graphics/pokemon/gen_5/klink/icon.png
similarity index 100%
rename from graphics/pokemon/klink/icon.png
rename to graphics/pokemon/gen_5/klink/icon.png
diff --git a/graphics/pokemon/klink/normal.pal b/graphics/pokemon/gen_5/klink/normal.pal
similarity index 100%
rename from graphics/pokemon/klink/normal.pal
rename to graphics/pokemon/gen_5/klink/normal.pal
diff --git a/graphics/pokemon/klink/shiny.pal b/graphics/pokemon/gen_5/klink/shiny.pal
similarity index 100%
rename from graphics/pokemon/klink/shiny.pal
rename to graphics/pokemon/gen_5/klink/shiny.pal
diff --git a/graphics/pokemon/klinklang/anim_front.png b/graphics/pokemon/gen_5/klinklang/anim_front.png
similarity index 100%
rename from graphics/pokemon/klinklang/anim_front.png
rename to graphics/pokemon/gen_5/klinklang/anim_front.png
diff --git a/graphics/pokemon/klinklang/back.png b/graphics/pokemon/gen_5/klinklang/back.png
similarity index 100%
rename from graphics/pokemon/klinklang/back.png
rename to graphics/pokemon/gen_5/klinklang/back.png
diff --git a/graphics/pokemon/misdreavus/footprint.png b/graphics/pokemon/gen_5/klinklang/footprint.png
similarity index 100%
rename from graphics/pokemon/misdreavus/footprint.png
rename to graphics/pokemon/gen_5/klinklang/footprint.png
diff --git a/graphics/pokemon/klinklang/icon.png b/graphics/pokemon/gen_5/klinklang/icon.png
similarity index 100%
rename from graphics/pokemon/klinklang/icon.png
rename to graphics/pokemon/gen_5/klinklang/icon.png
diff --git a/graphics/pokemon/klinklang/normal.pal b/graphics/pokemon/gen_5/klinklang/normal.pal
similarity index 100%
rename from graphics/pokemon/klinklang/normal.pal
rename to graphics/pokemon/gen_5/klinklang/normal.pal
diff --git a/graphics/pokemon/klinklang/shiny.pal b/graphics/pokemon/gen_5/klinklang/shiny.pal
similarity index 100%
rename from graphics/pokemon/klinklang/shiny.pal
rename to graphics/pokemon/gen_5/klinklang/shiny.pal
diff --git a/graphics/pokemon/krokorok/anim_front.png b/graphics/pokemon/gen_5/krokorok/anim_front.png
similarity index 100%
rename from graphics/pokemon/krokorok/anim_front.png
rename to graphics/pokemon/gen_5/krokorok/anim_front.png
diff --git a/graphics/pokemon/krokorok/back.png b/graphics/pokemon/gen_5/krokorok/back.png
similarity index 100%
rename from graphics/pokemon/krokorok/back.png
rename to graphics/pokemon/gen_5/krokorok/back.png
diff --git a/graphics/pokemon/krokorok/footprint.png b/graphics/pokemon/gen_5/krokorok/footprint.png
similarity index 100%
rename from graphics/pokemon/krokorok/footprint.png
rename to graphics/pokemon/gen_5/krokorok/footprint.png
diff --git a/graphics/pokemon/krokorok/icon.png b/graphics/pokemon/gen_5/krokorok/icon.png
similarity index 100%
rename from graphics/pokemon/krokorok/icon.png
rename to graphics/pokemon/gen_5/krokorok/icon.png
diff --git a/graphics/pokemon/krokorok/normal.pal b/graphics/pokemon/gen_5/krokorok/normal.pal
similarity index 100%
rename from graphics/pokemon/krokorok/normal.pal
rename to graphics/pokemon/gen_5/krokorok/normal.pal
diff --git a/graphics/pokemon/krokorok/shiny.pal b/graphics/pokemon/gen_5/krokorok/shiny.pal
similarity index 100%
rename from graphics/pokemon/krokorok/shiny.pal
rename to graphics/pokemon/gen_5/krokorok/shiny.pal
diff --git a/graphics/pokemon/krookodile/anim_front.png b/graphics/pokemon/gen_5/krookodile/anim_front.png
similarity index 100%
rename from graphics/pokemon/krookodile/anim_front.png
rename to graphics/pokemon/gen_5/krookodile/anim_front.png
diff --git a/graphics/pokemon/krookodile/back.png b/graphics/pokemon/gen_5/krookodile/back.png
similarity index 100%
rename from graphics/pokemon/krookodile/back.png
rename to graphics/pokemon/gen_5/krookodile/back.png
diff --git a/graphics/pokemon/krookodile/footprint.png b/graphics/pokemon/gen_5/krookodile/footprint.png
similarity index 100%
rename from graphics/pokemon/krookodile/footprint.png
rename to graphics/pokemon/gen_5/krookodile/footprint.png
diff --git a/graphics/pokemon/krookodile/icon.png b/graphics/pokemon/gen_5/krookodile/icon.png
similarity index 100%
rename from graphics/pokemon/krookodile/icon.png
rename to graphics/pokemon/gen_5/krookodile/icon.png
diff --git a/graphics/pokemon/krookodile/normal.pal b/graphics/pokemon/gen_5/krookodile/normal.pal
similarity index 100%
rename from graphics/pokemon/krookodile/normal.pal
rename to graphics/pokemon/gen_5/krookodile/normal.pal
diff --git a/graphics/pokemon/krookodile/shiny.pal b/graphics/pokemon/gen_5/krookodile/shiny.pal
similarity index 100%
rename from graphics/pokemon/krookodile/shiny.pal
rename to graphics/pokemon/gen_5/krookodile/shiny.pal
diff --git a/graphics/pokemon/kyurem/anim_front.png b/graphics/pokemon/gen_5/kyurem/anim_front.png
similarity index 100%
rename from graphics/pokemon/kyurem/anim_front.png
rename to graphics/pokemon/gen_5/kyurem/anim_front.png
diff --git a/graphics/pokemon/kyurem/back.png b/graphics/pokemon/gen_5/kyurem/back.png
similarity index 100%
rename from graphics/pokemon/kyurem/back.png
rename to graphics/pokemon/gen_5/kyurem/back.png
diff --git a/graphics/pokemon/kyurem/black/anim_front.png b/graphics/pokemon/gen_5/kyurem/black/anim_front.png
similarity index 100%
rename from graphics/pokemon/kyurem/black/anim_front.png
rename to graphics/pokemon/gen_5/kyurem/black/anim_front.png
diff --git a/graphics/pokemon/kyurem/black/back.png b/graphics/pokemon/gen_5/kyurem/black/back.png
similarity index 100%
rename from graphics/pokemon/kyurem/black/back.png
rename to graphics/pokemon/gen_5/kyurem/black/back.png
diff --git a/graphics/pokemon/kyurem/black/icon.png b/graphics/pokemon/gen_5/kyurem/black/icon.png
similarity index 100%
rename from graphics/pokemon/kyurem/black/icon.png
rename to graphics/pokemon/gen_5/kyurem/black/icon.png
diff --git a/graphics/pokemon/kyurem/black/normal.pal b/graphics/pokemon/gen_5/kyurem/black/normal.pal
similarity index 100%
rename from graphics/pokemon/kyurem/black/normal.pal
rename to graphics/pokemon/gen_5/kyurem/black/normal.pal
diff --git a/graphics/pokemon/kyurem/black/shiny.pal b/graphics/pokemon/gen_5/kyurem/black/shiny.pal
similarity index 100%
rename from graphics/pokemon/kyurem/black/shiny.pal
rename to graphics/pokemon/gen_5/kyurem/black/shiny.pal
diff --git a/graphics/pokemon/kyurem/footprint.png b/graphics/pokemon/gen_5/kyurem/footprint.png
similarity index 100%
rename from graphics/pokemon/kyurem/footprint.png
rename to graphics/pokemon/gen_5/kyurem/footprint.png
diff --git a/graphics/pokemon/kyurem/icon.png b/graphics/pokemon/gen_5/kyurem/icon.png
similarity index 100%
rename from graphics/pokemon/kyurem/icon.png
rename to graphics/pokemon/gen_5/kyurem/icon.png
diff --git a/graphics/pokemon/kyurem/normal.pal b/graphics/pokemon/gen_5/kyurem/normal.pal
similarity index 100%
rename from graphics/pokemon/kyurem/normal.pal
rename to graphics/pokemon/gen_5/kyurem/normal.pal
diff --git a/graphics/pokemon/kyurem/shiny.pal b/graphics/pokemon/gen_5/kyurem/shiny.pal
similarity index 100%
rename from graphics/pokemon/kyurem/shiny.pal
rename to graphics/pokemon/gen_5/kyurem/shiny.pal
diff --git a/graphics/pokemon/kyurem/white/anim_front.png b/graphics/pokemon/gen_5/kyurem/white/anim_front.png
similarity index 100%
rename from graphics/pokemon/kyurem/white/anim_front.png
rename to graphics/pokemon/gen_5/kyurem/white/anim_front.png
diff --git a/graphics/pokemon/kyurem/white/back.png b/graphics/pokemon/gen_5/kyurem/white/back.png
similarity index 100%
rename from graphics/pokemon/kyurem/white/back.png
rename to graphics/pokemon/gen_5/kyurem/white/back.png
diff --git a/graphics/pokemon/kyurem/white/icon.png b/graphics/pokemon/gen_5/kyurem/white/icon.png
similarity index 100%
rename from graphics/pokemon/kyurem/white/icon.png
rename to graphics/pokemon/gen_5/kyurem/white/icon.png
diff --git a/graphics/pokemon/kyurem/white/normal.pal b/graphics/pokemon/gen_5/kyurem/white/normal.pal
similarity index 100%
rename from graphics/pokemon/kyurem/white/normal.pal
rename to graphics/pokemon/gen_5/kyurem/white/normal.pal
diff --git a/graphics/pokemon/kyurem/white/shiny.pal b/graphics/pokemon/gen_5/kyurem/white/shiny.pal
similarity index 100%
rename from graphics/pokemon/kyurem/white/shiny.pal
rename to graphics/pokemon/gen_5/kyurem/white/shiny.pal
diff --git a/graphics/pokemon/lampent/anim_front.png b/graphics/pokemon/gen_5/lampent/anim_front.png
similarity index 100%
rename from graphics/pokemon/lampent/anim_front.png
rename to graphics/pokemon/gen_5/lampent/anim_front.png
diff --git a/graphics/pokemon/lampent/back.png b/graphics/pokemon/gen_5/lampent/back.png
similarity index 100%
rename from graphics/pokemon/lampent/back.png
rename to graphics/pokemon/gen_5/lampent/back.png
diff --git a/graphics/pokemon/mismagius/footprint.png b/graphics/pokemon/gen_5/lampent/footprint.png
similarity index 100%
rename from graphics/pokemon/mismagius/footprint.png
rename to graphics/pokemon/gen_5/lampent/footprint.png
diff --git a/graphics/pokemon/lampent/icon.png b/graphics/pokemon/gen_5/lampent/icon.png
similarity index 100%
rename from graphics/pokemon/lampent/icon.png
rename to graphics/pokemon/gen_5/lampent/icon.png
diff --git a/graphics/pokemon/lampent/normal.pal b/graphics/pokemon/gen_5/lampent/normal.pal
similarity index 100%
rename from graphics/pokemon/lampent/normal.pal
rename to graphics/pokemon/gen_5/lampent/normal.pal
diff --git a/graphics/pokemon/lampent/shiny.pal b/graphics/pokemon/gen_5/lampent/shiny.pal
similarity index 100%
rename from graphics/pokemon/lampent/shiny.pal
rename to graphics/pokemon/gen_5/lampent/shiny.pal
diff --git a/graphics/pokemon/landorus/anim_front.png b/graphics/pokemon/gen_5/landorus/anim_front.png
similarity index 100%
rename from graphics/pokemon/landorus/anim_front.png
rename to graphics/pokemon/gen_5/landorus/anim_front.png
diff --git a/graphics/pokemon/landorus/back.png b/graphics/pokemon/gen_5/landorus/back.png
similarity index 100%
rename from graphics/pokemon/landorus/back.png
rename to graphics/pokemon/gen_5/landorus/back.png
diff --git a/graphics/pokemon/muk/footprint.png b/graphics/pokemon/gen_5/landorus/footprint.png
similarity index 100%
rename from graphics/pokemon/muk/footprint.png
rename to graphics/pokemon/gen_5/landorus/footprint.png
diff --git a/graphics/pokemon/landorus/icon.png b/graphics/pokemon/gen_5/landorus/icon.png
similarity index 100%
rename from graphics/pokemon/landorus/icon.png
rename to graphics/pokemon/gen_5/landorus/icon.png
diff --git a/graphics/pokemon/landorus/normal.pal b/graphics/pokemon/gen_5/landorus/normal.pal
similarity index 100%
rename from graphics/pokemon/landorus/normal.pal
rename to graphics/pokemon/gen_5/landorus/normal.pal
diff --git a/graphics/pokemon/landorus/shiny.pal b/graphics/pokemon/gen_5/landorus/shiny.pal
similarity index 100%
rename from graphics/pokemon/landorus/shiny.pal
rename to graphics/pokemon/gen_5/landorus/shiny.pal
diff --git a/graphics/pokemon/landorus/therian/anim_front.png b/graphics/pokemon/gen_5/landorus/therian/anim_front.png
similarity index 100%
rename from graphics/pokemon/landorus/therian/anim_front.png
rename to graphics/pokemon/gen_5/landorus/therian/anim_front.png
diff --git a/graphics/pokemon/landorus/therian/back.png b/graphics/pokemon/gen_5/landorus/therian/back.png
similarity index 100%
rename from graphics/pokemon/landorus/therian/back.png
rename to graphics/pokemon/gen_5/landorus/therian/back.png
diff --git a/graphics/pokemon/landorus/therian/icon.png b/graphics/pokemon/gen_5/landorus/therian/icon.png
similarity index 100%
rename from graphics/pokemon/landorus/therian/icon.png
rename to graphics/pokemon/gen_5/landorus/therian/icon.png
diff --git a/graphics/pokemon/landorus/therian/normal.pal b/graphics/pokemon/gen_5/landorus/therian/normal.pal
similarity index 100%
rename from graphics/pokemon/landorus/therian/normal.pal
rename to graphics/pokemon/gen_5/landorus/therian/normal.pal
diff --git a/graphics/pokemon/landorus/therian/shiny.pal b/graphics/pokemon/gen_5/landorus/therian/shiny.pal
similarity index 100%
rename from graphics/pokemon/landorus/therian/shiny.pal
rename to graphics/pokemon/gen_5/landorus/therian/shiny.pal
diff --git a/graphics/pokemon/larvesta/anim_front.png b/graphics/pokemon/gen_5/larvesta/anim_front.png
similarity index 100%
rename from graphics/pokemon/larvesta/anim_front.png
rename to graphics/pokemon/gen_5/larvesta/anim_front.png
diff --git a/graphics/pokemon/larvesta/back.png b/graphics/pokemon/gen_5/larvesta/back.png
similarity index 100%
rename from graphics/pokemon/larvesta/back.png
rename to graphics/pokemon/gen_5/larvesta/back.png
diff --git a/graphics/pokemon/cutiefly/footprint.png b/graphics/pokemon/gen_5/larvesta/footprint.png
similarity index 100%
rename from graphics/pokemon/cutiefly/footprint.png
rename to graphics/pokemon/gen_5/larvesta/footprint.png
diff --git a/graphics/pokemon/larvesta/icon.png b/graphics/pokemon/gen_5/larvesta/icon.png
similarity index 100%
rename from graphics/pokemon/larvesta/icon.png
rename to graphics/pokemon/gen_5/larvesta/icon.png
diff --git a/graphics/pokemon/larvesta/normal.pal b/graphics/pokemon/gen_5/larvesta/normal.pal
similarity index 100%
rename from graphics/pokemon/larvesta/normal.pal
rename to graphics/pokemon/gen_5/larvesta/normal.pal
diff --git a/graphics/pokemon/larvesta/shiny.pal b/graphics/pokemon/gen_5/larvesta/shiny.pal
similarity index 100%
rename from graphics/pokemon/larvesta/shiny.pal
rename to graphics/pokemon/gen_5/larvesta/shiny.pal
diff --git a/graphics/pokemon/leavanny/anim_front.png b/graphics/pokemon/gen_5/leavanny/anim_front.png
similarity index 100%
rename from graphics/pokemon/leavanny/anim_front.png
rename to graphics/pokemon/gen_5/leavanny/anim_front.png
diff --git a/graphics/pokemon/leavanny/back.png b/graphics/pokemon/gen_5/leavanny/back.png
similarity index 100%
rename from graphics/pokemon/leavanny/back.png
rename to graphics/pokemon/gen_5/leavanny/back.png
diff --git a/graphics/pokemon/mothim/footprint.png b/graphics/pokemon/gen_5/leavanny/footprint.png
similarity index 100%
rename from graphics/pokemon/mothim/footprint.png
rename to graphics/pokemon/gen_5/leavanny/footprint.png
diff --git a/graphics/pokemon/leavanny/icon.png b/graphics/pokemon/gen_5/leavanny/icon.png
similarity index 100%
rename from graphics/pokemon/leavanny/icon.png
rename to graphics/pokemon/gen_5/leavanny/icon.png
diff --git a/graphics/pokemon/leavanny/normal.pal b/graphics/pokemon/gen_5/leavanny/normal.pal
similarity index 100%
rename from graphics/pokemon/leavanny/normal.pal
rename to graphics/pokemon/gen_5/leavanny/normal.pal
diff --git a/graphics/pokemon/leavanny/shiny.pal b/graphics/pokemon/gen_5/leavanny/shiny.pal
similarity index 100%
rename from graphics/pokemon/leavanny/shiny.pal
rename to graphics/pokemon/gen_5/leavanny/shiny.pal
diff --git a/graphics/pokemon/liepard/anim_front.png b/graphics/pokemon/gen_5/liepard/anim_front.png
similarity index 100%
rename from graphics/pokemon/liepard/anim_front.png
rename to graphics/pokemon/gen_5/liepard/anim_front.png
diff --git a/graphics/pokemon/liepard/back.png b/graphics/pokemon/gen_5/liepard/back.png
similarity index 100%
rename from graphics/pokemon/liepard/back.png
rename to graphics/pokemon/gen_5/liepard/back.png
diff --git a/graphics/pokemon/liepard/footprint.png b/graphics/pokemon/gen_5/liepard/footprint.png
similarity index 100%
rename from graphics/pokemon/liepard/footprint.png
rename to graphics/pokemon/gen_5/liepard/footprint.png
diff --git a/graphics/pokemon/liepard/icon.png b/graphics/pokemon/gen_5/liepard/icon.png
similarity index 100%
rename from graphics/pokemon/liepard/icon.png
rename to graphics/pokemon/gen_5/liepard/icon.png
diff --git a/graphics/pokemon/liepard/normal.pal b/graphics/pokemon/gen_5/liepard/normal.pal
similarity index 100%
rename from graphics/pokemon/liepard/normal.pal
rename to graphics/pokemon/gen_5/liepard/normal.pal
diff --git a/graphics/pokemon/liepard/shiny.pal b/graphics/pokemon/gen_5/liepard/shiny.pal
similarity index 100%
rename from graphics/pokemon/liepard/shiny.pal
rename to graphics/pokemon/gen_5/liepard/shiny.pal
diff --git a/graphics/pokemon/lilligant/anim_front.png b/graphics/pokemon/gen_5/lilligant/anim_front.png
similarity index 100%
rename from graphics/pokemon/lilligant/anim_front.png
rename to graphics/pokemon/gen_5/lilligant/anim_front.png
diff --git a/graphics/pokemon/lilligant/back.png b/graphics/pokemon/gen_5/lilligant/back.png
similarity index 100%
rename from graphics/pokemon/lilligant/back.png
rename to graphics/pokemon/gen_5/lilligant/back.png
diff --git a/graphics/pokemon/lilligant/footprint.png b/graphics/pokemon/gen_5/lilligant/footprint.png
similarity index 100%
rename from graphics/pokemon/lilligant/footprint.png
rename to graphics/pokemon/gen_5/lilligant/footprint.png
diff --git a/graphics/pokemon/lilligant/hisuian/back.png b/graphics/pokemon/gen_5/lilligant/hisuian/back.png
similarity index 100%
rename from graphics/pokemon/lilligant/hisuian/back.png
rename to graphics/pokemon/gen_5/lilligant/hisuian/back.png
diff --git a/graphics/pokemon/lilligant/hisuian/front.png b/graphics/pokemon/gen_5/lilligant/hisuian/front.png
similarity index 100%
rename from graphics/pokemon/lilligant/hisuian/front.png
rename to graphics/pokemon/gen_5/lilligant/hisuian/front.png
diff --git a/graphics/pokemon/lilligant/hisuian/icon.png b/graphics/pokemon/gen_5/lilligant/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/lilligant/hisuian/icon.png
rename to graphics/pokemon/gen_5/lilligant/hisuian/icon.png
diff --git a/graphics/pokemon/lilligant/hisuian/normal.pal b/graphics/pokemon/gen_5/lilligant/hisuian/normal.pal
similarity index 100%
rename from graphics/pokemon/lilligant/hisuian/normal.pal
rename to graphics/pokemon/gen_5/lilligant/hisuian/normal.pal
diff --git a/graphics/pokemon/lilligant/hisuian/shiny.pal b/graphics/pokemon/gen_5/lilligant/hisuian/shiny.pal
similarity index 100%
rename from graphics/pokemon/lilligant/hisuian/shiny.pal
rename to graphics/pokemon/gen_5/lilligant/hisuian/shiny.pal
diff --git a/graphics/pokemon/lilligant/icon.png b/graphics/pokemon/gen_5/lilligant/icon.png
similarity index 100%
rename from graphics/pokemon/lilligant/icon.png
rename to graphics/pokemon/gen_5/lilligant/icon.png
diff --git a/graphics/pokemon/lilligant/normal.pal b/graphics/pokemon/gen_5/lilligant/normal.pal
similarity index 100%
rename from graphics/pokemon/lilligant/normal.pal
rename to graphics/pokemon/gen_5/lilligant/normal.pal
diff --git a/graphics/pokemon/lilligant/shiny.pal b/graphics/pokemon/gen_5/lilligant/shiny.pal
similarity index 100%
rename from graphics/pokemon/lilligant/shiny.pal
rename to graphics/pokemon/gen_5/lilligant/shiny.pal
diff --git a/graphics/pokemon/lillipup/anim_front.png b/graphics/pokemon/gen_5/lillipup/anim_front.png
similarity index 100%
rename from graphics/pokemon/lillipup/anim_front.png
rename to graphics/pokemon/gen_5/lillipup/anim_front.png
diff --git a/graphics/pokemon/lillipup/back.png b/graphics/pokemon/gen_5/lillipup/back.png
similarity index 100%
rename from graphics/pokemon/lillipup/back.png
rename to graphics/pokemon/gen_5/lillipup/back.png
diff --git a/graphics/pokemon/lillipup/footprint.png b/graphics/pokemon/gen_5/lillipup/footprint.png
similarity index 100%
rename from graphics/pokemon/lillipup/footprint.png
rename to graphics/pokemon/gen_5/lillipup/footprint.png
diff --git a/graphics/pokemon/lillipup/icon.png b/graphics/pokemon/gen_5/lillipup/icon.png
similarity index 100%
rename from graphics/pokemon/lillipup/icon.png
rename to graphics/pokemon/gen_5/lillipup/icon.png
diff --git a/graphics/pokemon/lillipup/normal.pal b/graphics/pokemon/gen_5/lillipup/normal.pal
similarity index 100%
rename from graphics/pokemon/lillipup/normal.pal
rename to graphics/pokemon/gen_5/lillipup/normal.pal
diff --git a/graphics/pokemon/lillipup/shiny.pal b/graphics/pokemon/gen_5/lillipup/shiny.pal
similarity index 100%
rename from graphics/pokemon/lillipup/shiny.pal
rename to graphics/pokemon/gen_5/lillipup/shiny.pal
diff --git a/graphics/pokemon/litwick/anim_front.png b/graphics/pokemon/gen_5/litwick/anim_front.png
similarity index 100%
rename from graphics/pokemon/litwick/anim_front.png
rename to graphics/pokemon/gen_5/litwick/anim_front.png
diff --git a/graphics/pokemon/litwick/back.png b/graphics/pokemon/gen_5/litwick/back.png
similarity index 100%
rename from graphics/pokemon/litwick/back.png
rename to graphics/pokemon/gen_5/litwick/back.png
diff --git a/graphics/pokemon/naganadel/footprint.png b/graphics/pokemon/gen_5/litwick/footprint.png
similarity index 100%
rename from graphics/pokemon/naganadel/footprint.png
rename to graphics/pokemon/gen_5/litwick/footprint.png
diff --git a/graphics/pokemon/litwick/icon.png b/graphics/pokemon/gen_5/litwick/icon.png
similarity index 100%
rename from graphics/pokemon/litwick/icon.png
rename to graphics/pokemon/gen_5/litwick/icon.png
diff --git a/graphics/pokemon/litwick/normal.pal b/graphics/pokemon/gen_5/litwick/normal.pal
similarity index 100%
rename from graphics/pokemon/litwick/normal.pal
rename to graphics/pokemon/gen_5/litwick/normal.pal
diff --git a/graphics/pokemon/litwick/shiny.pal b/graphics/pokemon/gen_5/litwick/shiny.pal
similarity index 100%
rename from graphics/pokemon/litwick/shiny.pal
rename to graphics/pokemon/gen_5/litwick/shiny.pal
diff --git a/graphics/pokemon/mandibuzz/anim_front.png b/graphics/pokemon/gen_5/mandibuzz/anim_front.png
similarity index 100%
rename from graphics/pokemon/mandibuzz/anim_front.png
rename to graphics/pokemon/gen_5/mandibuzz/anim_front.png
diff --git a/graphics/pokemon/mandibuzz/back.png b/graphics/pokemon/gen_5/mandibuzz/back.png
similarity index 100%
rename from graphics/pokemon/mandibuzz/back.png
rename to graphics/pokemon/gen_5/mandibuzz/back.png
diff --git a/graphics/pokemon/mandibuzz/footprint.png b/graphics/pokemon/gen_5/mandibuzz/footprint.png
similarity index 100%
rename from graphics/pokemon/mandibuzz/footprint.png
rename to graphics/pokemon/gen_5/mandibuzz/footprint.png
diff --git a/graphics/pokemon/mandibuzz/icon.png b/graphics/pokemon/gen_5/mandibuzz/icon.png
similarity index 100%
rename from graphics/pokemon/mandibuzz/icon.png
rename to graphics/pokemon/gen_5/mandibuzz/icon.png
diff --git a/graphics/pokemon/mandibuzz/normal.pal b/graphics/pokemon/gen_5/mandibuzz/normal.pal
similarity index 100%
rename from graphics/pokemon/mandibuzz/normal.pal
rename to graphics/pokemon/gen_5/mandibuzz/normal.pal
diff --git a/graphics/pokemon/mandibuzz/shiny.pal b/graphics/pokemon/gen_5/mandibuzz/shiny.pal
similarity index 100%
rename from graphics/pokemon/mandibuzz/shiny.pal
rename to graphics/pokemon/gen_5/mandibuzz/shiny.pal
diff --git a/graphics/pokemon/maractus/anim_front.png b/graphics/pokemon/gen_5/maractus/anim_front.png
similarity index 100%
rename from graphics/pokemon/maractus/anim_front.png
rename to graphics/pokemon/gen_5/maractus/anim_front.png
diff --git a/graphics/pokemon/maractus/back.png b/graphics/pokemon/gen_5/maractus/back.png
similarity index 100%
rename from graphics/pokemon/maractus/back.png
rename to graphics/pokemon/gen_5/maractus/back.png
diff --git a/graphics/pokemon/maractus/footprint.png b/graphics/pokemon/gen_5/maractus/footprint.png
similarity index 100%
rename from graphics/pokemon/maractus/footprint.png
rename to graphics/pokemon/gen_5/maractus/footprint.png
diff --git a/graphics/pokemon/maractus/icon.png b/graphics/pokemon/gen_5/maractus/icon.png
similarity index 100%
rename from graphics/pokemon/maractus/icon.png
rename to graphics/pokemon/gen_5/maractus/icon.png
diff --git a/graphics/pokemon/maractus/normal.pal b/graphics/pokemon/gen_5/maractus/normal.pal
similarity index 100%
rename from graphics/pokemon/maractus/normal.pal
rename to graphics/pokemon/gen_5/maractus/normal.pal
diff --git a/graphics/pokemon/maractus/shiny.pal b/graphics/pokemon/gen_5/maractus/shiny.pal
similarity index 100%
rename from graphics/pokemon/maractus/shiny.pal
rename to graphics/pokemon/gen_5/maractus/shiny.pal
diff --git a/graphics/pokemon/meloetta/anim_front.png b/graphics/pokemon/gen_5/meloetta/anim_front.png
similarity index 100%
rename from graphics/pokemon/meloetta/anim_front.png
rename to graphics/pokemon/gen_5/meloetta/anim_front.png
diff --git a/graphics/pokemon/meloetta/back.png b/graphics/pokemon/gen_5/meloetta/back.png
similarity index 100%
rename from graphics/pokemon/meloetta/back.png
rename to graphics/pokemon/gen_5/meloetta/back.png
diff --git a/graphics/pokemon/darkrai/footprint.png b/graphics/pokemon/gen_5/meloetta/footprint.png
similarity index 100%
rename from graphics/pokemon/darkrai/footprint.png
rename to graphics/pokemon/gen_5/meloetta/footprint.png
diff --git a/graphics/pokemon/meloetta/icon.png b/graphics/pokemon/gen_5/meloetta/icon.png
similarity index 100%
rename from graphics/pokemon/meloetta/icon.png
rename to graphics/pokemon/gen_5/meloetta/icon.png
diff --git a/graphics/pokemon/meloetta/normal.pal b/graphics/pokemon/gen_5/meloetta/normal.pal
similarity index 100%
rename from graphics/pokemon/meloetta/normal.pal
rename to graphics/pokemon/gen_5/meloetta/normal.pal
diff --git a/graphics/pokemon/meloetta/pirouette/back.png b/graphics/pokemon/gen_5/meloetta/pirouette/back.png
similarity index 100%
rename from graphics/pokemon/meloetta/pirouette/back.png
rename to graphics/pokemon/gen_5/meloetta/pirouette/back.png
diff --git a/graphics/pokemon/meloetta/pirouette/front.png b/graphics/pokemon/gen_5/meloetta/pirouette/front.png
similarity index 100%
rename from graphics/pokemon/meloetta/pirouette/front.png
rename to graphics/pokemon/gen_5/meloetta/pirouette/front.png
diff --git a/graphics/pokemon/meloetta/pirouette/icon.png b/graphics/pokemon/gen_5/meloetta/pirouette/icon.png
similarity index 100%
rename from graphics/pokemon/meloetta/pirouette/icon.png
rename to graphics/pokemon/gen_5/meloetta/pirouette/icon.png
diff --git a/graphics/pokemon/meloetta/pirouette/normal.pal b/graphics/pokemon/gen_5/meloetta/pirouette/normal.pal
similarity index 100%
rename from graphics/pokemon/meloetta/pirouette/normal.pal
rename to graphics/pokemon/gen_5/meloetta/pirouette/normal.pal
diff --git a/graphics/pokemon/meloetta/pirouette/shiny.pal b/graphics/pokemon/gen_5/meloetta/pirouette/shiny.pal
similarity index 100%
rename from graphics/pokemon/meloetta/pirouette/shiny.pal
rename to graphics/pokemon/gen_5/meloetta/pirouette/shiny.pal
diff --git a/graphics/pokemon/meloetta/shiny.pal b/graphics/pokemon/gen_5/meloetta/shiny.pal
similarity index 100%
rename from graphics/pokemon/meloetta/shiny.pal
rename to graphics/pokemon/gen_5/meloetta/shiny.pal
diff --git a/graphics/pokemon/mienfoo/anim_front.png b/graphics/pokemon/gen_5/mienfoo/anim_front.png
similarity index 100%
rename from graphics/pokemon/mienfoo/anim_front.png
rename to graphics/pokemon/gen_5/mienfoo/anim_front.png
diff --git a/graphics/pokemon/mienfoo/back.png b/graphics/pokemon/gen_5/mienfoo/back.png
similarity index 100%
rename from graphics/pokemon/mienfoo/back.png
rename to graphics/pokemon/gen_5/mienfoo/back.png
diff --git a/graphics/pokemon/mienfoo/footprint.png b/graphics/pokemon/gen_5/mienfoo/footprint.png
similarity index 100%
rename from graphics/pokemon/mienfoo/footprint.png
rename to graphics/pokemon/gen_5/mienfoo/footprint.png
diff --git a/graphics/pokemon/mienfoo/icon.png b/graphics/pokemon/gen_5/mienfoo/icon.png
similarity index 100%
rename from graphics/pokemon/mienfoo/icon.png
rename to graphics/pokemon/gen_5/mienfoo/icon.png
diff --git a/graphics/pokemon/mienfoo/normal.pal b/graphics/pokemon/gen_5/mienfoo/normal.pal
similarity index 100%
rename from graphics/pokemon/mienfoo/normal.pal
rename to graphics/pokemon/gen_5/mienfoo/normal.pal
diff --git a/graphics/pokemon/mienfoo/shiny.pal b/graphics/pokemon/gen_5/mienfoo/shiny.pal
similarity index 100%
rename from graphics/pokemon/mienfoo/shiny.pal
rename to graphics/pokemon/gen_5/mienfoo/shiny.pal
diff --git a/graphics/pokemon/mienshao/anim_front.png b/graphics/pokemon/gen_5/mienshao/anim_front.png
similarity index 100%
rename from graphics/pokemon/mienshao/anim_front.png
rename to graphics/pokemon/gen_5/mienshao/anim_front.png
diff --git a/graphics/pokemon/mienshao/back.png b/graphics/pokemon/gen_5/mienshao/back.png
similarity index 100%
rename from graphics/pokemon/mienshao/back.png
rename to graphics/pokemon/gen_5/mienshao/back.png
diff --git a/graphics/pokemon/mienshao/footprint.png b/graphics/pokemon/gen_5/mienshao/footprint.png
similarity index 100%
rename from graphics/pokemon/mienshao/footprint.png
rename to graphics/pokemon/gen_5/mienshao/footprint.png
diff --git a/graphics/pokemon/mienshao/icon.png b/graphics/pokemon/gen_5/mienshao/icon.png
similarity index 100%
rename from graphics/pokemon/mienshao/icon.png
rename to graphics/pokemon/gen_5/mienshao/icon.png
diff --git a/graphics/pokemon/mienshao/normal.pal b/graphics/pokemon/gen_5/mienshao/normal.pal
similarity index 100%
rename from graphics/pokemon/mienshao/normal.pal
rename to graphics/pokemon/gen_5/mienshao/normal.pal
diff --git a/graphics/pokemon/mienshao/shiny.pal b/graphics/pokemon/gen_5/mienshao/shiny.pal
similarity index 100%
rename from graphics/pokemon/mienshao/shiny.pal
rename to graphics/pokemon/gen_5/mienshao/shiny.pal
diff --git a/graphics/pokemon/minccino/anim_front.png b/graphics/pokemon/gen_5/minccino/anim_front.png
similarity index 100%
rename from graphics/pokemon/minccino/anim_front.png
rename to graphics/pokemon/gen_5/minccino/anim_front.png
diff --git a/graphics/pokemon/minccino/back.png b/graphics/pokemon/gen_5/minccino/back.png
similarity index 100%
rename from graphics/pokemon/minccino/back.png
rename to graphics/pokemon/gen_5/minccino/back.png
diff --git a/graphics/pokemon/minccino/footprint.png b/graphics/pokemon/gen_5/minccino/footprint.png
similarity index 100%
rename from graphics/pokemon/minccino/footprint.png
rename to graphics/pokemon/gen_5/minccino/footprint.png
diff --git a/graphics/pokemon/minccino/icon.png b/graphics/pokemon/gen_5/minccino/icon.png
similarity index 100%
rename from graphics/pokemon/minccino/icon.png
rename to graphics/pokemon/gen_5/minccino/icon.png
diff --git a/graphics/pokemon/minccino/normal.pal b/graphics/pokemon/gen_5/minccino/normal.pal
similarity index 100%
rename from graphics/pokemon/minccino/normal.pal
rename to graphics/pokemon/gen_5/minccino/normal.pal
diff --git a/graphics/pokemon/minccino/shiny.pal b/graphics/pokemon/gen_5/minccino/shiny.pal
similarity index 100%
rename from graphics/pokemon/minccino/shiny.pal
rename to graphics/pokemon/gen_5/minccino/shiny.pal
diff --git a/graphics/pokemon/munna/anim_front.png b/graphics/pokemon/gen_5/munna/anim_front.png
similarity index 100%
rename from graphics/pokemon/munna/anim_front.png
rename to graphics/pokemon/gen_5/munna/anim_front.png
diff --git a/graphics/pokemon/munna/back.png b/graphics/pokemon/gen_5/munna/back.png
similarity index 100%
rename from graphics/pokemon/munna/back.png
rename to graphics/pokemon/gen_5/munna/back.png
diff --git a/graphics/pokemon/dewpider/footprint.png b/graphics/pokemon/gen_5/munna/footprint.png
similarity index 100%
rename from graphics/pokemon/dewpider/footprint.png
rename to graphics/pokemon/gen_5/munna/footprint.png
diff --git a/graphics/pokemon/munna/icon.png b/graphics/pokemon/gen_5/munna/icon.png
similarity index 100%
rename from graphics/pokemon/munna/icon.png
rename to graphics/pokemon/gen_5/munna/icon.png
diff --git a/graphics/pokemon/munna/normal.pal b/graphics/pokemon/gen_5/munna/normal.pal
similarity index 100%
rename from graphics/pokemon/munna/normal.pal
rename to graphics/pokemon/gen_5/munna/normal.pal
diff --git a/graphics/pokemon/munna/shiny.pal b/graphics/pokemon/gen_5/munna/shiny.pal
similarity index 100%
rename from graphics/pokemon/munna/shiny.pal
rename to graphics/pokemon/gen_5/munna/shiny.pal
diff --git a/graphics/pokemon/musharna/anim_front.png b/graphics/pokemon/gen_5/musharna/anim_front.png
similarity index 100%
rename from graphics/pokemon/musharna/anim_front.png
rename to graphics/pokemon/gen_5/musharna/anim_front.png
diff --git a/graphics/pokemon/musharna/back.png b/graphics/pokemon/gen_5/musharna/back.png
similarity index 100%
rename from graphics/pokemon/musharna/back.png
rename to graphics/pokemon/gen_5/musharna/back.png
diff --git a/graphics/pokemon/drakloak/footprint.png b/graphics/pokemon/gen_5/musharna/footprint.png
similarity index 100%
rename from graphics/pokemon/drakloak/footprint.png
rename to graphics/pokemon/gen_5/musharna/footprint.png
diff --git a/graphics/pokemon/musharna/icon.png b/graphics/pokemon/gen_5/musharna/icon.png
similarity index 100%
rename from graphics/pokemon/musharna/icon.png
rename to graphics/pokemon/gen_5/musharna/icon.png
diff --git a/graphics/pokemon/musharna/normal.pal b/graphics/pokemon/gen_5/musharna/normal.pal
similarity index 100%
rename from graphics/pokemon/musharna/normal.pal
rename to graphics/pokemon/gen_5/musharna/normal.pal
diff --git a/graphics/pokemon/musharna/shiny.pal b/graphics/pokemon/gen_5/musharna/shiny.pal
similarity index 100%
rename from graphics/pokemon/musharna/shiny.pal
rename to graphics/pokemon/gen_5/musharna/shiny.pal
diff --git a/graphics/pokemon/oshawott/anim_front.png b/graphics/pokemon/gen_5/oshawott/anim_front.png
similarity index 100%
rename from graphics/pokemon/oshawott/anim_front.png
rename to graphics/pokemon/gen_5/oshawott/anim_front.png
diff --git a/graphics/pokemon/oshawott/back.png b/graphics/pokemon/gen_5/oshawott/back.png
similarity index 100%
rename from graphics/pokemon/oshawott/back.png
rename to graphics/pokemon/gen_5/oshawott/back.png
diff --git a/graphics/pokemon/oshawott/footprint.png b/graphics/pokemon/gen_5/oshawott/footprint.png
similarity index 100%
rename from graphics/pokemon/oshawott/footprint.png
rename to graphics/pokemon/gen_5/oshawott/footprint.png
diff --git a/graphics/pokemon/oshawott/icon.png b/graphics/pokemon/gen_5/oshawott/icon.png
similarity index 100%
rename from graphics/pokemon/oshawott/icon.png
rename to graphics/pokemon/gen_5/oshawott/icon.png
diff --git a/graphics/pokemon/oshawott/normal.pal b/graphics/pokemon/gen_5/oshawott/normal.pal
similarity index 100%
rename from graphics/pokemon/oshawott/normal.pal
rename to graphics/pokemon/gen_5/oshawott/normal.pal
diff --git a/graphics/pokemon/oshawott/shiny.pal b/graphics/pokemon/gen_5/oshawott/shiny.pal
similarity index 100%
rename from graphics/pokemon/oshawott/shiny.pal
rename to graphics/pokemon/gen_5/oshawott/shiny.pal
diff --git a/graphics/pokemon/palpitoad/anim_front.png b/graphics/pokemon/gen_5/palpitoad/anim_front.png
similarity index 100%
rename from graphics/pokemon/palpitoad/anim_front.png
rename to graphics/pokemon/gen_5/palpitoad/anim_front.png
diff --git a/graphics/pokemon/palpitoad/back.png b/graphics/pokemon/gen_5/palpitoad/back.png
similarity index 100%
rename from graphics/pokemon/palpitoad/back.png
rename to graphics/pokemon/gen_5/palpitoad/back.png
diff --git a/graphics/pokemon/palpitoad/footprint.png b/graphics/pokemon/gen_5/palpitoad/footprint.png
similarity index 100%
rename from graphics/pokemon/palpitoad/footprint.png
rename to graphics/pokemon/gen_5/palpitoad/footprint.png
diff --git a/graphics/pokemon/palpitoad/icon.png b/graphics/pokemon/gen_5/palpitoad/icon.png
similarity index 100%
rename from graphics/pokemon/palpitoad/icon.png
rename to graphics/pokemon/gen_5/palpitoad/icon.png
diff --git a/graphics/pokemon/palpitoad/normal.pal b/graphics/pokemon/gen_5/palpitoad/normal.pal
similarity index 100%
rename from graphics/pokemon/palpitoad/normal.pal
rename to graphics/pokemon/gen_5/palpitoad/normal.pal
diff --git a/graphics/pokemon/palpitoad/shiny.pal b/graphics/pokemon/gen_5/palpitoad/shiny.pal
similarity index 100%
rename from graphics/pokemon/palpitoad/shiny.pal
rename to graphics/pokemon/gen_5/palpitoad/shiny.pal
diff --git a/graphics/pokemon/panpour/anim_front.png b/graphics/pokemon/gen_5/panpour/anim_front.png
similarity index 100%
rename from graphics/pokemon/panpour/anim_front.png
rename to graphics/pokemon/gen_5/panpour/anim_front.png
diff --git a/graphics/pokemon/panpour/back.png b/graphics/pokemon/gen_5/panpour/back.png
similarity index 100%
rename from graphics/pokemon/panpour/back.png
rename to graphics/pokemon/gen_5/panpour/back.png
diff --git a/graphics/pokemon/panpour/footprint.png b/graphics/pokemon/gen_5/panpour/footprint.png
similarity index 100%
rename from graphics/pokemon/panpour/footprint.png
rename to graphics/pokemon/gen_5/panpour/footprint.png
diff --git a/graphics/pokemon/panpour/icon.png b/graphics/pokemon/gen_5/panpour/icon.png
similarity index 100%
rename from graphics/pokemon/panpour/icon.png
rename to graphics/pokemon/gen_5/panpour/icon.png
diff --git a/graphics/pokemon/panpour/normal.pal b/graphics/pokemon/gen_5/panpour/normal.pal
similarity index 100%
rename from graphics/pokemon/panpour/normal.pal
rename to graphics/pokemon/gen_5/panpour/normal.pal
diff --git a/graphics/pokemon/panpour/shiny.pal b/graphics/pokemon/gen_5/panpour/shiny.pal
similarity index 100%
rename from graphics/pokemon/panpour/shiny.pal
rename to graphics/pokemon/gen_5/panpour/shiny.pal
diff --git a/graphics/pokemon/pansage/anim_front.png b/graphics/pokemon/gen_5/pansage/anim_front.png
similarity index 100%
rename from graphics/pokemon/pansage/anim_front.png
rename to graphics/pokemon/gen_5/pansage/anim_front.png
diff --git a/graphics/pokemon/pansage/back.png b/graphics/pokemon/gen_5/pansage/back.png
similarity index 100%
rename from graphics/pokemon/pansage/back.png
rename to graphics/pokemon/gen_5/pansage/back.png
diff --git a/graphics/pokemon/pansage/footprint.png b/graphics/pokemon/gen_5/pansage/footprint.png
similarity index 100%
rename from graphics/pokemon/pansage/footprint.png
rename to graphics/pokemon/gen_5/pansage/footprint.png
diff --git a/graphics/pokemon/pansage/icon.png b/graphics/pokemon/gen_5/pansage/icon.png
similarity index 100%
rename from graphics/pokemon/pansage/icon.png
rename to graphics/pokemon/gen_5/pansage/icon.png
diff --git a/graphics/pokemon/pansage/normal.pal b/graphics/pokemon/gen_5/pansage/normal.pal
similarity index 100%
rename from graphics/pokemon/pansage/normal.pal
rename to graphics/pokemon/gen_5/pansage/normal.pal
diff --git a/graphics/pokemon/pansage/shiny.pal b/graphics/pokemon/gen_5/pansage/shiny.pal
similarity index 100%
rename from graphics/pokemon/pansage/shiny.pal
rename to graphics/pokemon/gen_5/pansage/shiny.pal
diff --git a/graphics/pokemon/pansear/anim_front.png b/graphics/pokemon/gen_5/pansear/anim_front.png
similarity index 100%
rename from graphics/pokemon/pansear/anim_front.png
rename to graphics/pokemon/gen_5/pansear/anim_front.png
diff --git a/graphics/pokemon/pansear/back.png b/graphics/pokemon/gen_5/pansear/back.png
similarity index 100%
rename from graphics/pokemon/pansear/back.png
rename to graphics/pokemon/gen_5/pansear/back.png
diff --git a/graphics/pokemon/pansear/footprint.png b/graphics/pokemon/gen_5/pansear/footprint.png
similarity index 100%
rename from graphics/pokemon/pansear/footprint.png
rename to graphics/pokemon/gen_5/pansear/footprint.png
diff --git a/graphics/pokemon/pansear/icon.png b/graphics/pokemon/gen_5/pansear/icon.png
similarity index 100%
rename from graphics/pokemon/pansear/icon.png
rename to graphics/pokemon/gen_5/pansear/icon.png
diff --git a/graphics/pokemon/pansear/normal.pal b/graphics/pokemon/gen_5/pansear/normal.pal
similarity index 100%
rename from graphics/pokemon/pansear/normal.pal
rename to graphics/pokemon/gen_5/pansear/normal.pal
diff --git a/graphics/pokemon/pansear/shiny.pal b/graphics/pokemon/gen_5/pansear/shiny.pal
similarity index 100%
rename from graphics/pokemon/pansear/shiny.pal
rename to graphics/pokemon/gen_5/pansear/shiny.pal
diff --git a/graphics/pokemon/patrat/anim_front.png b/graphics/pokemon/gen_5/patrat/anim_front.png
similarity index 100%
rename from graphics/pokemon/patrat/anim_front.png
rename to graphics/pokemon/gen_5/patrat/anim_front.png
diff --git a/graphics/pokemon/patrat/back.png b/graphics/pokemon/gen_5/patrat/back.png
similarity index 100%
rename from graphics/pokemon/patrat/back.png
rename to graphics/pokemon/gen_5/patrat/back.png
diff --git a/graphics/pokemon/patrat/footprint.png b/graphics/pokemon/gen_5/patrat/footprint.png
similarity index 100%
rename from graphics/pokemon/patrat/footprint.png
rename to graphics/pokemon/gen_5/patrat/footprint.png
diff --git a/graphics/pokemon/patrat/icon.png b/graphics/pokemon/gen_5/patrat/icon.png
similarity index 100%
rename from graphics/pokemon/patrat/icon.png
rename to graphics/pokemon/gen_5/patrat/icon.png
diff --git a/graphics/pokemon/patrat/normal.pal b/graphics/pokemon/gen_5/patrat/normal.pal
similarity index 100%
rename from graphics/pokemon/patrat/normal.pal
rename to graphics/pokemon/gen_5/patrat/normal.pal
diff --git a/graphics/pokemon/patrat/shiny.pal b/graphics/pokemon/gen_5/patrat/shiny.pal
similarity index 100%
rename from graphics/pokemon/patrat/shiny.pal
rename to graphics/pokemon/gen_5/patrat/shiny.pal
diff --git a/graphics/pokemon/pawniard/anim_front.png b/graphics/pokemon/gen_5/pawniard/anim_front.png
similarity index 100%
rename from graphics/pokemon/pawniard/anim_front.png
rename to graphics/pokemon/gen_5/pawniard/anim_front.png
diff --git a/graphics/pokemon/pawniard/back.png b/graphics/pokemon/gen_5/pawniard/back.png
similarity index 100%
rename from graphics/pokemon/pawniard/back.png
rename to graphics/pokemon/gen_5/pawniard/back.png
diff --git a/graphics/pokemon/pawniard/footprint.png b/graphics/pokemon/gen_5/pawniard/footprint.png
similarity index 100%
rename from graphics/pokemon/pawniard/footprint.png
rename to graphics/pokemon/gen_5/pawniard/footprint.png
diff --git a/graphics/pokemon/pawniard/icon.png b/graphics/pokemon/gen_5/pawniard/icon.png
similarity index 100%
rename from graphics/pokemon/pawniard/icon.png
rename to graphics/pokemon/gen_5/pawniard/icon.png
diff --git a/graphics/pokemon/pawniard/normal.pal b/graphics/pokemon/gen_5/pawniard/normal.pal
similarity index 100%
rename from graphics/pokemon/pawniard/normal.pal
rename to graphics/pokemon/gen_5/pawniard/normal.pal
diff --git a/graphics/pokemon/pawniard/shiny.pal b/graphics/pokemon/gen_5/pawniard/shiny.pal
similarity index 100%
rename from graphics/pokemon/pawniard/shiny.pal
rename to graphics/pokemon/gen_5/pawniard/shiny.pal
diff --git a/graphics/pokemon/petilil/anim_front.png b/graphics/pokemon/gen_5/petilil/anim_front.png
similarity index 100%
rename from graphics/pokemon/petilil/anim_front.png
rename to graphics/pokemon/gen_5/petilil/anim_front.png
diff --git a/graphics/pokemon/petilil/back.png b/graphics/pokemon/gen_5/petilil/back.png
similarity index 100%
rename from graphics/pokemon/petilil/back.png
rename to graphics/pokemon/gen_5/petilil/back.png
diff --git a/graphics/pokemon/necrozma/footprint.png b/graphics/pokemon/gen_5/petilil/footprint.png
similarity index 100%
rename from graphics/pokemon/necrozma/footprint.png
rename to graphics/pokemon/gen_5/petilil/footprint.png
diff --git a/graphics/pokemon/petilil/icon.png b/graphics/pokemon/gen_5/petilil/icon.png
similarity index 100%
rename from graphics/pokemon/petilil/icon.png
rename to graphics/pokemon/gen_5/petilil/icon.png
diff --git a/graphics/pokemon/petilil/normal.pal b/graphics/pokemon/gen_5/petilil/normal.pal
similarity index 100%
rename from graphics/pokemon/petilil/normal.pal
rename to graphics/pokemon/gen_5/petilil/normal.pal
diff --git a/graphics/pokemon/petilil/shiny.pal b/graphics/pokemon/gen_5/petilil/shiny.pal
similarity index 100%
rename from graphics/pokemon/petilil/shiny.pal
rename to graphics/pokemon/gen_5/petilil/shiny.pal
diff --git a/graphics/pokemon/pidove/anim_front.png b/graphics/pokemon/gen_5/pidove/anim_front.png
similarity index 100%
rename from graphics/pokemon/pidove/anim_front.png
rename to graphics/pokemon/gen_5/pidove/anim_front.png
diff --git a/graphics/pokemon/pidove/back.png b/graphics/pokemon/gen_5/pidove/back.png
similarity index 100%
rename from graphics/pokemon/pidove/back.png
rename to graphics/pokemon/gen_5/pidove/back.png
diff --git a/graphics/pokemon/pidove/footprint.png b/graphics/pokemon/gen_5/pidove/footprint.png
similarity index 100%
rename from graphics/pokemon/pidove/footprint.png
rename to graphics/pokemon/gen_5/pidove/footprint.png
diff --git a/graphics/pokemon/pidove/icon.png b/graphics/pokemon/gen_5/pidove/icon.png
similarity index 100%
rename from graphics/pokemon/pidove/icon.png
rename to graphics/pokemon/gen_5/pidove/icon.png
diff --git a/graphics/pokemon/pidove/normal.pal b/graphics/pokemon/gen_5/pidove/normal.pal
similarity index 100%
rename from graphics/pokemon/pidove/normal.pal
rename to graphics/pokemon/gen_5/pidove/normal.pal
diff --git a/graphics/pokemon/pidove/shiny.pal b/graphics/pokemon/gen_5/pidove/shiny.pal
similarity index 100%
rename from graphics/pokemon/pidove/shiny.pal
rename to graphics/pokemon/gen_5/pidove/shiny.pal
diff --git a/graphics/pokemon/pignite/anim_front.png b/graphics/pokemon/gen_5/pignite/anim_front.png
similarity index 100%
rename from graphics/pokemon/pignite/anim_front.png
rename to graphics/pokemon/gen_5/pignite/anim_front.png
diff --git a/graphics/pokemon/pignite/back.png b/graphics/pokemon/gen_5/pignite/back.png
similarity index 100%
rename from graphics/pokemon/pignite/back.png
rename to graphics/pokemon/gen_5/pignite/back.png
diff --git a/graphics/pokemon/pignite/footprint.png b/graphics/pokemon/gen_5/pignite/footprint.png
similarity index 100%
rename from graphics/pokemon/pignite/footprint.png
rename to graphics/pokemon/gen_5/pignite/footprint.png
diff --git a/graphics/pokemon/pignite/icon.png b/graphics/pokemon/gen_5/pignite/icon.png
similarity index 100%
rename from graphics/pokemon/pignite/icon.png
rename to graphics/pokemon/gen_5/pignite/icon.png
diff --git a/graphics/pokemon/pignite/normal.pal b/graphics/pokemon/gen_5/pignite/normal.pal
similarity index 100%
rename from graphics/pokemon/pignite/normal.pal
rename to graphics/pokemon/gen_5/pignite/normal.pal
diff --git a/graphics/pokemon/pignite/shiny.pal b/graphics/pokemon/gen_5/pignite/shiny.pal
similarity index 100%
rename from graphics/pokemon/pignite/shiny.pal
rename to graphics/pokemon/gen_5/pignite/shiny.pal
diff --git a/graphics/pokemon/purrloin/anim_front.png b/graphics/pokemon/gen_5/purrloin/anim_front.png
similarity index 100%
rename from graphics/pokemon/purrloin/anim_front.png
rename to graphics/pokemon/gen_5/purrloin/anim_front.png
diff --git a/graphics/pokemon/purrloin/back.png b/graphics/pokemon/gen_5/purrloin/back.png
similarity index 100%
rename from graphics/pokemon/purrloin/back.png
rename to graphics/pokemon/gen_5/purrloin/back.png
diff --git a/graphics/pokemon/purrloin/footprint.png b/graphics/pokemon/gen_5/purrloin/footprint.png
similarity index 100%
rename from graphics/pokemon/purrloin/footprint.png
rename to graphics/pokemon/gen_5/purrloin/footprint.png
diff --git a/graphics/pokemon/purrloin/icon.png b/graphics/pokemon/gen_5/purrloin/icon.png
similarity index 100%
rename from graphics/pokemon/purrloin/icon.png
rename to graphics/pokemon/gen_5/purrloin/icon.png
diff --git a/graphics/pokemon/purrloin/normal.pal b/graphics/pokemon/gen_5/purrloin/normal.pal
similarity index 100%
rename from graphics/pokemon/purrloin/normal.pal
rename to graphics/pokemon/gen_5/purrloin/normal.pal
diff --git a/graphics/pokemon/purrloin/shiny.pal b/graphics/pokemon/gen_5/purrloin/shiny.pal
similarity index 100%
rename from graphics/pokemon/purrloin/shiny.pal
rename to graphics/pokemon/gen_5/purrloin/shiny.pal
diff --git a/graphics/pokemon/reshiram/anim_front.png b/graphics/pokemon/gen_5/reshiram/anim_front.png
similarity index 100%
rename from graphics/pokemon/reshiram/anim_front.png
rename to graphics/pokemon/gen_5/reshiram/anim_front.png
diff --git a/graphics/pokemon/reshiram/back.png b/graphics/pokemon/gen_5/reshiram/back.png
similarity index 100%
rename from graphics/pokemon/reshiram/back.png
rename to graphics/pokemon/gen_5/reshiram/back.png
diff --git a/graphics/pokemon/reshiram/footprint.png b/graphics/pokemon/gen_5/reshiram/footprint.png
similarity index 100%
rename from graphics/pokemon/reshiram/footprint.png
rename to graphics/pokemon/gen_5/reshiram/footprint.png
diff --git a/graphics/pokemon/reshiram/icon.png b/graphics/pokemon/gen_5/reshiram/icon.png
similarity index 100%
rename from graphics/pokemon/reshiram/icon.png
rename to graphics/pokemon/gen_5/reshiram/icon.png
diff --git a/graphics/pokemon/reshiram/normal.pal b/graphics/pokemon/gen_5/reshiram/normal.pal
similarity index 100%
rename from graphics/pokemon/reshiram/normal.pal
rename to graphics/pokemon/gen_5/reshiram/normal.pal
diff --git a/graphics/pokemon/reshiram/shiny.pal b/graphics/pokemon/gen_5/reshiram/shiny.pal
similarity index 100%
rename from graphics/pokemon/reshiram/shiny.pal
rename to graphics/pokemon/gen_5/reshiram/shiny.pal
diff --git a/graphics/pokemon/reuniclus/anim_front.png b/graphics/pokemon/gen_5/reuniclus/anim_front.png
similarity index 100%
rename from graphics/pokemon/reuniclus/anim_front.png
rename to graphics/pokemon/gen_5/reuniclus/anim_front.png
diff --git a/graphics/pokemon/reuniclus/back.png b/graphics/pokemon/gen_5/reuniclus/back.png
similarity index 100%
rename from graphics/pokemon/reuniclus/back.png
rename to graphics/pokemon/gen_5/reuniclus/back.png
diff --git a/graphics/pokemon/nihilego/footprint.png b/graphics/pokemon/gen_5/reuniclus/footprint.png
similarity index 100%
rename from graphics/pokemon/nihilego/footprint.png
rename to graphics/pokemon/gen_5/reuniclus/footprint.png
diff --git a/graphics/pokemon/reuniclus/icon.png b/graphics/pokemon/gen_5/reuniclus/icon.png
similarity index 100%
rename from graphics/pokemon/reuniclus/icon.png
rename to graphics/pokemon/gen_5/reuniclus/icon.png
diff --git a/graphics/pokemon/reuniclus/normal.pal b/graphics/pokemon/gen_5/reuniclus/normal.pal
similarity index 100%
rename from graphics/pokemon/reuniclus/normal.pal
rename to graphics/pokemon/gen_5/reuniclus/normal.pal
diff --git a/graphics/pokemon/reuniclus/shiny.pal b/graphics/pokemon/gen_5/reuniclus/shiny.pal
similarity index 100%
rename from graphics/pokemon/reuniclus/shiny.pal
rename to graphics/pokemon/gen_5/reuniclus/shiny.pal
diff --git a/graphics/pokemon/roggenrola/anim_front.png b/graphics/pokemon/gen_5/roggenrola/anim_front.png
similarity index 100%
rename from graphics/pokemon/roggenrola/anim_front.png
rename to graphics/pokemon/gen_5/roggenrola/anim_front.png
diff --git a/graphics/pokemon/roggenrola/back.png b/graphics/pokemon/gen_5/roggenrola/back.png
similarity index 100%
rename from graphics/pokemon/roggenrola/back.png
rename to graphics/pokemon/gen_5/roggenrola/back.png
diff --git a/graphics/pokemon/roggenrola/footprint.png b/graphics/pokemon/gen_5/roggenrola/footprint.png
similarity index 100%
rename from graphics/pokemon/roggenrola/footprint.png
rename to graphics/pokemon/gen_5/roggenrola/footprint.png
diff --git a/graphics/pokemon/roggenrola/icon.png b/graphics/pokemon/gen_5/roggenrola/icon.png
similarity index 100%
rename from graphics/pokemon/roggenrola/icon.png
rename to graphics/pokemon/gen_5/roggenrola/icon.png
diff --git a/graphics/pokemon/roggenrola/normal.pal b/graphics/pokemon/gen_5/roggenrola/normal.pal
similarity index 100%
rename from graphics/pokemon/roggenrola/normal.pal
rename to graphics/pokemon/gen_5/roggenrola/normal.pal
diff --git a/graphics/pokemon/roggenrola/shiny.pal b/graphics/pokemon/gen_5/roggenrola/shiny.pal
similarity index 100%
rename from graphics/pokemon/roggenrola/shiny.pal
rename to graphics/pokemon/gen_5/roggenrola/shiny.pal
diff --git a/graphics/pokemon/rufflet/anim_front.png b/graphics/pokemon/gen_5/rufflet/anim_front.png
similarity index 100%
rename from graphics/pokemon/rufflet/anim_front.png
rename to graphics/pokemon/gen_5/rufflet/anim_front.png
diff --git a/graphics/pokemon/rufflet/back.png b/graphics/pokemon/gen_5/rufflet/back.png
similarity index 100%
rename from graphics/pokemon/rufflet/back.png
rename to graphics/pokemon/gen_5/rufflet/back.png
diff --git a/graphics/pokemon/rufflet/footprint.png b/graphics/pokemon/gen_5/rufflet/footprint.png
similarity index 100%
rename from graphics/pokemon/rufflet/footprint.png
rename to graphics/pokemon/gen_5/rufflet/footprint.png
diff --git a/graphics/pokemon/rufflet/icon.png b/graphics/pokemon/gen_5/rufflet/icon.png
similarity index 100%
rename from graphics/pokemon/rufflet/icon.png
rename to graphics/pokemon/gen_5/rufflet/icon.png
diff --git a/graphics/pokemon/rufflet/normal.pal b/graphics/pokemon/gen_5/rufflet/normal.pal
similarity index 100%
rename from graphics/pokemon/rufflet/normal.pal
rename to graphics/pokemon/gen_5/rufflet/normal.pal
diff --git a/graphics/pokemon/rufflet/shiny.pal b/graphics/pokemon/gen_5/rufflet/shiny.pal
similarity index 100%
rename from graphics/pokemon/rufflet/shiny.pal
rename to graphics/pokemon/gen_5/rufflet/shiny.pal
diff --git a/graphics/pokemon/samurott/anim_front.png b/graphics/pokemon/gen_5/samurott/anim_front.png
similarity index 100%
rename from graphics/pokemon/samurott/anim_front.png
rename to graphics/pokemon/gen_5/samurott/anim_front.png
diff --git a/graphics/pokemon/samurott/back.png b/graphics/pokemon/gen_5/samurott/back.png
similarity index 100%
rename from graphics/pokemon/samurott/back.png
rename to graphics/pokemon/gen_5/samurott/back.png
diff --git a/graphics/pokemon/samurott/footprint.png b/graphics/pokemon/gen_5/samurott/footprint.png
similarity index 100%
rename from graphics/pokemon/samurott/footprint.png
rename to graphics/pokemon/gen_5/samurott/footprint.png
diff --git a/graphics/pokemon/samurott/hisuian/back.png b/graphics/pokemon/gen_5/samurott/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/samurott/hisuian/back.png
rename to graphics/pokemon/gen_5/samurott/hisuian/back.png
diff --git a/graphics/pokemon/samurott/hisuian/front.png b/graphics/pokemon/gen_5/samurott/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/samurott/hisuian/front.png
rename to graphics/pokemon/gen_5/samurott/hisuian/front.png
diff --git a/graphics/pokemon/samurott/hisuian/icon.png b/graphics/pokemon/gen_5/samurott/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/samurott/hisuian/icon.png
rename to graphics/pokemon/gen_5/samurott/hisuian/icon.png
diff --git a/graphics/pokemon/samurott/hisuian/normal.pal b/graphics/pokemon/gen_5/samurott/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/samurott/hisuian/normal.pal
rename to graphics/pokemon/gen_5/samurott/hisuian/normal.pal
diff --git a/graphics/pokemon/samurott/hisuian/shiny.pal b/graphics/pokemon/gen_5/samurott/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/samurott/hisuian/shiny.pal
rename to graphics/pokemon/gen_5/samurott/hisuian/shiny.pal
diff --git a/graphics/pokemon/samurott/icon.png b/graphics/pokemon/gen_5/samurott/icon.png
similarity index 100%
rename from graphics/pokemon/samurott/icon.png
rename to graphics/pokemon/gen_5/samurott/icon.png
diff --git a/graphics/pokemon/samurott/normal.pal b/graphics/pokemon/gen_5/samurott/normal.pal
similarity index 100%
rename from graphics/pokemon/samurott/normal.pal
rename to graphics/pokemon/gen_5/samurott/normal.pal
diff --git a/graphics/pokemon/samurott/shiny.pal b/graphics/pokemon/gen_5/samurott/shiny.pal
similarity index 100%
rename from graphics/pokemon/samurott/shiny.pal
rename to graphics/pokemon/gen_5/samurott/shiny.pal
diff --git a/graphics/pokemon/sandile/anim_front.png b/graphics/pokemon/gen_5/sandile/anim_front.png
similarity index 100%
rename from graphics/pokemon/sandile/anim_front.png
rename to graphics/pokemon/gen_5/sandile/anim_front.png
diff --git a/graphics/pokemon/sandile/back.png b/graphics/pokemon/gen_5/sandile/back.png
similarity index 100%
rename from graphics/pokemon/sandile/back.png
rename to graphics/pokemon/gen_5/sandile/back.png
diff --git a/graphics/pokemon/sandile/footprint.png b/graphics/pokemon/gen_5/sandile/footprint.png
similarity index 100%
rename from graphics/pokemon/sandile/footprint.png
rename to graphics/pokemon/gen_5/sandile/footprint.png
diff --git a/graphics/pokemon/sandile/icon.png b/graphics/pokemon/gen_5/sandile/icon.png
similarity index 100%
rename from graphics/pokemon/sandile/icon.png
rename to graphics/pokemon/gen_5/sandile/icon.png
diff --git a/graphics/pokemon/sandile/normal.pal b/graphics/pokemon/gen_5/sandile/normal.pal
similarity index 100%
rename from graphics/pokemon/sandile/normal.pal
rename to graphics/pokemon/gen_5/sandile/normal.pal
diff --git a/graphics/pokemon/sandile/shiny.pal b/graphics/pokemon/gen_5/sandile/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandile/shiny.pal
rename to graphics/pokemon/gen_5/sandile/shiny.pal
diff --git a/graphics/pokemon/sawk/anim_front.png b/graphics/pokemon/gen_5/sawk/anim_front.png
similarity index 100%
rename from graphics/pokemon/sawk/anim_front.png
rename to graphics/pokemon/gen_5/sawk/anim_front.png
diff --git a/graphics/pokemon/sawk/back.png b/graphics/pokemon/gen_5/sawk/back.png
similarity index 100%
rename from graphics/pokemon/sawk/back.png
rename to graphics/pokemon/gen_5/sawk/back.png
diff --git a/graphics/pokemon/sawk/footprint.png b/graphics/pokemon/gen_5/sawk/footprint.png
similarity index 100%
rename from graphics/pokemon/sawk/footprint.png
rename to graphics/pokemon/gen_5/sawk/footprint.png
diff --git a/graphics/pokemon/sawk/icon.png b/graphics/pokemon/gen_5/sawk/icon.png
similarity index 100%
rename from graphics/pokemon/sawk/icon.png
rename to graphics/pokemon/gen_5/sawk/icon.png
diff --git a/graphics/pokemon/sawk/normal.pal b/graphics/pokemon/gen_5/sawk/normal.pal
similarity index 100%
rename from graphics/pokemon/sawk/normal.pal
rename to graphics/pokemon/gen_5/sawk/normal.pal
diff --git a/graphics/pokemon/sawk/shiny.pal b/graphics/pokemon/gen_5/sawk/shiny.pal
similarity index 100%
rename from graphics/pokemon/sawk/shiny.pal
rename to graphics/pokemon/gen_5/sawk/shiny.pal
diff --git a/graphics/pokemon/sawsbuck/anim_front.png b/graphics/pokemon/gen_5/sawsbuck/anim_front.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/anim_front.png
rename to graphics/pokemon/gen_5/sawsbuck/anim_front.png
diff --git a/graphics/pokemon/sawsbuck/autumn/back.png b/graphics/pokemon/gen_5/sawsbuck/autumn/back.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/autumn/back.png
rename to graphics/pokemon/gen_5/sawsbuck/autumn/back.png
diff --git a/graphics/pokemon/sawsbuck/autumn/front.png b/graphics/pokemon/gen_5/sawsbuck/autumn/front.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/autumn/front.png
rename to graphics/pokemon/gen_5/sawsbuck/autumn/front.png
diff --git a/graphics/pokemon/sawsbuck/autumn/icon.png b/graphics/pokemon/gen_5/sawsbuck/autumn/icon.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/autumn/icon.png
rename to graphics/pokemon/gen_5/sawsbuck/autumn/icon.png
diff --git a/graphics/pokemon/sawsbuck/autumn/normal.pal b/graphics/pokemon/gen_5/sawsbuck/autumn/normal.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/autumn/normal.pal
rename to graphics/pokemon/gen_5/sawsbuck/autumn/normal.pal
diff --git a/graphics/pokemon/sawsbuck/autumn/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/autumn/shiny.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/autumn/shiny.pal
rename to graphics/pokemon/gen_5/sawsbuck/autumn/shiny.pal
diff --git a/graphics/pokemon/sawsbuck/back.png b/graphics/pokemon/gen_5/sawsbuck/back.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/back.png
rename to graphics/pokemon/gen_5/sawsbuck/back.png
diff --git a/graphics/pokemon/sawsbuck/footprint.png b/graphics/pokemon/gen_5/sawsbuck/footprint.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/footprint.png
rename to graphics/pokemon/gen_5/sawsbuck/footprint.png
diff --git a/graphics/pokemon/sawsbuck/icon.png b/graphics/pokemon/gen_5/sawsbuck/icon.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/icon.png
rename to graphics/pokemon/gen_5/sawsbuck/icon.png
diff --git a/graphics/pokemon/sawsbuck/normal.pal b/graphics/pokemon/gen_5/sawsbuck/normal.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/normal.pal
rename to graphics/pokemon/gen_5/sawsbuck/normal.pal
diff --git a/graphics/pokemon/sawsbuck/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/shiny.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/shiny.pal
rename to graphics/pokemon/gen_5/sawsbuck/shiny.pal
diff --git a/graphics/pokemon/sawsbuck/summer/back.png b/graphics/pokemon/gen_5/sawsbuck/summer/back.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/summer/back.png
rename to graphics/pokemon/gen_5/sawsbuck/summer/back.png
diff --git a/graphics/pokemon/sawsbuck/summer/front.png b/graphics/pokemon/gen_5/sawsbuck/summer/front.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/summer/front.png
rename to graphics/pokemon/gen_5/sawsbuck/summer/front.png
diff --git a/graphics/pokemon/sawsbuck/summer/icon.png b/graphics/pokemon/gen_5/sawsbuck/summer/icon.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/summer/icon.png
rename to graphics/pokemon/gen_5/sawsbuck/summer/icon.png
diff --git a/graphics/pokemon/sawsbuck/summer/normal.pal b/graphics/pokemon/gen_5/sawsbuck/summer/normal.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/summer/normal.pal
rename to graphics/pokemon/gen_5/sawsbuck/summer/normal.pal
diff --git a/graphics/pokemon/sawsbuck/summer/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/summer/shiny.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/summer/shiny.pal
rename to graphics/pokemon/gen_5/sawsbuck/summer/shiny.pal
diff --git a/graphics/pokemon/sawsbuck/winter/back.png b/graphics/pokemon/gen_5/sawsbuck/winter/back.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/winter/back.png
rename to graphics/pokemon/gen_5/sawsbuck/winter/back.png
diff --git a/graphics/pokemon/sawsbuck/winter/front.png b/graphics/pokemon/gen_5/sawsbuck/winter/front.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/winter/front.png
rename to graphics/pokemon/gen_5/sawsbuck/winter/front.png
diff --git a/graphics/pokemon/sawsbuck/winter/icon.png b/graphics/pokemon/gen_5/sawsbuck/winter/icon.png
similarity index 100%
rename from graphics/pokemon/sawsbuck/winter/icon.png
rename to graphics/pokemon/gen_5/sawsbuck/winter/icon.png
diff --git a/graphics/pokemon/sawsbuck/winter/normal.pal b/graphics/pokemon/gen_5/sawsbuck/winter/normal.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/winter/normal.pal
rename to graphics/pokemon/gen_5/sawsbuck/winter/normal.pal
diff --git a/graphics/pokemon/sawsbuck/winter/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/winter/shiny.pal
similarity index 100%
rename from graphics/pokemon/sawsbuck/winter/shiny.pal
rename to graphics/pokemon/gen_5/sawsbuck/winter/shiny.pal
diff --git a/graphics/pokemon/scolipede/anim_front.png b/graphics/pokemon/gen_5/scolipede/anim_front.png
similarity index 100%
rename from graphics/pokemon/scolipede/anim_front.png
rename to graphics/pokemon/gen_5/scolipede/anim_front.png
diff --git a/graphics/pokemon/scolipede/back.png b/graphics/pokemon/gen_5/scolipede/back.png
similarity index 100%
rename from graphics/pokemon/scolipede/back.png
rename to graphics/pokemon/gen_5/scolipede/back.png
diff --git a/graphics/pokemon/scolipede/footprint.png b/graphics/pokemon/gen_5/scolipede/footprint.png
similarity index 100%
rename from graphics/pokemon/scolipede/footprint.png
rename to graphics/pokemon/gen_5/scolipede/footprint.png
diff --git a/graphics/pokemon/scolipede/icon.png b/graphics/pokemon/gen_5/scolipede/icon.png
similarity index 100%
rename from graphics/pokemon/scolipede/icon.png
rename to graphics/pokemon/gen_5/scolipede/icon.png
diff --git a/graphics/pokemon/scolipede/normal.pal b/graphics/pokemon/gen_5/scolipede/normal.pal
similarity index 100%
rename from graphics/pokemon/scolipede/normal.pal
rename to graphics/pokemon/gen_5/scolipede/normal.pal
diff --git a/graphics/pokemon/scolipede/shiny.pal b/graphics/pokemon/gen_5/scolipede/shiny.pal
similarity index 100%
rename from graphics/pokemon/scolipede/shiny.pal
rename to graphics/pokemon/gen_5/scolipede/shiny.pal
diff --git a/graphics/pokemon/scrafty/anim_front.png b/graphics/pokemon/gen_5/scrafty/anim_front.png
similarity index 100%
rename from graphics/pokemon/scrafty/anim_front.png
rename to graphics/pokemon/gen_5/scrafty/anim_front.png
diff --git a/graphics/pokemon/scrafty/back.png b/graphics/pokemon/gen_5/scrafty/back.png
similarity index 100%
rename from graphics/pokemon/scrafty/back.png
rename to graphics/pokemon/gen_5/scrafty/back.png
diff --git a/graphics/pokemon/scrafty/footprint.png b/graphics/pokemon/gen_5/scrafty/footprint.png
similarity index 100%
rename from graphics/pokemon/scrafty/footprint.png
rename to graphics/pokemon/gen_5/scrafty/footprint.png
diff --git a/graphics/pokemon/scrafty/icon.png b/graphics/pokemon/gen_5/scrafty/icon.png
similarity index 100%
rename from graphics/pokemon/scrafty/icon.png
rename to graphics/pokemon/gen_5/scrafty/icon.png
diff --git a/graphics/pokemon/scrafty/normal.pal b/graphics/pokemon/gen_5/scrafty/normal.pal
similarity index 100%
rename from graphics/pokemon/scrafty/normal.pal
rename to graphics/pokemon/gen_5/scrafty/normal.pal
diff --git a/graphics/pokemon/scrafty/shiny.pal b/graphics/pokemon/gen_5/scrafty/shiny.pal
similarity index 100%
rename from graphics/pokemon/scrafty/shiny.pal
rename to graphics/pokemon/gen_5/scrafty/shiny.pal
diff --git a/graphics/pokemon/scraggy/anim_front.png b/graphics/pokemon/gen_5/scraggy/anim_front.png
similarity index 100%
rename from graphics/pokemon/scraggy/anim_front.png
rename to graphics/pokemon/gen_5/scraggy/anim_front.png
diff --git a/graphics/pokemon/scraggy/back.png b/graphics/pokemon/gen_5/scraggy/back.png
similarity index 100%
rename from graphics/pokemon/scraggy/back.png
rename to graphics/pokemon/gen_5/scraggy/back.png
diff --git a/graphics/pokemon/herdier/footprint.png b/graphics/pokemon/gen_5/scraggy/footprint.png
similarity index 100%
rename from graphics/pokemon/herdier/footprint.png
rename to graphics/pokemon/gen_5/scraggy/footprint.png
diff --git a/graphics/pokemon/scraggy/icon.png b/graphics/pokemon/gen_5/scraggy/icon.png
similarity index 100%
rename from graphics/pokemon/scraggy/icon.png
rename to graphics/pokemon/gen_5/scraggy/icon.png
diff --git a/graphics/pokemon/scraggy/normal.pal b/graphics/pokemon/gen_5/scraggy/normal.pal
similarity index 100%
rename from graphics/pokemon/scraggy/normal.pal
rename to graphics/pokemon/gen_5/scraggy/normal.pal
diff --git a/graphics/pokemon/scraggy/shiny.pal b/graphics/pokemon/gen_5/scraggy/shiny.pal
similarity index 100%
rename from graphics/pokemon/scraggy/shiny.pal
rename to graphics/pokemon/gen_5/scraggy/shiny.pal
diff --git a/graphics/pokemon/seismitoad/anim_front.png b/graphics/pokemon/gen_5/seismitoad/anim_front.png
similarity index 100%
rename from graphics/pokemon/seismitoad/anim_front.png
rename to graphics/pokemon/gen_5/seismitoad/anim_front.png
diff --git a/graphics/pokemon/seismitoad/back.png b/graphics/pokemon/gen_5/seismitoad/back.png
similarity index 100%
rename from graphics/pokemon/seismitoad/back.png
rename to graphics/pokemon/gen_5/seismitoad/back.png
diff --git a/graphics/pokemon/seismitoad/footprint.png b/graphics/pokemon/gen_5/seismitoad/footprint.png
similarity index 100%
rename from graphics/pokemon/seismitoad/footprint.png
rename to graphics/pokemon/gen_5/seismitoad/footprint.png
diff --git a/graphics/pokemon/seismitoad/icon.png b/graphics/pokemon/gen_5/seismitoad/icon.png
similarity index 100%
rename from graphics/pokemon/seismitoad/icon.png
rename to graphics/pokemon/gen_5/seismitoad/icon.png
diff --git a/graphics/pokemon/seismitoad/normal.pal b/graphics/pokemon/gen_5/seismitoad/normal.pal
similarity index 100%
rename from graphics/pokemon/seismitoad/normal.pal
rename to graphics/pokemon/gen_5/seismitoad/normal.pal
diff --git a/graphics/pokemon/seismitoad/shiny.pal b/graphics/pokemon/gen_5/seismitoad/shiny.pal
similarity index 100%
rename from graphics/pokemon/seismitoad/shiny.pal
rename to graphics/pokemon/gen_5/seismitoad/shiny.pal
diff --git a/graphics/pokemon/serperior/anim_front.png b/graphics/pokemon/gen_5/serperior/anim_front.png
similarity index 100%
rename from graphics/pokemon/serperior/anim_front.png
rename to graphics/pokemon/gen_5/serperior/anim_front.png
diff --git a/graphics/pokemon/serperior/back.png b/graphics/pokemon/gen_5/serperior/back.png
similarity index 100%
rename from graphics/pokemon/serperior/back.png
rename to graphics/pokemon/gen_5/serperior/back.png
diff --git a/graphics/pokemon/onix/footprint.png b/graphics/pokemon/gen_5/serperior/footprint.png
similarity index 100%
rename from graphics/pokemon/onix/footprint.png
rename to graphics/pokemon/gen_5/serperior/footprint.png
diff --git a/graphics/pokemon/serperior/icon.png b/graphics/pokemon/gen_5/serperior/icon.png
similarity index 100%
rename from graphics/pokemon/serperior/icon.png
rename to graphics/pokemon/gen_5/serperior/icon.png
diff --git a/graphics/pokemon/serperior/normal.pal b/graphics/pokemon/gen_5/serperior/normal.pal
similarity index 100%
rename from graphics/pokemon/serperior/normal.pal
rename to graphics/pokemon/gen_5/serperior/normal.pal
diff --git a/graphics/pokemon/serperior/shiny.pal b/graphics/pokemon/gen_5/serperior/shiny.pal
similarity index 100%
rename from graphics/pokemon/serperior/shiny.pal
rename to graphics/pokemon/gen_5/serperior/shiny.pal
diff --git a/graphics/pokemon/servine/anim_front.png b/graphics/pokemon/gen_5/servine/anim_front.png
similarity index 100%
rename from graphics/pokemon/servine/anim_front.png
rename to graphics/pokemon/gen_5/servine/anim_front.png
diff --git a/graphics/pokemon/servine/back.png b/graphics/pokemon/gen_5/servine/back.png
similarity index 100%
rename from graphics/pokemon/servine/back.png
rename to graphics/pokemon/gen_5/servine/back.png
diff --git a/graphics/pokemon/servine/footprint.png b/graphics/pokemon/gen_5/servine/footprint.png
similarity index 100%
rename from graphics/pokemon/servine/footprint.png
rename to graphics/pokemon/gen_5/servine/footprint.png
diff --git a/graphics/pokemon/servine/icon.png b/graphics/pokemon/gen_5/servine/icon.png
similarity index 100%
rename from graphics/pokemon/servine/icon.png
rename to graphics/pokemon/gen_5/servine/icon.png
diff --git a/graphics/pokemon/servine/normal.pal b/graphics/pokemon/gen_5/servine/normal.pal
similarity index 100%
rename from graphics/pokemon/servine/normal.pal
rename to graphics/pokemon/gen_5/servine/normal.pal
diff --git a/graphics/pokemon/servine/shiny.pal b/graphics/pokemon/gen_5/servine/shiny.pal
similarity index 100%
rename from graphics/pokemon/servine/shiny.pal
rename to graphics/pokemon/gen_5/servine/shiny.pal
diff --git a/graphics/pokemon/sewaddle/anim_front.png b/graphics/pokemon/gen_5/sewaddle/anim_front.png
similarity index 100%
rename from graphics/pokemon/sewaddle/anim_front.png
rename to graphics/pokemon/gen_5/sewaddle/anim_front.png
diff --git a/graphics/pokemon/sewaddle/back.png b/graphics/pokemon/gen_5/sewaddle/back.png
similarity index 100%
rename from graphics/pokemon/sewaddle/back.png
rename to graphics/pokemon/gen_5/sewaddle/back.png
diff --git a/graphics/pokemon/fennekin/footprint.png b/graphics/pokemon/gen_5/sewaddle/footprint.png
similarity index 100%
rename from graphics/pokemon/fennekin/footprint.png
rename to graphics/pokemon/gen_5/sewaddle/footprint.png
diff --git a/graphics/pokemon/sewaddle/icon.png b/graphics/pokemon/gen_5/sewaddle/icon.png
similarity index 100%
rename from graphics/pokemon/sewaddle/icon.png
rename to graphics/pokemon/gen_5/sewaddle/icon.png
diff --git a/graphics/pokemon/sewaddle/normal.pal b/graphics/pokemon/gen_5/sewaddle/normal.pal
similarity index 100%
rename from graphics/pokemon/sewaddle/normal.pal
rename to graphics/pokemon/gen_5/sewaddle/normal.pal
diff --git a/graphics/pokemon/sewaddle/shiny.pal b/graphics/pokemon/gen_5/sewaddle/shiny.pal
similarity index 100%
rename from graphics/pokemon/sewaddle/shiny.pal
rename to graphics/pokemon/gen_5/sewaddle/shiny.pal
diff --git a/graphics/pokemon/shelmet/anim_front.png b/graphics/pokemon/gen_5/shelmet/anim_front.png
similarity index 100%
rename from graphics/pokemon/shelmet/anim_front.png
rename to graphics/pokemon/gen_5/shelmet/anim_front.png
diff --git a/graphics/pokemon/shelmet/back.png b/graphics/pokemon/gen_5/shelmet/back.png
similarity index 100%
rename from graphics/pokemon/shelmet/back.png
rename to graphics/pokemon/gen_5/shelmet/back.png
diff --git a/graphics/pokemon/fomantis/footprint.png b/graphics/pokemon/gen_5/shelmet/footprint.png
similarity index 100%
rename from graphics/pokemon/fomantis/footprint.png
rename to graphics/pokemon/gen_5/shelmet/footprint.png
diff --git a/graphics/pokemon/shelmet/icon.png b/graphics/pokemon/gen_5/shelmet/icon.png
similarity index 100%
rename from graphics/pokemon/shelmet/icon.png
rename to graphics/pokemon/gen_5/shelmet/icon.png
diff --git a/graphics/pokemon/shelmet/normal.pal b/graphics/pokemon/gen_5/shelmet/normal.pal
similarity index 100%
rename from graphics/pokemon/shelmet/normal.pal
rename to graphics/pokemon/gen_5/shelmet/normal.pal
diff --git a/graphics/pokemon/shelmet/shiny.pal b/graphics/pokemon/gen_5/shelmet/shiny.pal
similarity index 100%
rename from graphics/pokemon/shelmet/shiny.pal
rename to graphics/pokemon/gen_5/shelmet/shiny.pal
diff --git a/graphics/pokemon/sigilyph/anim_front.png b/graphics/pokemon/gen_5/sigilyph/anim_front.png
similarity index 100%
rename from graphics/pokemon/sigilyph/anim_front.png
rename to graphics/pokemon/gen_5/sigilyph/anim_front.png
diff --git a/graphics/pokemon/sigilyph/back.png b/graphics/pokemon/gen_5/sigilyph/back.png
similarity index 100%
rename from graphics/pokemon/sigilyph/back.png
rename to graphics/pokemon/gen_5/sigilyph/back.png
diff --git a/graphics/pokemon/palossand/footprint.png b/graphics/pokemon/gen_5/sigilyph/footprint.png
similarity index 100%
rename from graphics/pokemon/palossand/footprint.png
rename to graphics/pokemon/gen_5/sigilyph/footprint.png
diff --git a/graphics/pokemon/sigilyph/icon.png b/graphics/pokemon/gen_5/sigilyph/icon.png
similarity index 100%
rename from graphics/pokemon/sigilyph/icon.png
rename to graphics/pokemon/gen_5/sigilyph/icon.png
diff --git a/graphics/pokemon/sigilyph/normal.pal b/graphics/pokemon/gen_5/sigilyph/normal.pal
similarity index 100%
rename from graphics/pokemon/sigilyph/normal.pal
rename to graphics/pokemon/gen_5/sigilyph/normal.pal
diff --git a/graphics/pokemon/sigilyph/shiny.pal b/graphics/pokemon/gen_5/sigilyph/shiny.pal
similarity index 100%
rename from graphics/pokemon/sigilyph/shiny.pal
rename to graphics/pokemon/gen_5/sigilyph/shiny.pal
diff --git a/graphics/pokemon/simipour/anim_front.png b/graphics/pokemon/gen_5/simipour/anim_front.png
similarity index 100%
rename from graphics/pokemon/simipour/anim_front.png
rename to graphics/pokemon/gen_5/simipour/anim_front.png
diff --git a/graphics/pokemon/simipour/back.png b/graphics/pokemon/gen_5/simipour/back.png
similarity index 100%
rename from graphics/pokemon/simipour/back.png
rename to graphics/pokemon/gen_5/simipour/back.png
diff --git a/graphics/pokemon/simipour/footprint.png b/graphics/pokemon/gen_5/simipour/footprint.png
similarity index 100%
rename from graphics/pokemon/simipour/footprint.png
rename to graphics/pokemon/gen_5/simipour/footprint.png
diff --git a/graphics/pokemon/simipour/icon.png b/graphics/pokemon/gen_5/simipour/icon.png
similarity index 100%
rename from graphics/pokemon/simipour/icon.png
rename to graphics/pokemon/gen_5/simipour/icon.png
diff --git a/graphics/pokemon/simipour/normal.pal b/graphics/pokemon/gen_5/simipour/normal.pal
similarity index 100%
rename from graphics/pokemon/simipour/normal.pal
rename to graphics/pokemon/gen_5/simipour/normal.pal
diff --git a/graphics/pokemon/simipour/shiny.pal b/graphics/pokemon/gen_5/simipour/shiny.pal
similarity index 100%
rename from graphics/pokemon/simipour/shiny.pal
rename to graphics/pokemon/gen_5/simipour/shiny.pal
diff --git a/graphics/pokemon/simisage/anim_front.png b/graphics/pokemon/gen_5/simisage/anim_front.png
similarity index 100%
rename from graphics/pokemon/simisage/anim_front.png
rename to graphics/pokemon/gen_5/simisage/anim_front.png
diff --git a/graphics/pokemon/simisage/back.png b/graphics/pokemon/gen_5/simisage/back.png
similarity index 100%
rename from graphics/pokemon/simisage/back.png
rename to graphics/pokemon/gen_5/simisage/back.png
diff --git a/graphics/pokemon/simisage/footprint.png b/graphics/pokemon/gen_5/simisage/footprint.png
similarity index 100%
rename from graphics/pokemon/simisage/footprint.png
rename to graphics/pokemon/gen_5/simisage/footprint.png
diff --git a/graphics/pokemon/simisage/icon.png b/graphics/pokemon/gen_5/simisage/icon.png
similarity index 100%
rename from graphics/pokemon/simisage/icon.png
rename to graphics/pokemon/gen_5/simisage/icon.png
diff --git a/graphics/pokemon/simisage/normal.pal b/graphics/pokemon/gen_5/simisage/normal.pal
similarity index 100%
rename from graphics/pokemon/simisage/normal.pal
rename to graphics/pokemon/gen_5/simisage/normal.pal
diff --git a/graphics/pokemon/simisage/shiny.pal b/graphics/pokemon/gen_5/simisage/shiny.pal
similarity index 100%
rename from graphics/pokemon/simisage/shiny.pal
rename to graphics/pokemon/gen_5/simisage/shiny.pal
diff --git a/graphics/pokemon/simisear/anim_front.png b/graphics/pokemon/gen_5/simisear/anim_front.png
similarity index 100%
rename from graphics/pokemon/simisear/anim_front.png
rename to graphics/pokemon/gen_5/simisear/anim_front.png
diff --git a/graphics/pokemon/simisear/back.png b/graphics/pokemon/gen_5/simisear/back.png
similarity index 100%
rename from graphics/pokemon/simisear/back.png
rename to graphics/pokemon/gen_5/simisear/back.png
diff --git a/graphics/pokemon/simisear/footprint.png b/graphics/pokemon/gen_5/simisear/footprint.png
similarity index 100%
rename from graphics/pokemon/simisear/footprint.png
rename to graphics/pokemon/gen_5/simisear/footprint.png
diff --git a/graphics/pokemon/simisear/icon.png b/graphics/pokemon/gen_5/simisear/icon.png
similarity index 100%
rename from graphics/pokemon/simisear/icon.png
rename to graphics/pokemon/gen_5/simisear/icon.png
diff --git a/graphics/pokemon/simisear/normal.pal b/graphics/pokemon/gen_5/simisear/normal.pal
similarity index 100%
rename from graphics/pokemon/simisear/normal.pal
rename to graphics/pokemon/gen_5/simisear/normal.pal
diff --git a/graphics/pokemon/simisear/shiny.pal b/graphics/pokemon/gen_5/simisear/shiny.pal
similarity index 100%
rename from graphics/pokemon/simisear/shiny.pal
rename to graphics/pokemon/gen_5/simisear/shiny.pal
diff --git a/graphics/pokemon/snivy/anim_front.png b/graphics/pokemon/gen_5/snivy/anim_front.png
similarity index 100%
rename from graphics/pokemon/snivy/anim_front.png
rename to graphics/pokemon/gen_5/snivy/anim_front.png
diff --git a/graphics/pokemon/snivy/back.png b/graphics/pokemon/gen_5/snivy/back.png
similarity index 100%
rename from graphics/pokemon/snivy/back.png
rename to graphics/pokemon/gen_5/snivy/back.png
diff --git a/graphics/pokemon/snivy/footprint.png b/graphics/pokemon/gen_5/snivy/footprint.png
similarity index 100%
rename from graphics/pokemon/snivy/footprint.png
rename to graphics/pokemon/gen_5/snivy/footprint.png
diff --git a/graphics/pokemon/snivy/icon.png b/graphics/pokemon/gen_5/snivy/icon.png
similarity index 100%
rename from graphics/pokemon/snivy/icon.png
rename to graphics/pokemon/gen_5/snivy/icon.png
diff --git a/graphics/pokemon/snivy/normal.pal b/graphics/pokemon/gen_5/snivy/normal.pal
similarity index 100%
rename from graphics/pokemon/snivy/normal.pal
rename to graphics/pokemon/gen_5/snivy/normal.pal
diff --git a/graphics/pokemon/snivy/shiny.pal b/graphics/pokemon/gen_5/snivy/shiny.pal
similarity index 100%
rename from graphics/pokemon/snivy/shiny.pal
rename to graphics/pokemon/gen_5/snivy/shiny.pal
diff --git a/graphics/pokemon/solosis/anim_front.png b/graphics/pokemon/gen_5/solosis/anim_front.png
similarity index 100%
rename from graphics/pokemon/solosis/anim_front.png
rename to graphics/pokemon/gen_5/solosis/anim_front.png
diff --git a/graphics/pokemon/solosis/back.png b/graphics/pokemon/gen_5/solosis/back.png
similarity index 100%
rename from graphics/pokemon/solosis/back.png
rename to graphics/pokemon/gen_5/solosis/back.png
diff --git a/graphics/pokemon/petilil/footprint.png b/graphics/pokemon/gen_5/solosis/footprint.png
similarity index 100%
rename from graphics/pokemon/petilil/footprint.png
rename to graphics/pokemon/gen_5/solosis/footprint.png
diff --git a/graphics/pokemon/solosis/icon.png b/graphics/pokemon/gen_5/solosis/icon.png
similarity index 100%
rename from graphics/pokemon/solosis/icon.png
rename to graphics/pokemon/gen_5/solosis/icon.png
diff --git a/graphics/pokemon/solosis/normal.pal b/graphics/pokemon/gen_5/solosis/normal.pal
similarity index 100%
rename from graphics/pokemon/solosis/normal.pal
rename to graphics/pokemon/gen_5/solosis/normal.pal
diff --git a/graphics/pokemon/solosis/shiny.pal b/graphics/pokemon/gen_5/solosis/shiny.pal
similarity index 100%
rename from graphics/pokemon/solosis/shiny.pal
rename to graphics/pokemon/gen_5/solosis/shiny.pal
diff --git a/graphics/pokemon/stoutland/anim_front.png b/graphics/pokemon/gen_5/stoutland/anim_front.png
similarity index 100%
rename from graphics/pokemon/stoutland/anim_front.png
rename to graphics/pokemon/gen_5/stoutland/anim_front.png
diff --git a/graphics/pokemon/stoutland/back.png b/graphics/pokemon/gen_5/stoutland/back.png
similarity index 100%
rename from graphics/pokemon/stoutland/back.png
rename to graphics/pokemon/gen_5/stoutland/back.png
diff --git a/graphics/pokemon/stoutland/footprint.png b/graphics/pokemon/gen_5/stoutland/footprint.png
similarity index 100%
rename from graphics/pokemon/stoutland/footprint.png
rename to graphics/pokemon/gen_5/stoutland/footprint.png
diff --git a/graphics/pokemon/stoutland/icon.png b/graphics/pokemon/gen_5/stoutland/icon.png
similarity index 100%
rename from graphics/pokemon/stoutland/icon.png
rename to graphics/pokemon/gen_5/stoutland/icon.png
diff --git a/graphics/pokemon/stoutland/normal.pal b/graphics/pokemon/gen_5/stoutland/normal.pal
similarity index 100%
rename from graphics/pokemon/stoutland/normal.pal
rename to graphics/pokemon/gen_5/stoutland/normal.pal
diff --git a/graphics/pokemon/stoutland/shiny.pal b/graphics/pokemon/gen_5/stoutland/shiny.pal
similarity index 100%
rename from graphics/pokemon/stoutland/shiny.pal
rename to graphics/pokemon/gen_5/stoutland/shiny.pal
diff --git a/graphics/pokemon/stunfisk/anim_front.png b/graphics/pokemon/gen_5/stunfisk/anim_front.png
similarity index 100%
rename from graphics/pokemon/stunfisk/anim_front.png
rename to graphics/pokemon/gen_5/stunfisk/anim_front.png
diff --git a/graphics/pokemon/stunfisk/back.png b/graphics/pokemon/gen_5/stunfisk/back.png
similarity index 100%
rename from graphics/pokemon/stunfisk/back.png
rename to graphics/pokemon/gen_5/stunfisk/back.png
diff --git a/graphics/pokemon/phantump/footprint.png b/graphics/pokemon/gen_5/stunfisk/footprint.png
similarity index 100%
rename from graphics/pokemon/phantump/footprint.png
rename to graphics/pokemon/gen_5/stunfisk/footprint.png
diff --git a/graphics/pokemon/stunfisk/galarian/back.png b/graphics/pokemon/gen_5/stunfisk/galarian/back.png
similarity index 100%
rename from graphics/pokemon/stunfisk/galarian/back.png
rename to graphics/pokemon/gen_5/stunfisk/galarian/back.png
diff --git a/graphics/pokemon/stunfisk/galarian/front.png b/graphics/pokemon/gen_5/stunfisk/galarian/front.png
similarity index 100%
rename from graphics/pokemon/stunfisk/galarian/front.png
rename to graphics/pokemon/gen_5/stunfisk/galarian/front.png
diff --git a/graphics/pokemon/stunfisk/galarian/icon.png b/graphics/pokemon/gen_5/stunfisk/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/stunfisk/galarian/icon.png
rename to graphics/pokemon/gen_5/stunfisk/galarian/icon.png
diff --git a/graphics/pokemon/stunfisk/galarian/normal.pal b/graphics/pokemon/gen_5/stunfisk/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/stunfisk/galarian/normal.pal
rename to graphics/pokemon/gen_5/stunfisk/galarian/normal.pal
diff --git a/graphics/pokemon/stunfisk/galarian/shiny.pal b/graphics/pokemon/gen_5/stunfisk/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/stunfisk/galarian/shiny.pal
rename to graphics/pokemon/gen_5/stunfisk/galarian/shiny.pal
diff --git a/graphics/pokemon/stunfisk/icon.png b/graphics/pokemon/gen_5/stunfisk/icon.png
similarity index 100%
rename from graphics/pokemon/stunfisk/icon.png
rename to graphics/pokemon/gen_5/stunfisk/icon.png
diff --git a/graphics/pokemon/stunfisk/normal.pal b/graphics/pokemon/gen_5/stunfisk/normal.pal
similarity index 100%
rename from graphics/pokemon/stunfisk/normal.pal
rename to graphics/pokemon/gen_5/stunfisk/normal.pal
diff --git a/graphics/pokemon/stunfisk/shiny.pal b/graphics/pokemon/gen_5/stunfisk/shiny.pal
similarity index 100%
rename from graphics/pokemon/stunfisk/shiny.pal
rename to graphics/pokemon/gen_5/stunfisk/shiny.pal
diff --git a/graphics/pokemon/swadloon/anim_front.png b/graphics/pokemon/gen_5/swadloon/anim_front.png
similarity index 100%
rename from graphics/pokemon/swadloon/anim_front.png
rename to graphics/pokemon/gen_5/swadloon/anim_front.png
diff --git a/graphics/pokemon/swadloon/back.png b/graphics/pokemon/gen_5/swadloon/back.png
similarity index 100%
rename from graphics/pokemon/swadloon/back.png
rename to graphics/pokemon/gen_5/swadloon/back.png
diff --git a/graphics/pokemon/phione/footprint.png b/graphics/pokemon/gen_5/swadloon/footprint.png
similarity index 100%
rename from graphics/pokemon/phione/footprint.png
rename to graphics/pokemon/gen_5/swadloon/footprint.png
diff --git a/graphics/pokemon/swadloon/icon.png b/graphics/pokemon/gen_5/swadloon/icon.png
similarity index 100%
rename from graphics/pokemon/swadloon/icon.png
rename to graphics/pokemon/gen_5/swadloon/icon.png
diff --git a/graphics/pokemon/swadloon/normal.pal b/graphics/pokemon/gen_5/swadloon/normal.pal
similarity index 100%
rename from graphics/pokemon/swadloon/normal.pal
rename to graphics/pokemon/gen_5/swadloon/normal.pal
diff --git a/graphics/pokemon/swadloon/shiny.pal b/graphics/pokemon/gen_5/swadloon/shiny.pal
similarity index 100%
rename from graphics/pokemon/swadloon/shiny.pal
rename to graphics/pokemon/gen_5/swadloon/shiny.pal
diff --git a/graphics/pokemon/swanna/anim_front.png b/graphics/pokemon/gen_5/swanna/anim_front.png
similarity index 100%
rename from graphics/pokemon/swanna/anim_front.png
rename to graphics/pokemon/gen_5/swanna/anim_front.png
diff --git a/graphics/pokemon/swanna/back.png b/graphics/pokemon/gen_5/swanna/back.png
similarity index 100%
rename from graphics/pokemon/swanna/back.png
rename to graphics/pokemon/gen_5/swanna/back.png
diff --git a/graphics/pokemon/swanna/footprint.png b/graphics/pokemon/gen_5/swanna/footprint.png
similarity index 100%
rename from graphics/pokemon/swanna/footprint.png
rename to graphics/pokemon/gen_5/swanna/footprint.png
diff --git a/graphics/pokemon/swanna/icon.png b/graphics/pokemon/gen_5/swanna/icon.png
similarity index 100%
rename from graphics/pokemon/swanna/icon.png
rename to graphics/pokemon/gen_5/swanna/icon.png
diff --git a/graphics/pokemon/swanna/normal.pal b/graphics/pokemon/gen_5/swanna/normal.pal
similarity index 100%
rename from graphics/pokemon/swanna/normal.pal
rename to graphics/pokemon/gen_5/swanna/normal.pal
diff --git a/graphics/pokemon/swanna/shiny.pal b/graphics/pokemon/gen_5/swanna/shiny.pal
similarity index 100%
rename from graphics/pokemon/swanna/shiny.pal
rename to graphics/pokemon/gen_5/swanna/shiny.pal
diff --git a/graphics/pokemon/swoobat/anim_front.png b/graphics/pokemon/gen_5/swoobat/anim_front.png
similarity index 100%
rename from graphics/pokemon/swoobat/anim_front.png
rename to graphics/pokemon/gen_5/swoobat/anim_front.png
diff --git a/graphics/pokemon/swoobat/back.png b/graphics/pokemon/gen_5/swoobat/back.png
similarity index 100%
rename from graphics/pokemon/swoobat/back.png
rename to graphics/pokemon/gen_5/swoobat/back.png
diff --git a/graphics/pokemon/swoobat/footprint.png b/graphics/pokemon/gen_5/swoobat/footprint.png
similarity index 100%
rename from graphics/pokemon/swoobat/footprint.png
rename to graphics/pokemon/gen_5/swoobat/footprint.png
diff --git a/graphics/pokemon/swoobat/icon.png b/graphics/pokemon/gen_5/swoobat/icon.png
similarity index 100%
rename from graphics/pokemon/swoobat/icon.png
rename to graphics/pokemon/gen_5/swoobat/icon.png
diff --git a/graphics/pokemon/swoobat/normal.pal b/graphics/pokemon/gen_5/swoobat/normal.pal
similarity index 100%
rename from graphics/pokemon/swoobat/normal.pal
rename to graphics/pokemon/gen_5/swoobat/normal.pal
diff --git a/graphics/pokemon/swoobat/shiny.pal b/graphics/pokemon/gen_5/swoobat/shiny.pal
similarity index 100%
rename from graphics/pokemon/swoobat/shiny.pal
rename to graphics/pokemon/gen_5/swoobat/shiny.pal
diff --git a/graphics/pokemon/tepig/anim_front.png b/graphics/pokemon/gen_5/tepig/anim_front.png
similarity index 100%
rename from graphics/pokemon/tepig/anim_front.png
rename to graphics/pokemon/gen_5/tepig/anim_front.png
diff --git a/graphics/pokemon/tepig/back.png b/graphics/pokemon/gen_5/tepig/back.png
similarity index 100%
rename from graphics/pokemon/tepig/back.png
rename to graphics/pokemon/gen_5/tepig/back.png
diff --git a/graphics/pokemon/tepig/footprint.png b/graphics/pokemon/gen_5/tepig/footprint.png
similarity index 100%
rename from graphics/pokemon/tepig/footprint.png
rename to graphics/pokemon/gen_5/tepig/footprint.png
diff --git a/graphics/pokemon/tepig/icon.png b/graphics/pokemon/gen_5/tepig/icon.png
similarity index 100%
rename from graphics/pokemon/tepig/icon.png
rename to graphics/pokemon/gen_5/tepig/icon.png
diff --git a/graphics/pokemon/tepig/normal.pal b/graphics/pokemon/gen_5/tepig/normal.pal
similarity index 100%
rename from graphics/pokemon/tepig/normal.pal
rename to graphics/pokemon/gen_5/tepig/normal.pal
diff --git a/graphics/pokemon/tepig/shiny.pal b/graphics/pokemon/gen_5/tepig/shiny.pal
similarity index 100%
rename from graphics/pokemon/tepig/shiny.pal
rename to graphics/pokemon/gen_5/tepig/shiny.pal
diff --git a/graphics/pokemon/terrakion/anim_front.png b/graphics/pokemon/gen_5/terrakion/anim_front.png
similarity index 100%
rename from graphics/pokemon/terrakion/anim_front.png
rename to graphics/pokemon/gen_5/terrakion/anim_front.png
diff --git a/graphics/pokemon/terrakion/back.png b/graphics/pokemon/gen_5/terrakion/back.png
similarity index 100%
rename from graphics/pokemon/terrakion/back.png
rename to graphics/pokemon/gen_5/terrakion/back.png
diff --git a/graphics/pokemon/terrakion/footprint.png b/graphics/pokemon/gen_5/terrakion/footprint.png
similarity index 100%
rename from graphics/pokemon/terrakion/footprint.png
rename to graphics/pokemon/gen_5/terrakion/footprint.png
diff --git a/graphics/pokemon/terrakion/icon.png b/graphics/pokemon/gen_5/terrakion/icon.png
similarity index 100%
rename from graphics/pokemon/terrakion/icon.png
rename to graphics/pokemon/gen_5/terrakion/icon.png
diff --git a/graphics/pokemon/terrakion/normal.pal b/graphics/pokemon/gen_5/terrakion/normal.pal
similarity index 100%
rename from graphics/pokemon/terrakion/normal.pal
rename to graphics/pokemon/gen_5/terrakion/normal.pal
diff --git a/graphics/pokemon/terrakion/shiny.pal b/graphics/pokemon/gen_5/terrakion/shiny.pal
similarity index 100%
rename from graphics/pokemon/terrakion/shiny.pal
rename to graphics/pokemon/gen_5/terrakion/shiny.pal
diff --git a/graphics/pokemon/throh/anim_front.png b/graphics/pokemon/gen_5/throh/anim_front.png
similarity index 100%
rename from graphics/pokemon/throh/anim_front.png
rename to graphics/pokemon/gen_5/throh/anim_front.png
diff --git a/graphics/pokemon/throh/back.png b/graphics/pokemon/gen_5/throh/back.png
similarity index 100%
rename from graphics/pokemon/throh/back.png
rename to graphics/pokemon/gen_5/throh/back.png
diff --git a/graphics/pokemon/throh/footprint.png b/graphics/pokemon/gen_5/throh/footprint.png
similarity index 100%
rename from graphics/pokemon/throh/footprint.png
rename to graphics/pokemon/gen_5/throh/footprint.png
diff --git a/graphics/pokemon/throh/icon.png b/graphics/pokemon/gen_5/throh/icon.png
similarity index 100%
rename from graphics/pokemon/throh/icon.png
rename to graphics/pokemon/gen_5/throh/icon.png
diff --git a/graphics/pokemon/throh/normal.pal b/graphics/pokemon/gen_5/throh/normal.pal
similarity index 100%
rename from graphics/pokemon/throh/normal.pal
rename to graphics/pokemon/gen_5/throh/normal.pal
diff --git a/graphics/pokemon/throh/shiny.pal b/graphics/pokemon/gen_5/throh/shiny.pal
similarity index 100%
rename from graphics/pokemon/throh/shiny.pal
rename to graphics/pokemon/gen_5/throh/shiny.pal
diff --git a/graphics/pokemon/thundurus/anim_front.png b/graphics/pokemon/gen_5/thundurus/anim_front.png
similarity index 100%
rename from graphics/pokemon/thundurus/anim_front.png
rename to graphics/pokemon/gen_5/thundurus/anim_front.png
diff --git a/graphics/pokemon/thundurus/back.png b/graphics/pokemon/gen_5/thundurus/back.png
similarity index 100%
rename from graphics/pokemon/thundurus/back.png
rename to graphics/pokemon/gen_5/thundurus/back.png
diff --git a/graphics/pokemon/pineco/footprint.png b/graphics/pokemon/gen_5/thundurus/footprint.png
similarity index 100%
rename from graphics/pokemon/pineco/footprint.png
rename to graphics/pokemon/gen_5/thundurus/footprint.png
diff --git a/graphics/pokemon/thundurus/icon.png b/graphics/pokemon/gen_5/thundurus/icon.png
similarity index 100%
rename from graphics/pokemon/thundurus/icon.png
rename to graphics/pokemon/gen_5/thundurus/icon.png
diff --git a/graphics/pokemon/thundurus/normal.pal b/graphics/pokemon/gen_5/thundurus/normal.pal
similarity index 100%
rename from graphics/pokemon/thundurus/normal.pal
rename to graphics/pokemon/gen_5/thundurus/normal.pal
diff --git a/graphics/pokemon/thundurus/shiny.pal b/graphics/pokemon/gen_5/thundurus/shiny.pal
similarity index 100%
rename from graphics/pokemon/thundurus/shiny.pal
rename to graphics/pokemon/gen_5/thundurus/shiny.pal
diff --git a/graphics/pokemon/thundurus/therian/anim_front.png b/graphics/pokemon/gen_5/thundurus/therian/anim_front.png
similarity index 100%
rename from graphics/pokemon/thundurus/therian/anim_front.png
rename to graphics/pokemon/gen_5/thundurus/therian/anim_front.png
diff --git a/graphics/pokemon/thundurus/therian/back.png b/graphics/pokemon/gen_5/thundurus/therian/back.png
similarity index 100%
rename from graphics/pokemon/thundurus/therian/back.png
rename to graphics/pokemon/gen_5/thundurus/therian/back.png
diff --git a/graphics/pokemon/thundurus/therian/icon.png b/graphics/pokemon/gen_5/thundurus/therian/icon.png
similarity index 100%
rename from graphics/pokemon/thundurus/therian/icon.png
rename to graphics/pokemon/gen_5/thundurus/therian/icon.png
diff --git a/graphics/pokemon/thundurus/therian/normal.pal b/graphics/pokemon/gen_5/thundurus/therian/normal.pal
similarity index 100%
rename from graphics/pokemon/thundurus/therian/normal.pal
rename to graphics/pokemon/gen_5/thundurus/therian/normal.pal
diff --git a/graphics/pokemon/thundurus/therian/shiny.pal b/graphics/pokemon/gen_5/thundurus/therian/shiny.pal
similarity index 100%
rename from graphics/pokemon/thundurus/therian/shiny.pal
rename to graphics/pokemon/gen_5/thundurus/therian/shiny.pal
diff --git a/graphics/pokemon/timburr/anim_front.png b/graphics/pokemon/gen_5/timburr/anim_front.png
similarity index 100%
rename from graphics/pokemon/timburr/anim_front.png
rename to graphics/pokemon/gen_5/timburr/anim_front.png
diff --git a/graphics/pokemon/timburr/back.png b/graphics/pokemon/gen_5/timburr/back.png
similarity index 100%
rename from graphics/pokemon/timburr/back.png
rename to graphics/pokemon/gen_5/timburr/back.png
diff --git a/graphics/pokemon/timburr/footprint.png b/graphics/pokemon/gen_5/timburr/footprint.png
similarity index 100%
rename from graphics/pokemon/timburr/footprint.png
rename to graphics/pokemon/gen_5/timburr/footprint.png
diff --git a/graphics/pokemon/timburr/icon.png b/graphics/pokemon/gen_5/timburr/icon.png
similarity index 100%
rename from graphics/pokemon/timburr/icon.png
rename to graphics/pokemon/gen_5/timburr/icon.png
diff --git a/graphics/pokemon/timburr/normal.pal b/graphics/pokemon/gen_5/timburr/normal.pal
similarity index 100%
rename from graphics/pokemon/timburr/normal.pal
rename to graphics/pokemon/gen_5/timburr/normal.pal
diff --git a/graphics/pokemon/timburr/shiny.pal b/graphics/pokemon/gen_5/timburr/shiny.pal
similarity index 100%
rename from graphics/pokemon/timburr/shiny.pal
rename to graphics/pokemon/gen_5/timburr/shiny.pal
diff --git a/graphics/pokemon/tirtouga/anim_front.png b/graphics/pokemon/gen_5/tirtouga/anim_front.png
similarity index 100%
rename from graphics/pokemon/tirtouga/anim_front.png
rename to graphics/pokemon/gen_5/tirtouga/anim_front.png
diff --git a/graphics/pokemon/tirtouga/back.png b/graphics/pokemon/gen_5/tirtouga/back.png
similarity index 100%
rename from graphics/pokemon/tirtouga/back.png
rename to graphics/pokemon/gen_5/tirtouga/back.png
diff --git a/graphics/pokemon/popplio/footprint.png b/graphics/pokemon/gen_5/tirtouga/footprint.png
similarity index 100%
rename from graphics/pokemon/popplio/footprint.png
rename to graphics/pokemon/gen_5/tirtouga/footprint.png
diff --git a/graphics/pokemon/tirtouga/icon.png b/graphics/pokemon/gen_5/tirtouga/icon.png
similarity index 100%
rename from graphics/pokemon/tirtouga/icon.png
rename to graphics/pokemon/gen_5/tirtouga/icon.png
diff --git a/graphics/pokemon/tirtouga/normal.pal b/graphics/pokemon/gen_5/tirtouga/normal.pal
similarity index 100%
rename from graphics/pokemon/tirtouga/normal.pal
rename to graphics/pokemon/gen_5/tirtouga/normal.pal
diff --git a/graphics/pokemon/tirtouga/shiny.pal b/graphics/pokemon/gen_5/tirtouga/shiny.pal
similarity index 100%
rename from graphics/pokemon/tirtouga/shiny.pal
rename to graphics/pokemon/gen_5/tirtouga/shiny.pal
diff --git a/graphics/pokemon/tornadus/anim_front.png b/graphics/pokemon/gen_5/tornadus/anim_front.png
similarity index 100%
rename from graphics/pokemon/tornadus/anim_front.png
rename to graphics/pokemon/gen_5/tornadus/anim_front.png
diff --git a/graphics/pokemon/tornadus/back.png b/graphics/pokemon/gen_5/tornadus/back.png
similarity index 100%
rename from graphics/pokemon/tornadus/back.png
rename to graphics/pokemon/gen_5/tornadus/back.png
diff --git a/graphics/pokemon/primarina/footprint.png b/graphics/pokemon/gen_5/tornadus/footprint.png
similarity index 100%
rename from graphics/pokemon/primarina/footprint.png
rename to graphics/pokemon/gen_5/tornadus/footprint.png
diff --git a/graphics/pokemon/tornadus/icon.png b/graphics/pokemon/gen_5/tornadus/icon.png
similarity index 100%
rename from graphics/pokemon/tornadus/icon.png
rename to graphics/pokemon/gen_5/tornadus/icon.png
diff --git a/graphics/pokemon/tornadus/normal.pal b/graphics/pokemon/gen_5/tornadus/normal.pal
similarity index 100%
rename from graphics/pokemon/tornadus/normal.pal
rename to graphics/pokemon/gen_5/tornadus/normal.pal
diff --git a/graphics/pokemon/tornadus/shiny.pal b/graphics/pokemon/gen_5/tornadus/shiny.pal
similarity index 100%
rename from graphics/pokemon/tornadus/shiny.pal
rename to graphics/pokemon/gen_5/tornadus/shiny.pal
diff --git a/graphics/pokemon/tornadus/therian/anim_front.png b/graphics/pokemon/gen_5/tornadus/therian/anim_front.png
similarity index 100%
rename from graphics/pokemon/tornadus/therian/anim_front.png
rename to graphics/pokemon/gen_5/tornadus/therian/anim_front.png
diff --git a/graphics/pokemon/tornadus/therian/back.png b/graphics/pokemon/gen_5/tornadus/therian/back.png
similarity index 100%
rename from graphics/pokemon/tornadus/therian/back.png
rename to graphics/pokemon/gen_5/tornadus/therian/back.png
diff --git a/graphics/pokemon/tornadus/therian/icon.png b/graphics/pokemon/gen_5/tornadus/therian/icon.png
similarity index 100%
rename from graphics/pokemon/tornadus/therian/icon.png
rename to graphics/pokemon/gen_5/tornadus/therian/icon.png
diff --git a/graphics/pokemon/tornadus/therian/normal.pal b/graphics/pokemon/gen_5/tornadus/therian/normal.pal
similarity index 100%
rename from graphics/pokemon/tornadus/therian/normal.pal
rename to graphics/pokemon/gen_5/tornadus/therian/normal.pal
diff --git a/graphics/pokemon/tornadus/therian/shiny.pal b/graphics/pokemon/gen_5/tornadus/therian/shiny.pal
similarity index 100%
rename from graphics/pokemon/tornadus/therian/shiny.pal
rename to graphics/pokemon/gen_5/tornadus/therian/shiny.pal
diff --git a/graphics/pokemon/tranquill/anim_front.png b/graphics/pokemon/gen_5/tranquill/anim_front.png
similarity index 100%
rename from graphics/pokemon/tranquill/anim_front.png
rename to graphics/pokemon/gen_5/tranquill/anim_front.png
diff --git a/graphics/pokemon/tranquill/back.png b/graphics/pokemon/gen_5/tranquill/back.png
similarity index 100%
rename from graphics/pokemon/tranquill/back.png
rename to graphics/pokemon/gen_5/tranquill/back.png
diff --git a/graphics/pokemon/tranquill/footprint.png b/graphics/pokemon/gen_5/tranquill/footprint.png
similarity index 100%
rename from graphics/pokemon/tranquill/footprint.png
rename to graphics/pokemon/gen_5/tranquill/footprint.png
diff --git a/graphics/pokemon/tranquill/icon.png b/graphics/pokemon/gen_5/tranquill/icon.png
similarity index 100%
rename from graphics/pokemon/tranquill/icon.png
rename to graphics/pokemon/gen_5/tranquill/icon.png
diff --git a/graphics/pokemon/tranquill/normal.pal b/graphics/pokemon/gen_5/tranquill/normal.pal
similarity index 100%
rename from graphics/pokemon/tranquill/normal.pal
rename to graphics/pokemon/gen_5/tranquill/normal.pal
diff --git a/graphics/pokemon/tranquill/shiny.pal b/graphics/pokemon/gen_5/tranquill/shiny.pal
similarity index 100%
rename from graphics/pokemon/tranquill/shiny.pal
rename to graphics/pokemon/gen_5/tranquill/shiny.pal
diff --git a/graphics/pokemon/trubbish/anim_front.png b/graphics/pokemon/gen_5/trubbish/anim_front.png
similarity index 100%
rename from graphics/pokemon/trubbish/anim_front.png
rename to graphics/pokemon/gen_5/trubbish/anim_front.png
diff --git a/graphics/pokemon/trubbish/back.png b/graphics/pokemon/gen_5/trubbish/back.png
similarity index 100%
rename from graphics/pokemon/trubbish/back.png
rename to graphics/pokemon/gen_5/trubbish/back.png
diff --git a/graphics/pokemon/trubbish/footprint.png b/graphics/pokemon/gen_5/trubbish/footprint.png
similarity index 100%
rename from graphics/pokemon/trubbish/footprint.png
rename to graphics/pokemon/gen_5/trubbish/footprint.png
diff --git a/graphics/pokemon/trubbish/icon.png b/graphics/pokemon/gen_5/trubbish/icon.png
similarity index 100%
rename from graphics/pokemon/trubbish/icon.png
rename to graphics/pokemon/gen_5/trubbish/icon.png
diff --git a/graphics/pokemon/trubbish/normal.pal b/graphics/pokemon/gen_5/trubbish/normal.pal
similarity index 100%
rename from graphics/pokemon/trubbish/normal.pal
rename to graphics/pokemon/gen_5/trubbish/normal.pal
diff --git a/graphics/pokemon/trubbish/shiny.pal b/graphics/pokemon/gen_5/trubbish/shiny.pal
similarity index 100%
rename from graphics/pokemon/trubbish/shiny.pal
rename to graphics/pokemon/gen_5/trubbish/shiny.pal
diff --git a/graphics/pokemon/tympole/anim_front.png b/graphics/pokemon/gen_5/tympole/anim_front.png
similarity index 100%
rename from graphics/pokemon/tympole/anim_front.png
rename to graphics/pokemon/gen_5/tympole/anim_front.png
diff --git a/graphics/pokemon/tympole/back.png b/graphics/pokemon/gen_5/tympole/back.png
similarity index 100%
rename from graphics/pokemon/tympole/back.png
rename to graphics/pokemon/gen_5/tympole/back.png
diff --git a/graphics/pokemon/pupitar/footprint.png b/graphics/pokemon/gen_5/tympole/footprint.png
similarity index 100%
rename from graphics/pokemon/pupitar/footprint.png
rename to graphics/pokemon/gen_5/tympole/footprint.png
diff --git a/graphics/pokemon/tympole/icon.png b/graphics/pokemon/gen_5/tympole/icon.png
similarity index 100%
rename from graphics/pokemon/tympole/icon.png
rename to graphics/pokemon/gen_5/tympole/icon.png
diff --git a/graphics/pokemon/tympole/normal.pal b/graphics/pokemon/gen_5/tympole/normal.pal
similarity index 100%
rename from graphics/pokemon/tympole/normal.pal
rename to graphics/pokemon/gen_5/tympole/normal.pal
diff --git a/graphics/pokemon/tympole/shiny.pal b/graphics/pokemon/gen_5/tympole/shiny.pal
similarity index 100%
rename from graphics/pokemon/tympole/shiny.pal
rename to graphics/pokemon/gen_5/tympole/shiny.pal
diff --git a/graphics/pokemon/tynamo/anim_front.png b/graphics/pokemon/gen_5/tynamo/anim_front.png
similarity index 100%
rename from graphics/pokemon/tynamo/anim_front.png
rename to graphics/pokemon/gen_5/tynamo/anim_front.png
diff --git a/graphics/pokemon/tynamo/back.png b/graphics/pokemon/gen_5/tynamo/back.png
similarity index 100%
rename from graphics/pokemon/tynamo/back.png
rename to graphics/pokemon/gen_5/tynamo/back.png
diff --git a/graphics/pokemon/pyukumuku/footprint.png b/graphics/pokemon/gen_5/tynamo/footprint.png
similarity index 100%
rename from graphics/pokemon/pyukumuku/footprint.png
rename to graphics/pokemon/gen_5/tynamo/footprint.png
diff --git a/graphics/pokemon/tynamo/icon.png b/graphics/pokemon/gen_5/tynamo/icon.png
similarity index 100%
rename from graphics/pokemon/tynamo/icon.png
rename to graphics/pokemon/gen_5/tynamo/icon.png
diff --git a/graphics/pokemon/tynamo/normal.pal b/graphics/pokemon/gen_5/tynamo/normal.pal
similarity index 100%
rename from graphics/pokemon/tynamo/normal.pal
rename to graphics/pokemon/gen_5/tynamo/normal.pal
diff --git a/graphics/pokemon/tynamo/shiny.pal b/graphics/pokemon/gen_5/tynamo/shiny.pal
similarity index 100%
rename from graphics/pokemon/tynamo/shiny.pal
rename to graphics/pokemon/gen_5/tynamo/shiny.pal
diff --git a/graphics/pokemon/unfezant/anim_front.png b/graphics/pokemon/gen_5/unfezant/anim_front.png
similarity index 100%
rename from graphics/pokemon/unfezant/anim_front.png
rename to graphics/pokemon/gen_5/unfezant/anim_front.png
diff --git a/graphics/pokemon/unfezant/anim_frontf.png b/graphics/pokemon/gen_5/unfezant/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/unfezant/anim_frontf.png
rename to graphics/pokemon/gen_5/unfezant/anim_frontf.png
diff --git a/graphics/pokemon/unfezant/back.png b/graphics/pokemon/gen_5/unfezant/back.png
similarity index 100%
rename from graphics/pokemon/unfezant/back.png
rename to graphics/pokemon/gen_5/unfezant/back.png
diff --git a/graphics/pokemon/unfezant/backf.png b/graphics/pokemon/gen_5/unfezant/backf.png
similarity index 100%
rename from graphics/pokemon/unfezant/backf.png
rename to graphics/pokemon/gen_5/unfezant/backf.png
diff --git a/graphics/pokemon/unfezant/footprint.png b/graphics/pokemon/gen_5/unfezant/footprint.png
similarity index 100%
rename from graphics/pokemon/unfezant/footprint.png
rename to graphics/pokemon/gen_5/unfezant/footprint.png
diff --git a/graphics/pokemon/unfezant/frontf.png b/graphics/pokemon/gen_5/unfezant/frontf.png
similarity index 100%
rename from graphics/pokemon/unfezant/frontf.png
rename to graphics/pokemon/gen_5/unfezant/frontf.png
diff --git a/graphics/pokemon/unfezant/icon.png b/graphics/pokemon/gen_5/unfezant/icon.png
similarity index 100%
rename from graphics/pokemon/unfezant/icon.png
rename to graphics/pokemon/gen_5/unfezant/icon.png
diff --git a/graphics/pokemon/unfezant/iconf.png b/graphics/pokemon/gen_5/unfezant/iconf.png
similarity index 100%
rename from graphics/pokemon/unfezant/iconf.png
rename to graphics/pokemon/gen_5/unfezant/iconf.png
diff --git a/graphics/pokemon/unfezant/normal.pal b/graphics/pokemon/gen_5/unfezant/normal.pal
similarity index 100%
rename from graphics/pokemon/unfezant/normal.pal
rename to graphics/pokemon/gen_5/unfezant/normal.pal
diff --git a/graphics/pokemon/unfezant/normalf.pal b/graphics/pokemon/gen_5/unfezant/normalf.pal
similarity index 100%
rename from graphics/pokemon/unfezant/normalf.pal
rename to graphics/pokemon/gen_5/unfezant/normalf.pal
diff --git a/graphics/pokemon/unfezant/shiny.pal b/graphics/pokemon/gen_5/unfezant/shiny.pal
similarity index 100%
rename from graphics/pokemon/unfezant/shiny.pal
rename to graphics/pokemon/gen_5/unfezant/shiny.pal
diff --git a/graphics/pokemon/unfezant/shinyf.pal b/graphics/pokemon/gen_5/unfezant/shinyf.pal
similarity index 100%
rename from graphics/pokemon/unfezant/shinyf.pal
rename to graphics/pokemon/gen_5/unfezant/shinyf.pal
diff --git a/graphics/pokemon/vanillish/anim_front.png b/graphics/pokemon/gen_5/vanillish/anim_front.png
similarity index 100%
rename from graphics/pokemon/vanillish/anim_front.png
rename to graphics/pokemon/gen_5/vanillish/anim_front.png
diff --git a/graphics/pokemon/vanillish/back.png b/graphics/pokemon/gen_5/vanillish/back.png
similarity index 100%
rename from graphics/pokemon/vanillish/back.png
rename to graphics/pokemon/gen_5/vanillish/back.png
diff --git a/graphics/pokemon/qwilfish/footprint.png b/graphics/pokemon/gen_5/vanillish/footprint.png
similarity index 100%
rename from graphics/pokemon/qwilfish/footprint.png
rename to graphics/pokemon/gen_5/vanillish/footprint.png
diff --git a/graphics/pokemon/vanillish/icon.png b/graphics/pokemon/gen_5/vanillish/icon.png
similarity index 100%
rename from graphics/pokemon/vanillish/icon.png
rename to graphics/pokemon/gen_5/vanillish/icon.png
diff --git a/graphics/pokemon/vanillish/normal.pal b/graphics/pokemon/gen_5/vanillish/normal.pal
similarity index 100%
rename from graphics/pokemon/vanillish/normal.pal
rename to graphics/pokemon/gen_5/vanillish/normal.pal
diff --git a/graphics/pokemon/vanillish/shiny.pal b/graphics/pokemon/gen_5/vanillish/shiny.pal
similarity index 100%
rename from graphics/pokemon/vanillish/shiny.pal
rename to graphics/pokemon/gen_5/vanillish/shiny.pal
diff --git a/graphics/pokemon/vanillite/anim_front.png b/graphics/pokemon/gen_5/vanillite/anim_front.png
similarity index 100%
rename from graphics/pokemon/vanillite/anim_front.png
rename to graphics/pokemon/gen_5/vanillite/anim_front.png
diff --git a/graphics/pokemon/vanillite/back.png b/graphics/pokemon/gen_5/vanillite/back.png
similarity index 100%
rename from graphics/pokemon/vanillite/back.png
rename to graphics/pokemon/gen_5/vanillite/back.png
diff --git a/graphics/pokemon/rayquaza/footprint.png b/graphics/pokemon/gen_5/vanillite/footprint.png
similarity index 100%
rename from graphics/pokemon/rayquaza/footprint.png
rename to graphics/pokemon/gen_5/vanillite/footprint.png
diff --git a/graphics/pokemon/vanillite/icon.png b/graphics/pokemon/gen_5/vanillite/icon.png
similarity index 100%
rename from graphics/pokemon/vanillite/icon.png
rename to graphics/pokemon/gen_5/vanillite/icon.png
diff --git a/graphics/pokemon/vanillite/normal.pal b/graphics/pokemon/gen_5/vanillite/normal.pal
similarity index 100%
rename from graphics/pokemon/vanillite/normal.pal
rename to graphics/pokemon/gen_5/vanillite/normal.pal
diff --git a/graphics/pokemon/vanillite/shiny.pal b/graphics/pokemon/gen_5/vanillite/shiny.pal
similarity index 100%
rename from graphics/pokemon/vanillite/shiny.pal
rename to graphics/pokemon/gen_5/vanillite/shiny.pal
diff --git a/graphics/pokemon/vanilluxe/anim_front.png b/graphics/pokemon/gen_5/vanilluxe/anim_front.png
similarity index 100%
rename from graphics/pokemon/vanilluxe/anim_front.png
rename to graphics/pokemon/gen_5/vanilluxe/anim_front.png
diff --git a/graphics/pokemon/vanilluxe/back.png b/graphics/pokemon/gen_5/vanilluxe/back.png
similarity index 100%
rename from graphics/pokemon/vanilluxe/back.png
rename to graphics/pokemon/gen_5/vanilluxe/back.png
diff --git a/graphics/pokemon/relicanth/footprint.png b/graphics/pokemon/gen_5/vanilluxe/footprint.png
similarity index 100%
rename from graphics/pokemon/relicanth/footprint.png
rename to graphics/pokemon/gen_5/vanilluxe/footprint.png
diff --git a/graphics/pokemon/vanilluxe/icon.png b/graphics/pokemon/gen_5/vanilluxe/icon.png
similarity index 100%
rename from graphics/pokemon/vanilluxe/icon.png
rename to graphics/pokemon/gen_5/vanilluxe/icon.png
diff --git a/graphics/pokemon/vanilluxe/normal.pal b/graphics/pokemon/gen_5/vanilluxe/normal.pal
similarity index 100%
rename from graphics/pokemon/vanilluxe/normal.pal
rename to graphics/pokemon/gen_5/vanilluxe/normal.pal
diff --git a/graphics/pokemon/vanilluxe/shiny.pal b/graphics/pokemon/gen_5/vanilluxe/shiny.pal
similarity index 100%
rename from graphics/pokemon/vanilluxe/shiny.pal
rename to graphics/pokemon/gen_5/vanilluxe/shiny.pal
diff --git a/graphics/pokemon/venipede/anim_front.png b/graphics/pokemon/gen_5/venipede/anim_front.png
similarity index 100%
rename from graphics/pokemon/venipede/anim_front.png
rename to graphics/pokemon/gen_5/venipede/anim_front.png
diff --git a/graphics/pokemon/venipede/back.png b/graphics/pokemon/gen_5/venipede/back.png
similarity index 100%
rename from graphics/pokemon/venipede/back.png
rename to graphics/pokemon/gen_5/venipede/back.png
diff --git a/graphics/pokemon/gothita/footprint.png b/graphics/pokemon/gen_5/venipede/footprint.png
similarity index 100%
rename from graphics/pokemon/gothita/footprint.png
rename to graphics/pokemon/gen_5/venipede/footprint.png
diff --git a/graphics/pokemon/venipede/icon.png b/graphics/pokemon/gen_5/venipede/icon.png
similarity index 100%
rename from graphics/pokemon/venipede/icon.png
rename to graphics/pokemon/gen_5/venipede/icon.png
diff --git a/graphics/pokemon/venipede/normal.pal b/graphics/pokemon/gen_5/venipede/normal.pal
similarity index 100%
rename from graphics/pokemon/venipede/normal.pal
rename to graphics/pokemon/gen_5/venipede/normal.pal
diff --git a/graphics/pokemon/venipede/shiny.pal b/graphics/pokemon/gen_5/venipede/shiny.pal
similarity index 100%
rename from graphics/pokemon/venipede/shiny.pal
rename to graphics/pokemon/gen_5/venipede/shiny.pal
diff --git a/graphics/pokemon/victini/anim_front.png b/graphics/pokemon/gen_5/victini/anim_front.png
similarity index 100%
rename from graphics/pokemon/victini/anim_front.png
rename to graphics/pokemon/gen_5/victini/anim_front.png
diff --git a/graphics/pokemon/victini/back.png b/graphics/pokemon/gen_5/victini/back.png
similarity index 100%
rename from graphics/pokemon/victini/back.png
rename to graphics/pokemon/gen_5/victini/back.png
diff --git a/graphics/pokemon/victini/footprint.png b/graphics/pokemon/gen_5/victini/footprint.png
similarity index 100%
rename from graphics/pokemon/victini/footprint.png
rename to graphics/pokemon/gen_5/victini/footprint.png
diff --git a/graphics/pokemon/victini/icon.png b/graphics/pokemon/gen_5/victini/icon.png
similarity index 100%
rename from graphics/pokemon/victini/icon.png
rename to graphics/pokemon/gen_5/victini/icon.png
diff --git a/graphics/pokemon/victini/normal.pal b/graphics/pokemon/gen_5/victini/normal.pal
similarity index 100%
rename from graphics/pokemon/victini/normal.pal
rename to graphics/pokemon/gen_5/victini/normal.pal
diff --git a/graphics/pokemon/victini/shiny.pal b/graphics/pokemon/gen_5/victini/shiny.pal
similarity index 100%
rename from graphics/pokemon/victini/shiny.pal
rename to graphics/pokemon/gen_5/victini/shiny.pal
diff --git a/graphics/pokemon/virizion/anim_front.png b/graphics/pokemon/gen_5/virizion/anim_front.png
similarity index 100%
rename from graphics/pokemon/virizion/anim_front.png
rename to graphics/pokemon/gen_5/virizion/anim_front.png
diff --git a/graphics/pokemon/virizion/back.png b/graphics/pokemon/gen_5/virizion/back.png
similarity index 100%
rename from graphics/pokemon/virizion/back.png
rename to graphics/pokemon/gen_5/virizion/back.png
diff --git a/graphics/pokemon/virizion/footprint.png b/graphics/pokemon/gen_5/virizion/footprint.png
similarity index 100%
rename from graphics/pokemon/virizion/footprint.png
rename to graphics/pokemon/gen_5/virizion/footprint.png
diff --git a/graphics/pokemon/virizion/icon.png b/graphics/pokemon/gen_5/virizion/icon.png
similarity index 100%
rename from graphics/pokemon/virizion/icon.png
rename to graphics/pokemon/gen_5/virizion/icon.png
diff --git a/graphics/pokemon/virizion/normal.pal b/graphics/pokemon/gen_5/virizion/normal.pal
similarity index 100%
rename from graphics/pokemon/virizion/normal.pal
rename to graphics/pokemon/gen_5/virizion/normal.pal
diff --git a/graphics/pokemon/virizion/shiny.pal b/graphics/pokemon/gen_5/virizion/shiny.pal
similarity index 100%
rename from graphics/pokemon/virizion/shiny.pal
rename to graphics/pokemon/gen_5/virizion/shiny.pal
diff --git a/graphics/pokemon/volcarona/anim_front.png b/graphics/pokemon/gen_5/volcarona/anim_front.png
similarity index 100%
rename from graphics/pokemon/volcarona/anim_front.png
rename to graphics/pokemon/gen_5/volcarona/anim_front.png
diff --git a/graphics/pokemon/volcarona/back.png b/graphics/pokemon/gen_5/volcarona/back.png
similarity index 100%
rename from graphics/pokemon/volcarona/back.png
rename to graphics/pokemon/gen_5/volcarona/back.png
diff --git a/graphics/pokemon/remoraid/footprint.png b/graphics/pokemon/gen_5/volcarona/footprint.png
similarity index 100%
rename from graphics/pokemon/remoraid/footprint.png
rename to graphics/pokemon/gen_5/volcarona/footprint.png
diff --git a/graphics/pokemon/volcarona/icon.png b/graphics/pokemon/gen_5/volcarona/icon.png
similarity index 100%
rename from graphics/pokemon/volcarona/icon.png
rename to graphics/pokemon/gen_5/volcarona/icon.png
diff --git a/graphics/pokemon/volcarona/normal.pal b/graphics/pokemon/gen_5/volcarona/normal.pal
similarity index 100%
rename from graphics/pokemon/volcarona/normal.pal
rename to graphics/pokemon/gen_5/volcarona/normal.pal
diff --git a/graphics/pokemon/volcarona/shiny.pal b/graphics/pokemon/gen_5/volcarona/shiny.pal
similarity index 100%
rename from graphics/pokemon/volcarona/shiny.pal
rename to graphics/pokemon/gen_5/volcarona/shiny.pal
diff --git a/graphics/pokemon/vullaby/anim_front.png b/graphics/pokemon/gen_5/vullaby/anim_front.png
similarity index 100%
rename from graphics/pokemon/vullaby/anim_front.png
rename to graphics/pokemon/gen_5/vullaby/anim_front.png
diff --git a/graphics/pokemon/vullaby/back.png b/graphics/pokemon/gen_5/vullaby/back.png
similarity index 100%
rename from graphics/pokemon/vullaby/back.png
rename to graphics/pokemon/gen_5/vullaby/back.png
diff --git a/graphics/pokemon/vullaby/footprint.png b/graphics/pokemon/gen_5/vullaby/footprint.png
similarity index 100%
rename from graphics/pokemon/vullaby/footprint.png
rename to graphics/pokemon/gen_5/vullaby/footprint.png
diff --git a/graphics/pokemon/vullaby/icon.png b/graphics/pokemon/gen_5/vullaby/icon.png
similarity index 100%
rename from graphics/pokemon/vullaby/icon.png
rename to graphics/pokemon/gen_5/vullaby/icon.png
diff --git a/graphics/pokemon/vullaby/normal.pal b/graphics/pokemon/gen_5/vullaby/normal.pal
similarity index 100%
rename from graphics/pokemon/vullaby/normal.pal
rename to graphics/pokemon/gen_5/vullaby/normal.pal
diff --git a/graphics/pokemon/vullaby/shiny.pal b/graphics/pokemon/gen_5/vullaby/shiny.pal
similarity index 100%
rename from graphics/pokemon/vullaby/shiny.pal
rename to graphics/pokemon/gen_5/vullaby/shiny.pal
diff --git a/graphics/pokemon/watchog/anim_front.png b/graphics/pokemon/gen_5/watchog/anim_front.png
similarity index 100%
rename from graphics/pokemon/watchog/anim_front.png
rename to graphics/pokemon/gen_5/watchog/anim_front.png
diff --git a/graphics/pokemon/watchog/back.png b/graphics/pokemon/gen_5/watchog/back.png
similarity index 100%
rename from graphics/pokemon/watchog/back.png
rename to graphics/pokemon/gen_5/watchog/back.png
diff --git a/graphics/pokemon/watchog/footprint.png b/graphics/pokemon/gen_5/watchog/footprint.png
similarity index 100%
rename from graphics/pokemon/watchog/footprint.png
rename to graphics/pokemon/gen_5/watchog/footprint.png
diff --git a/graphics/pokemon/watchog/icon.png b/graphics/pokemon/gen_5/watchog/icon.png
similarity index 100%
rename from graphics/pokemon/watchog/icon.png
rename to graphics/pokemon/gen_5/watchog/icon.png
diff --git a/graphics/pokemon/watchog/normal.pal b/graphics/pokemon/gen_5/watchog/normal.pal
similarity index 100%
rename from graphics/pokemon/watchog/normal.pal
rename to graphics/pokemon/gen_5/watchog/normal.pal
diff --git a/graphics/pokemon/watchog/shiny.pal b/graphics/pokemon/gen_5/watchog/shiny.pal
similarity index 100%
rename from graphics/pokemon/watchog/shiny.pal
rename to graphics/pokemon/gen_5/watchog/shiny.pal
diff --git a/graphics/pokemon/whimsicott/anim_front.png b/graphics/pokemon/gen_5/whimsicott/anim_front.png
similarity index 100%
rename from graphics/pokemon/whimsicott/anim_front.png
rename to graphics/pokemon/gen_5/whimsicott/anim_front.png
diff --git a/graphics/pokemon/whimsicott/back.png b/graphics/pokemon/gen_5/whimsicott/back.png
similarity index 100%
rename from graphics/pokemon/whimsicott/back.png
rename to graphics/pokemon/gen_5/whimsicott/back.png
diff --git a/graphics/pokemon/grubbin/footprint.png b/graphics/pokemon/gen_5/whimsicott/footprint.png
similarity index 100%
rename from graphics/pokemon/grubbin/footprint.png
rename to graphics/pokemon/gen_5/whimsicott/footprint.png
diff --git a/graphics/pokemon/whimsicott/icon.png b/graphics/pokemon/gen_5/whimsicott/icon.png
similarity index 100%
rename from graphics/pokemon/whimsicott/icon.png
rename to graphics/pokemon/gen_5/whimsicott/icon.png
diff --git a/graphics/pokemon/whimsicott/normal.pal b/graphics/pokemon/gen_5/whimsicott/normal.pal
similarity index 100%
rename from graphics/pokemon/whimsicott/normal.pal
rename to graphics/pokemon/gen_5/whimsicott/normal.pal
diff --git a/graphics/pokemon/whimsicott/shiny.pal b/graphics/pokemon/gen_5/whimsicott/shiny.pal
similarity index 100%
rename from graphics/pokemon/whimsicott/shiny.pal
rename to graphics/pokemon/gen_5/whimsicott/shiny.pal
diff --git a/graphics/pokemon/whirlipede/anim_front.png b/graphics/pokemon/gen_5/whirlipede/anim_front.png
similarity index 100%
rename from graphics/pokemon/whirlipede/anim_front.png
rename to graphics/pokemon/gen_5/whirlipede/anim_front.png
diff --git a/graphics/pokemon/whirlipede/back.png b/graphics/pokemon/gen_5/whirlipede/back.png
similarity index 100%
rename from graphics/pokemon/whirlipede/back.png
rename to graphics/pokemon/gen_5/whirlipede/back.png
diff --git a/graphics/pokemon/reuniclus/footprint.png b/graphics/pokemon/gen_5/whirlipede/footprint.png
similarity index 100%
rename from graphics/pokemon/reuniclus/footprint.png
rename to graphics/pokemon/gen_5/whirlipede/footprint.png
diff --git a/graphics/pokemon/whirlipede/icon.png b/graphics/pokemon/gen_5/whirlipede/icon.png
similarity index 100%
rename from graphics/pokemon/whirlipede/icon.png
rename to graphics/pokemon/gen_5/whirlipede/icon.png
diff --git a/graphics/pokemon/whirlipede/normal.pal b/graphics/pokemon/gen_5/whirlipede/normal.pal
similarity index 100%
rename from graphics/pokemon/whirlipede/normal.pal
rename to graphics/pokemon/gen_5/whirlipede/normal.pal
diff --git a/graphics/pokemon/whirlipede/shiny.pal b/graphics/pokemon/gen_5/whirlipede/shiny.pal
similarity index 100%
rename from graphics/pokemon/whirlipede/shiny.pal
rename to graphics/pokemon/gen_5/whirlipede/shiny.pal
diff --git a/graphics/pokemon/woobat/anim_front.png b/graphics/pokemon/gen_5/woobat/anim_front.png
similarity index 100%
rename from graphics/pokemon/woobat/anim_front.png
rename to graphics/pokemon/gen_5/woobat/anim_front.png
diff --git a/graphics/pokemon/woobat/back.png b/graphics/pokemon/gen_5/woobat/back.png
similarity index 100%
rename from graphics/pokemon/woobat/back.png
rename to graphics/pokemon/gen_5/woobat/back.png
diff --git a/graphics/pokemon/rotom/normal/footprint.png b/graphics/pokemon/gen_5/woobat/footprint.png
similarity index 100%
rename from graphics/pokemon/rotom/normal/footprint.png
rename to graphics/pokemon/gen_5/woobat/footprint.png
diff --git a/graphics/pokemon/woobat/icon.png b/graphics/pokemon/gen_5/woobat/icon.png
similarity index 100%
rename from graphics/pokemon/woobat/icon.png
rename to graphics/pokemon/gen_5/woobat/icon.png
diff --git a/graphics/pokemon/woobat/normal.pal b/graphics/pokemon/gen_5/woobat/normal.pal
similarity index 100%
rename from graphics/pokemon/woobat/normal.pal
rename to graphics/pokemon/gen_5/woobat/normal.pal
diff --git a/graphics/pokemon/woobat/shiny.pal b/graphics/pokemon/gen_5/woobat/shiny.pal
similarity index 100%
rename from graphics/pokemon/woobat/shiny.pal
rename to graphics/pokemon/gen_5/woobat/shiny.pal
diff --git a/graphics/pokemon/yamask/anim_front.png b/graphics/pokemon/gen_5/yamask/anim_front.png
similarity index 100%
rename from graphics/pokemon/yamask/anim_front.png
rename to graphics/pokemon/gen_5/yamask/anim_front.png
diff --git a/graphics/pokemon/yamask/back.png b/graphics/pokemon/gen_5/yamask/back.png
similarity index 100%
rename from graphics/pokemon/yamask/back.png
rename to graphics/pokemon/gen_5/yamask/back.png
diff --git a/graphics/pokemon/runerigus/footprint.png b/graphics/pokemon/gen_5/yamask/footprint.png
similarity index 100%
rename from graphics/pokemon/runerigus/footprint.png
rename to graphics/pokemon/gen_5/yamask/footprint.png
diff --git a/graphics/pokemon/yamask/galarian/back.png b/graphics/pokemon/gen_5/yamask/galarian/back.png
similarity index 100%
rename from graphics/pokemon/yamask/galarian/back.png
rename to graphics/pokemon/gen_5/yamask/galarian/back.png
diff --git a/graphics/pokemon/yamask/galarian/front.png b/graphics/pokemon/gen_5/yamask/galarian/front.png
similarity index 100%
rename from graphics/pokemon/yamask/galarian/front.png
rename to graphics/pokemon/gen_5/yamask/galarian/front.png
diff --git a/graphics/pokemon/yamask/galarian/icon.png b/graphics/pokemon/gen_5/yamask/galarian/icon.png
similarity index 100%
rename from graphics/pokemon/yamask/galarian/icon.png
rename to graphics/pokemon/gen_5/yamask/galarian/icon.png
diff --git a/graphics/pokemon/yamask/galarian/normal.pal b/graphics/pokemon/gen_5/yamask/galarian/normal.pal
similarity index 100%
rename from graphics/pokemon/yamask/galarian/normal.pal
rename to graphics/pokemon/gen_5/yamask/galarian/normal.pal
diff --git a/graphics/pokemon/yamask/galarian/shiny.pal b/graphics/pokemon/gen_5/yamask/galarian/shiny.pal
similarity index 100%
rename from graphics/pokemon/yamask/galarian/shiny.pal
rename to graphics/pokemon/gen_5/yamask/galarian/shiny.pal
diff --git a/graphics/pokemon/yamask/icon.png b/graphics/pokemon/gen_5/yamask/icon.png
similarity index 100%
rename from graphics/pokemon/yamask/icon.png
rename to graphics/pokemon/gen_5/yamask/icon.png
diff --git a/graphics/pokemon/yamask/normal.pal b/graphics/pokemon/gen_5/yamask/normal.pal
similarity index 100%
rename from graphics/pokemon/yamask/normal.pal
rename to graphics/pokemon/gen_5/yamask/normal.pal
diff --git a/graphics/pokemon/yamask/shiny.pal b/graphics/pokemon/gen_5/yamask/shiny.pal
similarity index 100%
rename from graphics/pokemon/yamask/shiny.pal
rename to graphics/pokemon/gen_5/yamask/shiny.pal
diff --git a/graphics/pokemon/zebstrika/anim_front.png b/graphics/pokemon/gen_5/zebstrika/anim_front.png
similarity index 100%
rename from graphics/pokemon/zebstrika/anim_front.png
rename to graphics/pokemon/gen_5/zebstrika/anim_front.png
diff --git a/graphics/pokemon/zebstrika/back.png b/graphics/pokemon/gen_5/zebstrika/back.png
similarity index 100%
rename from graphics/pokemon/zebstrika/back.png
rename to graphics/pokemon/gen_5/zebstrika/back.png
diff --git a/graphics/pokemon/zebstrika/footprint.png b/graphics/pokemon/gen_5/zebstrika/footprint.png
similarity index 100%
rename from graphics/pokemon/zebstrika/footprint.png
rename to graphics/pokemon/gen_5/zebstrika/footprint.png
diff --git a/graphics/pokemon/zebstrika/icon.png b/graphics/pokemon/gen_5/zebstrika/icon.png
similarity index 100%
rename from graphics/pokemon/zebstrika/icon.png
rename to graphics/pokemon/gen_5/zebstrika/icon.png
diff --git a/graphics/pokemon/zebstrika/normal.pal b/graphics/pokemon/gen_5/zebstrika/normal.pal
similarity index 100%
rename from graphics/pokemon/zebstrika/normal.pal
rename to graphics/pokemon/gen_5/zebstrika/normal.pal
diff --git a/graphics/pokemon/zebstrika/shiny.pal b/graphics/pokemon/gen_5/zebstrika/shiny.pal
similarity index 100%
rename from graphics/pokemon/zebstrika/shiny.pal
rename to graphics/pokemon/gen_5/zebstrika/shiny.pal
diff --git a/graphics/pokemon/zekrom/anim_front.png b/graphics/pokemon/gen_5/zekrom/anim_front.png
similarity index 100%
rename from graphics/pokemon/zekrom/anim_front.png
rename to graphics/pokemon/gen_5/zekrom/anim_front.png
diff --git a/graphics/pokemon/zekrom/back.png b/graphics/pokemon/gen_5/zekrom/back.png
similarity index 100%
rename from graphics/pokemon/zekrom/back.png
rename to graphics/pokemon/gen_5/zekrom/back.png
diff --git a/graphics/pokemon/zekrom/footprint.png b/graphics/pokemon/gen_5/zekrom/footprint.png
similarity index 100%
rename from graphics/pokemon/zekrom/footprint.png
rename to graphics/pokemon/gen_5/zekrom/footprint.png
diff --git a/graphics/pokemon/zekrom/icon.png b/graphics/pokemon/gen_5/zekrom/icon.png
similarity index 100%
rename from graphics/pokemon/zekrom/icon.png
rename to graphics/pokemon/gen_5/zekrom/icon.png
diff --git a/graphics/pokemon/zekrom/normal.pal b/graphics/pokemon/gen_5/zekrom/normal.pal
similarity index 100%
rename from graphics/pokemon/zekrom/normal.pal
rename to graphics/pokemon/gen_5/zekrom/normal.pal
diff --git a/graphics/pokemon/zekrom/shiny.pal b/graphics/pokemon/gen_5/zekrom/shiny.pal
similarity index 100%
rename from graphics/pokemon/zekrom/shiny.pal
rename to graphics/pokemon/gen_5/zekrom/shiny.pal
diff --git a/graphics/pokemon/zoroark/anim_front.png b/graphics/pokemon/gen_5/zoroark/anim_front.png
similarity index 100%
rename from graphics/pokemon/zoroark/anim_front.png
rename to graphics/pokemon/gen_5/zoroark/anim_front.png
diff --git a/graphics/pokemon/zoroark/back.png b/graphics/pokemon/gen_5/zoroark/back.png
similarity index 100%
rename from graphics/pokemon/zoroark/back.png
rename to graphics/pokemon/gen_5/zoroark/back.png
diff --git a/graphics/pokemon/zoroark/footprint.png b/graphics/pokemon/gen_5/zoroark/footprint.png
similarity index 100%
rename from graphics/pokemon/zoroark/footprint.png
rename to graphics/pokemon/gen_5/zoroark/footprint.png
diff --git a/graphics/pokemon/zoroark/hisuian/back.png b/graphics/pokemon/gen_5/zoroark/hisuian/back.png
similarity index 100%
rename from graphics/pokemon/zoroark/hisuian/back.png
rename to graphics/pokemon/gen_5/zoroark/hisuian/back.png
diff --git a/graphics/pokemon/zoroark/hisuian/front.png b/graphics/pokemon/gen_5/zoroark/hisuian/front.png
similarity index 100%
rename from graphics/pokemon/zoroark/hisuian/front.png
rename to graphics/pokemon/gen_5/zoroark/hisuian/front.png
diff --git a/graphics/pokemon/zoroark/hisuian/icon.png b/graphics/pokemon/gen_5/zoroark/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/zoroark/hisuian/icon.png
rename to graphics/pokemon/gen_5/zoroark/hisuian/icon.png
diff --git a/graphics/pokemon/zoroark/hisuian/normal.pal b/graphics/pokemon/gen_5/zoroark/hisuian/normal.pal
similarity index 100%
rename from graphics/pokemon/zoroark/hisuian/normal.pal
rename to graphics/pokemon/gen_5/zoroark/hisuian/normal.pal
diff --git a/graphics/pokemon/zoroark/hisuian/shiny.pal b/graphics/pokemon/gen_5/zoroark/hisuian/shiny.pal
similarity index 100%
rename from graphics/pokemon/zoroark/hisuian/shiny.pal
rename to graphics/pokemon/gen_5/zoroark/hisuian/shiny.pal
diff --git a/graphics/pokemon/zoroark/icon.png b/graphics/pokemon/gen_5/zoroark/icon.png
similarity index 100%
rename from graphics/pokemon/zoroark/icon.png
rename to graphics/pokemon/gen_5/zoroark/icon.png
diff --git a/graphics/pokemon/zoroark/normal.pal b/graphics/pokemon/gen_5/zoroark/normal.pal
similarity index 100%
rename from graphics/pokemon/zoroark/normal.pal
rename to graphics/pokemon/gen_5/zoroark/normal.pal
diff --git a/graphics/pokemon/zoroark/shiny.pal b/graphics/pokemon/gen_5/zoroark/shiny.pal
similarity index 100%
rename from graphics/pokemon/zoroark/shiny.pal
rename to graphics/pokemon/gen_5/zoroark/shiny.pal
diff --git a/graphics/pokemon/zorua/anim_front.png b/graphics/pokemon/gen_5/zorua/anim_front.png
similarity index 100%
rename from graphics/pokemon/zorua/anim_front.png
rename to graphics/pokemon/gen_5/zorua/anim_front.png
diff --git a/graphics/pokemon/zorua/back.png b/graphics/pokemon/gen_5/zorua/back.png
similarity index 100%
rename from graphics/pokemon/zorua/back.png
rename to graphics/pokemon/gen_5/zorua/back.png
diff --git a/graphics/pokemon/goodra/footprint.png b/graphics/pokemon/gen_5/zorua/footprint.png
similarity index 100%
rename from graphics/pokemon/goodra/footprint.png
rename to graphics/pokemon/gen_5/zorua/footprint.png
diff --git a/graphics/pokemon/zorua/hisuian/back.png b/graphics/pokemon/gen_5/zorua/hisuian/back.png
similarity index 100%
rename from graphics/pokemon/zorua/hisuian/back.png
rename to graphics/pokemon/gen_5/zorua/hisuian/back.png
diff --git a/graphics/pokemon/zorua/hisuian/front.png b/graphics/pokemon/gen_5/zorua/hisuian/front.png
similarity index 100%
rename from graphics/pokemon/zorua/hisuian/front.png
rename to graphics/pokemon/gen_5/zorua/hisuian/front.png
diff --git a/graphics/pokemon/zorua/hisuian/icon.png b/graphics/pokemon/gen_5/zorua/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/zorua/hisuian/icon.png
rename to graphics/pokemon/gen_5/zorua/hisuian/icon.png
diff --git a/graphics/pokemon/zorua/hisuian/normal.pal b/graphics/pokemon/gen_5/zorua/hisuian/normal.pal
similarity index 100%
rename from graphics/pokemon/zorua/hisuian/normal.pal
rename to graphics/pokemon/gen_5/zorua/hisuian/normal.pal
diff --git a/graphics/pokemon/zorua/hisuian/shiny.pal b/graphics/pokemon/gen_5/zorua/hisuian/shiny.pal
similarity index 100%
rename from graphics/pokemon/zorua/hisuian/shiny.pal
rename to graphics/pokemon/gen_5/zorua/hisuian/shiny.pal
diff --git a/graphics/pokemon/zorua/icon.png b/graphics/pokemon/gen_5/zorua/icon.png
similarity index 100%
rename from graphics/pokemon/zorua/icon.png
rename to graphics/pokemon/gen_5/zorua/icon.png
diff --git a/graphics/pokemon/zorua/normal.pal b/graphics/pokemon/gen_5/zorua/normal.pal
similarity index 100%
rename from graphics/pokemon/zorua/normal.pal
rename to graphics/pokemon/gen_5/zorua/normal.pal
diff --git a/graphics/pokemon/zorua/shiny.pal b/graphics/pokemon/gen_5/zorua/shiny.pal
similarity index 100%
rename from graphics/pokemon/zorua/shiny.pal
rename to graphics/pokemon/gen_5/zorua/shiny.pal
diff --git a/graphics/pokemon/zweilous/anim_front.png b/graphics/pokemon/gen_5/zweilous/anim_front.png
similarity index 100%
rename from graphics/pokemon/zweilous/anim_front.png
rename to graphics/pokemon/gen_5/zweilous/anim_front.png
diff --git a/graphics/pokemon/zweilous/back.png b/graphics/pokemon/gen_5/zweilous/back.png
similarity index 100%
rename from graphics/pokemon/zweilous/back.png
rename to graphics/pokemon/gen_5/zweilous/back.png
diff --git a/graphics/pokemon/zweilous/footprint.png b/graphics/pokemon/gen_5/zweilous/footprint.png
similarity index 100%
rename from graphics/pokemon/zweilous/footprint.png
rename to graphics/pokemon/gen_5/zweilous/footprint.png
diff --git a/graphics/pokemon/zweilous/icon.png b/graphics/pokemon/gen_5/zweilous/icon.png
similarity index 100%
rename from graphics/pokemon/zweilous/icon.png
rename to graphics/pokemon/gen_5/zweilous/icon.png
diff --git a/graphics/pokemon/zweilous/normal.pal b/graphics/pokemon/gen_5/zweilous/normal.pal
similarity index 100%
rename from graphics/pokemon/zweilous/normal.pal
rename to graphics/pokemon/gen_5/zweilous/normal.pal
diff --git a/graphics/pokemon/zweilous/shiny.pal b/graphics/pokemon/gen_5/zweilous/shiny.pal
similarity index 100%
rename from graphics/pokemon/zweilous/shiny.pal
rename to graphics/pokemon/gen_5/zweilous/shiny.pal
diff --git a/graphics/pokemon/aegislash/anim_front.png b/graphics/pokemon/gen_6/aegislash/anim_front.png
similarity index 100%
rename from graphics/pokemon/aegislash/anim_front.png
rename to graphics/pokemon/gen_6/aegislash/anim_front.png
diff --git a/graphics/pokemon/aegislash/back.png b/graphics/pokemon/gen_6/aegislash/back.png
similarity index 100%
rename from graphics/pokemon/aegislash/back.png
rename to graphics/pokemon/gen_6/aegislash/back.png
diff --git a/graphics/pokemon/aegislash/blade/anim_front.png b/graphics/pokemon/gen_6/aegislash/blade/anim_front.png
similarity index 100%
rename from graphics/pokemon/aegislash/blade/anim_front.png
rename to graphics/pokemon/gen_6/aegislash/blade/anim_front.png
diff --git a/graphics/pokemon/aegislash/blade/back.png b/graphics/pokemon/gen_6/aegislash/blade/back.png
similarity index 100%
rename from graphics/pokemon/aegislash/blade/back.png
rename to graphics/pokemon/gen_6/aegislash/blade/back.png
diff --git a/graphics/pokemon/aegislash/blade/icon.png b/graphics/pokemon/gen_6/aegislash/blade/icon.png
similarity index 100%
rename from graphics/pokemon/aegislash/blade/icon.png
rename to graphics/pokemon/gen_6/aegislash/blade/icon.png
diff --git a/graphics/pokemon/aegislash/blade/normal.pal b/graphics/pokemon/gen_6/aegislash/blade/normal.pal
similarity index 100%
rename from graphics/pokemon/aegislash/blade/normal.pal
rename to graphics/pokemon/gen_6/aegislash/blade/normal.pal
diff --git a/graphics/pokemon/aegislash/blade/shiny.pal b/graphics/pokemon/gen_6/aegislash/blade/shiny.pal
similarity index 100%
rename from graphics/pokemon/aegislash/blade/shiny.pal
rename to graphics/pokemon/gen_6/aegislash/blade/shiny.pal
diff --git a/graphics/pokemon/sandaconda/footprint.png b/graphics/pokemon/gen_6/aegislash/footprint.png
similarity index 100%
rename from graphics/pokemon/sandaconda/footprint.png
rename to graphics/pokemon/gen_6/aegislash/footprint.png
diff --git a/graphics/pokemon/aegislash/icon.png b/graphics/pokemon/gen_6/aegislash/icon.png
similarity index 100%
rename from graphics/pokemon/aegislash/icon.png
rename to graphics/pokemon/gen_6/aegislash/icon.png
diff --git a/graphics/pokemon/aegislash/normal.pal b/graphics/pokemon/gen_6/aegislash/normal.pal
similarity index 100%
rename from graphics/pokemon/aegislash/normal.pal
rename to graphics/pokemon/gen_6/aegislash/normal.pal
diff --git a/graphics/pokemon/aegislash/shiny.pal b/graphics/pokemon/gen_6/aegislash/shiny.pal
similarity index 100%
rename from graphics/pokemon/aegislash/shiny.pal
rename to graphics/pokemon/gen_6/aegislash/shiny.pal
diff --git a/graphics/pokemon/amaura/anim_front.png b/graphics/pokemon/gen_6/amaura/anim_front.png
similarity index 100%
rename from graphics/pokemon/amaura/anim_front.png
rename to graphics/pokemon/gen_6/amaura/anim_front.png
diff --git a/graphics/pokemon/amaura/back.png b/graphics/pokemon/gen_6/amaura/back.png
similarity index 100%
rename from graphics/pokemon/amaura/back.png
rename to graphics/pokemon/gen_6/amaura/back.png
diff --git a/graphics/pokemon/shuckle/footprint.png b/graphics/pokemon/gen_6/amaura/footprint.png
similarity index 100%
rename from graphics/pokemon/shuckle/footprint.png
rename to graphics/pokemon/gen_6/amaura/footprint.png
diff --git a/graphics/pokemon/amaura/icon.png b/graphics/pokemon/gen_6/amaura/icon.png
similarity index 100%
rename from graphics/pokemon/amaura/icon.png
rename to graphics/pokemon/gen_6/amaura/icon.png
diff --git a/graphics/pokemon/amaura/normal.pal b/graphics/pokemon/gen_6/amaura/normal.pal
similarity index 100%
rename from graphics/pokemon/amaura/normal.pal
rename to graphics/pokemon/gen_6/amaura/normal.pal
diff --git a/graphics/pokemon/amaura/shiny.pal b/graphics/pokemon/gen_6/amaura/shiny.pal
similarity index 100%
rename from graphics/pokemon/amaura/shiny.pal
rename to graphics/pokemon/gen_6/amaura/shiny.pal
diff --git a/graphics/pokemon/aromatisse/anim_front.png b/graphics/pokemon/gen_6/aromatisse/anim_front.png
similarity index 100%
rename from graphics/pokemon/aromatisse/anim_front.png
rename to graphics/pokemon/gen_6/aromatisse/anim_front.png
diff --git a/graphics/pokemon/aromatisse/back.png b/graphics/pokemon/gen_6/aromatisse/back.png
similarity index 100%
rename from graphics/pokemon/aromatisse/back.png
rename to graphics/pokemon/gen_6/aromatisse/back.png
diff --git a/graphics/pokemon/hattrem/footprint.png b/graphics/pokemon/gen_6/aromatisse/footprint.png
similarity index 100%
rename from graphics/pokemon/hattrem/footprint.png
rename to graphics/pokemon/gen_6/aromatisse/footprint.png
diff --git a/graphics/pokemon/aromatisse/icon.png b/graphics/pokemon/gen_6/aromatisse/icon.png
similarity index 100%
rename from graphics/pokemon/aromatisse/icon.png
rename to graphics/pokemon/gen_6/aromatisse/icon.png
diff --git a/graphics/pokemon/aromatisse/normal.pal b/graphics/pokemon/gen_6/aromatisse/normal.pal
similarity index 100%
rename from graphics/pokemon/aromatisse/normal.pal
rename to graphics/pokemon/gen_6/aromatisse/normal.pal
diff --git a/graphics/pokemon/aromatisse/shiny.pal b/graphics/pokemon/gen_6/aromatisse/shiny.pal
similarity index 100%
rename from graphics/pokemon/aromatisse/shiny.pal
rename to graphics/pokemon/gen_6/aromatisse/shiny.pal
diff --git a/graphics/pokemon/aurorus/anim_front.png b/graphics/pokemon/gen_6/aurorus/anim_front.png
similarity index 100%
rename from graphics/pokemon/aurorus/anim_front.png
rename to graphics/pokemon/gen_6/aurorus/anim_front.png
diff --git a/graphics/pokemon/aurorus/back.png b/graphics/pokemon/gen_6/aurorus/back.png
similarity index 100%
rename from graphics/pokemon/aurorus/back.png
rename to graphics/pokemon/gen_6/aurorus/back.png
diff --git a/graphics/pokemon/aurorus/footprint.png b/graphics/pokemon/gen_6/aurorus/footprint.png
similarity index 100%
rename from graphics/pokemon/aurorus/footprint.png
rename to graphics/pokemon/gen_6/aurorus/footprint.png
diff --git a/graphics/pokemon/aurorus/icon.png b/graphics/pokemon/gen_6/aurorus/icon.png
similarity index 100%
rename from graphics/pokemon/aurorus/icon.png
rename to graphics/pokemon/gen_6/aurorus/icon.png
diff --git a/graphics/pokemon/aurorus/normal.pal b/graphics/pokemon/gen_6/aurorus/normal.pal
similarity index 100%
rename from graphics/pokemon/aurorus/normal.pal
rename to graphics/pokemon/gen_6/aurorus/normal.pal
diff --git a/graphics/pokemon/aurorus/shiny.pal b/graphics/pokemon/gen_6/aurorus/shiny.pal
similarity index 100%
rename from graphics/pokemon/aurorus/shiny.pal
rename to graphics/pokemon/gen_6/aurorus/shiny.pal
diff --git a/graphics/pokemon/avalugg/anim_front.png b/graphics/pokemon/gen_6/avalugg/anim_front.png
similarity index 100%
rename from graphics/pokemon/avalugg/anim_front.png
rename to graphics/pokemon/gen_6/avalugg/anim_front.png
diff --git a/graphics/pokemon/avalugg/back.png b/graphics/pokemon/gen_6/avalugg/back.png
similarity index 100%
rename from graphics/pokemon/avalugg/back.png
rename to graphics/pokemon/gen_6/avalugg/back.png
diff --git a/graphics/pokemon/avalugg/footprint.png b/graphics/pokemon/gen_6/avalugg/footprint.png
similarity index 100%
rename from graphics/pokemon/avalugg/footprint.png
rename to graphics/pokemon/gen_6/avalugg/footprint.png
diff --git a/graphics/pokemon/avalugg/hisuian/back.png b/graphics/pokemon/gen_6/avalugg/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/avalugg/hisuian/back.png
rename to graphics/pokemon/gen_6/avalugg/hisuian/back.png
diff --git a/graphics/pokemon/avalugg/hisuian/front.png b/graphics/pokemon/gen_6/avalugg/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/avalugg/hisuian/front.png
rename to graphics/pokemon/gen_6/avalugg/hisuian/front.png
diff --git a/graphics/pokemon/avalugg/hisuian/icon.png b/graphics/pokemon/gen_6/avalugg/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/avalugg/hisuian/icon.png
rename to graphics/pokemon/gen_6/avalugg/hisuian/icon.png
diff --git a/graphics/pokemon/avalugg/hisuian/normal.pal b/graphics/pokemon/gen_6/avalugg/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/avalugg/hisuian/normal.pal
rename to graphics/pokemon/gen_6/avalugg/hisuian/normal.pal
diff --git a/graphics/pokemon/avalugg/hisuian/shiny.pal b/graphics/pokemon/gen_6/avalugg/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/avalugg/hisuian/shiny.pal
rename to graphics/pokemon/gen_6/avalugg/hisuian/shiny.pal
diff --git a/graphics/pokemon/avalugg/icon.png b/graphics/pokemon/gen_6/avalugg/icon.png
similarity index 100%
rename from graphics/pokemon/avalugg/icon.png
rename to graphics/pokemon/gen_6/avalugg/icon.png
diff --git a/graphics/pokemon/avalugg/normal.pal b/graphics/pokemon/gen_6/avalugg/normal.pal
similarity index 100%
rename from graphics/pokemon/avalugg/normal.pal
rename to graphics/pokemon/gen_6/avalugg/normal.pal
diff --git a/graphics/pokemon/avalugg/shiny.pal b/graphics/pokemon/gen_6/avalugg/shiny.pal
similarity index 100%
rename from graphics/pokemon/avalugg/shiny.pal
rename to graphics/pokemon/gen_6/avalugg/shiny.pal
diff --git a/graphics/pokemon/barbaracle/anim_front.png b/graphics/pokemon/gen_6/barbaracle/anim_front.png
similarity index 100%
rename from graphics/pokemon/barbaracle/anim_front.png
rename to graphics/pokemon/gen_6/barbaracle/anim_front.png
diff --git a/graphics/pokemon/barbaracle/back.png b/graphics/pokemon/gen_6/barbaracle/back.png
similarity index 100%
rename from graphics/pokemon/barbaracle/back.png
rename to graphics/pokemon/gen_6/barbaracle/back.png
diff --git a/graphics/pokemon/barbaracle/footprint.png b/graphics/pokemon/gen_6/barbaracle/footprint.png
similarity index 100%
rename from graphics/pokemon/barbaracle/footprint.png
rename to graphics/pokemon/gen_6/barbaracle/footprint.png
diff --git a/graphics/pokemon/barbaracle/icon.png b/graphics/pokemon/gen_6/barbaracle/icon.png
similarity index 100%
rename from graphics/pokemon/barbaracle/icon.png
rename to graphics/pokemon/gen_6/barbaracle/icon.png
diff --git a/graphics/pokemon/barbaracle/normal.pal b/graphics/pokemon/gen_6/barbaracle/normal.pal
similarity index 100%
rename from graphics/pokemon/barbaracle/normal.pal
rename to graphics/pokemon/gen_6/barbaracle/normal.pal
diff --git a/graphics/pokemon/barbaracle/shiny.pal b/graphics/pokemon/gen_6/barbaracle/shiny.pal
similarity index 100%
rename from graphics/pokemon/barbaracle/shiny.pal
rename to graphics/pokemon/gen_6/barbaracle/shiny.pal
diff --git a/graphics/pokemon/bergmite/anim_front.png b/graphics/pokemon/gen_6/bergmite/anim_front.png
similarity index 100%
rename from graphics/pokemon/bergmite/anim_front.png
rename to graphics/pokemon/gen_6/bergmite/anim_front.png
diff --git a/graphics/pokemon/bergmite/back.png b/graphics/pokemon/gen_6/bergmite/back.png
similarity index 100%
rename from graphics/pokemon/bergmite/back.png
rename to graphics/pokemon/gen_6/bergmite/back.png
diff --git a/graphics/pokemon/pincurchin/footprint.png b/graphics/pokemon/gen_6/bergmite/footprint.png
similarity index 100%
rename from graphics/pokemon/pincurchin/footprint.png
rename to graphics/pokemon/gen_6/bergmite/footprint.png
diff --git a/graphics/pokemon/bergmite/icon.png b/graphics/pokemon/gen_6/bergmite/icon.png
similarity index 100%
rename from graphics/pokemon/bergmite/icon.png
rename to graphics/pokemon/gen_6/bergmite/icon.png
diff --git a/graphics/pokemon/bergmite/normal.pal b/graphics/pokemon/gen_6/bergmite/normal.pal
similarity index 100%
rename from graphics/pokemon/bergmite/normal.pal
rename to graphics/pokemon/gen_6/bergmite/normal.pal
diff --git a/graphics/pokemon/bergmite/shiny.pal b/graphics/pokemon/gen_6/bergmite/shiny.pal
similarity index 100%
rename from graphics/pokemon/bergmite/shiny.pal
rename to graphics/pokemon/gen_6/bergmite/shiny.pal
diff --git a/graphics/pokemon/binacle/anim_front.png b/graphics/pokemon/gen_6/binacle/anim_front.png
similarity index 100%
rename from graphics/pokemon/binacle/anim_front.png
rename to graphics/pokemon/gen_6/binacle/anim_front.png
diff --git a/graphics/pokemon/binacle/back.png b/graphics/pokemon/gen_6/binacle/back.png
similarity index 100%
rename from graphics/pokemon/binacle/back.png
rename to graphics/pokemon/gen_6/binacle/back.png
diff --git a/graphics/pokemon/sandygast/footprint.png b/graphics/pokemon/gen_6/binacle/footprint.png
similarity index 100%
rename from graphics/pokemon/sandygast/footprint.png
rename to graphics/pokemon/gen_6/binacle/footprint.png
diff --git a/graphics/pokemon/binacle/icon.png b/graphics/pokemon/gen_6/binacle/icon.png
similarity index 100%
rename from graphics/pokemon/binacle/icon.png
rename to graphics/pokemon/gen_6/binacle/icon.png
diff --git a/graphics/pokemon/binacle/normal.pal b/graphics/pokemon/gen_6/binacle/normal.pal
similarity index 100%
rename from graphics/pokemon/binacle/normal.pal
rename to graphics/pokemon/gen_6/binacle/normal.pal
diff --git a/graphics/pokemon/binacle/shiny.pal b/graphics/pokemon/gen_6/binacle/shiny.pal
similarity index 100%
rename from graphics/pokemon/binacle/shiny.pal
rename to graphics/pokemon/gen_6/binacle/shiny.pal
diff --git a/graphics/pokemon/braixen/anim_front.png b/graphics/pokemon/gen_6/braixen/anim_front.png
similarity index 100%
rename from graphics/pokemon/braixen/anim_front.png
rename to graphics/pokemon/gen_6/braixen/anim_front.png
diff --git a/graphics/pokemon/braixen/back.png b/graphics/pokemon/gen_6/braixen/back.png
similarity index 100%
rename from graphics/pokemon/braixen/back.png
rename to graphics/pokemon/gen_6/braixen/back.png
diff --git a/graphics/pokemon/braixen/footprint.png b/graphics/pokemon/gen_6/braixen/footprint.png
similarity index 100%
rename from graphics/pokemon/braixen/footprint.png
rename to graphics/pokemon/gen_6/braixen/footprint.png
diff --git a/graphics/pokemon/braixen/icon.png b/graphics/pokemon/gen_6/braixen/icon.png
similarity index 100%
rename from graphics/pokemon/braixen/icon.png
rename to graphics/pokemon/gen_6/braixen/icon.png
diff --git a/graphics/pokemon/braixen/normal.pal b/graphics/pokemon/gen_6/braixen/normal.pal
similarity index 100%
rename from graphics/pokemon/braixen/normal.pal
rename to graphics/pokemon/gen_6/braixen/normal.pal
diff --git a/graphics/pokemon/braixen/shiny.pal b/graphics/pokemon/gen_6/braixen/shiny.pal
similarity index 100%
rename from graphics/pokemon/braixen/shiny.pal
rename to graphics/pokemon/gen_6/braixen/shiny.pal
diff --git a/graphics/pokemon/bunnelby/anim_front.png b/graphics/pokemon/gen_6/bunnelby/anim_front.png
similarity index 100%
rename from graphics/pokemon/bunnelby/anim_front.png
rename to graphics/pokemon/gen_6/bunnelby/anim_front.png
diff --git a/graphics/pokemon/bunnelby/back.png b/graphics/pokemon/gen_6/bunnelby/back.png
similarity index 100%
rename from graphics/pokemon/bunnelby/back.png
rename to graphics/pokemon/gen_6/bunnelby/back.png
diff --git a/graphics/pokemon/scraggy/footprint.png b/graphics/pokemon/gen_6/bunnelby/footprint.png
similarity index 100%
rename from graphics/pokemon/scraggy/footprint.png
rename to graphics/pokemon/gen_6/bunnelby/footprint.png
diff --git a/graphics/pokemon/bunnelby/icon.png b/graphics/pokemon/gen_6/bunnelby/icon.png
similarity index 100%
rename from graphics/pokemon/bunnelby/icon.png
rename to graphics/pokemon/gen_6/bunnelby/icon.png
diff --git a/graphics/pokemon/bunnelby/normal.pal b/graphics/pokemon/gen_6/bunnelby/normal.pal
similarity index 100%
rename from graphics/pokemon/bunnelby/normal.pal
rename to graphics/pokemon/gen_6/bunnelby/normal.pal
diff --git a/graphics/pokemon/bunnelby/shiny.pal b/graphics/pokemon/gen_6/bunnelby/shiny.pal
similarity index 100%
rename from graphics/pokemon/bunnelby/shiny.pal
rename to graphics/pokemon/gen_6/bunnelby/shiny.pal
diff --git a/graphics/pokemon/carbink/anim_front.png b/graphics/pokemon/gen_6/carbink/anim_front.png
similarity index 100%
rename from graphics/pokemon/carbink/anim_front.png
rename to graphics/pokemon/gen_6/carbink/anim_front.png
diff --git a/graphics/pokemon/carbink/back.png b/graphics/pokemon/gen_6/carbink/back.png
similarity index 100%
rename from graphics/pokemon/carbink/back.png
rename to graphics/pokemon/gen_6/carbink/back.png
diff --git a/graphics/pokemon/seadra/footprint.png b/graphics/pokemon/gen_6/carbink/footprint.png
similarity index 100%
rename from graphics/pokemon/seadra/footprint.png
rename to graphics/pokemon/gen_6/carbink/footprint.png
diff --git a/graphics/pokemon/carbink/icon.png b/graphics/pokemon/gen_6/carbink/icon.png
similarity index 100%
rename from graphics/pokemon/carbink/icon.png
rename to graphics/pokemon/gen_6/carbink/icon.png
diff --git a/graphics/pokemon/carbink/normal.pal b/graphics/pokemon/gen_6/carbink/normal.pal
similarity index 100%
rename from graphics/pokemon/carbink/normal.pal
rename to graphics/pokemon/gen_6/carbink/normal.pal
diff --git a/graphics/pokemon/carbink/shiny.pal b/graphics/pokemon/gen_6/carbink/shiny.pal
similarity index 100%
rename from graphics/pokemon/carbink/shiny.pal
rename to graphics/pokemon/gen_6/carbink/shiny.pal
diff --git a/graphics/pokemon/chesnaught/anim_front.png b/graphics/pokemon/gen_6/chesnaught/anim_front.png
similarity index 100%
rename from graphics/pokemon/chesnaught/anim_front.png
rename to graphics/pokemon/gen_6/chesnaught/anim_front.png
diff --git a/graphics/pokemon/chesnaught/back.png b/graphics/pokemon/gen_6/chesnaught/back.png
similarity index 100%
rename from graphics/pokemon/chesnaught/back.png
rename to graphics/pokemon/gen_6/chesnaught/back.png
diff --git a/graphics/pokemon/chesnaught/footprint.png b/graphics/pokemon/gen_6/chesnaught/footprint.png
similarity index 100%
rename from graphics/pokemon/chesnaught/footprint.png
rename to graphics/pokemon/gen_6/chesnaught/footprint.png
diff --git a/graphics/pokemon/chesnaught/icon.png b/graphics/pokemon/gen_6/chesnaught/icon.png
similarity index 100%
rename from graphics/pokemon/chesnaught/icon.png
rename to graphics/pokemon/gen_6/chesnaught/icon.png
diff --git a/graphics/pokemon/chesnaught/normal.pal b/graphics/pokemon/gen_6/chesnaught/normal.pal
similarity index 100%
rename from graphics/pokemon/chesnaught/normal.pal
rename to graphics/pokemon/gen_6/chesnaught/normal.pal
diff --git a/graphics/pokemon/chesnaught/shiny.pal b/graphics/pokemon/gen_6/chesnaught/shiny.pal
similarity index 100%
rename from graphics/pokemon/chesnaught/shiny.pal
rename to graphics/pokemon/gen_6/chesnaught/shiny.pal
diff --git a/graphics/pokemon/chespin/anim_front.png b/graphics/pokemon/gen_6/chespin/anim_front.png
similarity index 100%
rename from graphics/pokemon/chespin/anim_front.png
rename to graphics/pokemon/gen_6/chespin/anim_front.png
diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/gen_6/chespin/back.png
similarity index 100%
rename from graphics/pokemon/chespin/back.png
rename to graphics/pokemon/gen_6/chespin/back.png
diff --git a/graphics/pokemon/chespin/footprint.png b/graphics/pokemon/gen_6/chespin/footprint.png
similarity index 100%
rename from graphics/pokemon/chespin/footprint.png
rename to graphics/pokemon/gen_6/chespin/footprint.png
diff --git a/graphics/pokemon/chespin/icon.png b/graphics/pokemon/gen_6/chespin/icon.png
similarity index 100%
rename from graphics/pokemon/chespin/icon.png
rename to graphics/pokemon/gen_6/chespin/icon.png
diff --git a/graphics/pokemon/chespin/normal.pal b/graphics/pokemon/gen_6/chespin/normal.pal
similarity index 100%
rename from graphics/pokemon/chespin/normal.pal
rename to graphics/pokemon/gen_6/chespin/normal.pal
diff --git a/graphics/pokemon/chespin/shiny.pal b/graphics/pokemon/gen_6/chespin/shiny.pal
similarity index 100%
rename from graphics/pokemon/chespin/shiny.pal
rename to graphics/pokemon/gen_6/chespin/shiny.pal
diff --git a/graphics/pokemon/clauncher/anim_front.png b/graphics/pokemon/gen_6/clauncher/anim_front.png
similarity index 100%
rename from graphics/pokemon/clauncher/anim_front.png
rename to graphics/pokemon/gen_6/clauncher/anim_front.png
diff --git a/graphics/pokemon/clauncher/back.png b/graphics/pokemon/gen_6/clauncher/back.png
similarity index 100%
rename from graphics/pokemon/clauncher/back.png
rename to graphics/pokemon/gen_6/clauncher/back.png
diff --git a/graphics/pokemon/pumpkaboo/footprint.png b/graphics/pokemon/gen_6/clauncher/footprint.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/footprint.png
rename to graphics/pokemon/gen_6/clauncher/footprint.png
diff --git a/graphics/pokemon/clauncher/icon.png b/graphics/pokemon/gen_6/clauncher/icon.png
similarity index 100%
rename from graphics/pokemon/clauncher/icon.png
rename to graphics/pokemon/gen_6/clauncher/icon.png
diff --git a/graphics/pokemon/clauncher/normal.pal b/graphics/pokemon/gen_6/clauncher/normal.pal
similarity index 100%
rename from graphics/pokemon/clauncher/normal.pal
rename to graphics/pokemon/gen_6/clauncher/normal.pal
diff --git a/graphics/pokemon/clauncher/shiny.pal b/graphics/pokemon/gen_6/clauncher/shiny.pal
similarity index 100%
rename from graphics/pokemon/clauncher/shiny.pal
rename to graphics/pokemon/gen_6/clauncher/shiny.pal
diff --git a/graphics/pokemon/clawitzer/anim_front.png b/graphics/pokemon/gen_6/clawitzer/anim_front.png
similarity index 100%
rename from graphics/pokemon/clawitzer/anim_front.png
rename to graphics/pokemon/gen_6/clawitzer/anim_front.png
diff --git a/graphics/pokemon/clawitzer/back.png b/graphics/pokemon/gen_6/clawitzer/back.png
similarity index 100%
rename from graphics/pokemon/clawitzer/back.png
rename to graphics/pokemon/gen_6/clawitzer/back.png
diff --git a/graphics/pokemon/seaking/footprint.png b/graphics/pokemon/gen_6/clawitzer/footprint.png
similarity index 100%
rename from graphics/pokemon/seaking/footprint.png
rename to graphics/pokemon/gen_6/clawitzer/footprint.png
diff --git a/graphics/pokemon/clawitzer/icon.png b/graphics/pokemon/gen_6/clawitzer/icon.png
similarity index 100%
rename from graphics/pokemon/clawitzer/icon.png
rename to graphics/pokemon/gen_6/clawitzer/icon.png
diff --git a/graphics/pokemon/clawitzer/normal.pal b/graphics/pokemon/gen_6/clawitzer/normal.pal
similarity index 100%
rename from graphics/pokemon/clawitzer/normal.pal
rename to graphics/pokemon/gen_6/clawitzer/normal.pal
diff --git a/graphics/pokemon/clawitzer/shiny.pal b/graphics/pokemon/gen_6/clawitzer/shiny.pal
similarity index 100%
rename from graphics/pokemon/clawitzer/shiny.pal
rename to graphics/pokemon/gen_6/clawitzer/shiny.pal
diff --git a/graphics/pokemon/dedenne/anim_front.png b/graphics/pokemon/gen_6/dedenne/anim_front.png
similarity index 100%
rename from graphics/pokemon/dedenne/anim_front.png
rename to graphics/pokemon/gen_6/dedenne/anim_front.png
diff --git a/graphics/pokemon/dedenne/back.png b/graphics/pokemon/gen_6/dedenne/back.png
similarity index 100%
rename from graphics/pokemon/dedenne/back.png
rename to graphics/pokemon/gen_6/dedenne/back.png
diff --git a/graphics/pokemon/dedenne/footprint.png b/graphics/pokemon/gen_6/dedenne/footprint.png
similarity index 100%
rename from graphics/pokemon/dedenne/footprint.png
rename to graphics/pokemon/gen_6/dedenne/footprint.png
diff --git a/graphics/pokemon/dedenne/icon.png b/graphics/pokemon/gen_6/dedenne/icon.png
similarity index 100%
rename from graphics/pokemon/dedenne/icon.png
rename to graphics/pokemon/gen_6/dedenne/icon.png
diff --git a/graphics/pokemon/dedenne/normal.pal b/graphics/pokemon/gen_6/dedenne/normal.pal
similarity index 100%
rename from graphics/pokemon/dedenne/normal.pal
rename to graphics/pokemon/gen_6/dedenne/normal.pal
diff --git a/graphics/pokemon/dedenne/shiny.pal b/graphics/pokemon/gen_6/dedenne/shiny.pal
similarity index 100%
rename from graphics/pokemon/dedenne/shiny.pal
rename to graphics/pokemon/gen_6/dedenne/shiny.pal
diff --git a/graphics/pokemon/delphox/anim_front.png b/graphics/pokemon/gen_6/delphox/anim_front.png
similarity index 100%
rename from graphics/pokemon/delphox/anim_front.png
rename to graphics/pokemon/gen_6/delphox/anim_front.png
diff --git a/graphics/pokemon/delphox/back.png b/graphics/pokemon/gen_6/delphox/back.png
similarity index 100%
rename from graphics/pokemon/delphox/back.png
rename to graphics/pokemon/gen_6/delphox/back.png
diff --git a/graphics/pokemon/delphox/footprint.png b/graphics/pokemon/gen_6/delphox/footprint.png
similarity index 100%
rename from graphics/pokemon/delphox/footprint.png
rename to graphics/pokemon/gen_6/delphox/footprint.png
diff --git a/graphics/pokemon/delphox/icon.png b/graphics/pokemon/gen_6/delphox/icon.png
similarity index 100%
rename from graphics/pokemon/delphox/icon.png
rename to graphics/pokemon/gen_6/delphox/icon.png
diff --git a/graphics/pokemon/delphox/normal.pal b/graphics/pokemon/gen_6/delphox/normal.pal
similarity index 100%
rename from graphics/pokemon/delphox/normal.pal
rename to graphics/pokemon/gen_6/delphox/normal.pal
diff --git a/graphics/pokemon/delphox/shiny.pal b/graphics/pokemon/gen_6/delphox/shiny.pal
similarity index 100%
rename from graphics/pokemon/delphox/shiny.pal
rename to graphics/pokemon/gen_6/delphox/shiny.pal
diff --git a/graphics/pokemon/diancie/anim_front.png b/graphics/pokemon/gen_6/diancie/anim_front.png
similarity index 100%
rename from graphics/pokemon/diancie/anim_front.png
rename to graphics/pokemon/gen_6/diancie/anim_front.png
diff --git a/graphics/pokemon/diancie/back.png b/graphics/pokemon/gen_6/diancie/back.png
similarity index 100%
rename from graphics/pokemon/diancie/back.png
rename to graphics/pokemon/gen_6/diancie/back.png
diff --git a/graphics/pokemon/sealeo/footprint.png b/graphics/pokemon/gen_6/diancie/footprint.png
similarity index 100%
rename from graphics/pokemon/sealeo/footprint.png
rename to graphics/pokemon/gen_6/diancie/footprint.png
diff --git a/graphics/pokemon/diancie/icon.png b/graphics/pokemon/gen_6/diancie/icon.png
similarity index 100%
rename from graphics/pokemon/diancie/icon.png
rename to graphics/pokemon/gen_6/diancie/icon.png
diff --git a/graphics/pokemon/diancie/mega/back.png b/graphics/pokemon/gen_6/diancie/mega/back.png
similarity index 100%
rename from graphics/pokemon/diancie/mega/back.png
rename to graphics/pokemon/gen_6/diancie/mega/back.png
diff --git a/graphics/pokemon/diancie/mega/front.png b/graphics/pokemon/gen_6/diancie/mega/front.png
similarity index 100%
rename from graphics/pokemon/diancie/mega/front.png
rename to graphics/pokemon/gen_6/diancie/mega/front.png
diff --git a/graphics/pokemon/diancie/mega/icon.png b/graphics/pokemon/gen_6/diancie/mega/icon.png
similarity index 100%
rename from graphics/pokemon/diancie/mega/icon.png
rename to graphics/pokemon/gen_6/diancie/mega/icon.png
diff --git a/graphics/pokemon/diancie/mega/normal.pal b/graphics/pokemon/gen_6/diancie/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/diancie/mega/normal.pal
rename to graphics/pokemon/gen_6/diancie/mega/normal.pal
diff --git a/graphics/pokemon/diancie/mega/shiny.pal b/graphics/pokemon/gen_6/diancie/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/diancie/mega/shiny.pal
rename to graphics/pokemon/gen_6/diancie/mega/shiny.pal
diff --git a/graphics/pokemon/diancie/normal.pal b/graphics/pokemon/gen_6/diancie/normal.pal
similarity index 100%
rename from graphics/pokemon/diancie/normal.pal
rename to graphics/pokemon/gen_6/diancie/normal.pal
diff --git a/graphics/pokemon/diancie/shiny.pal b/graphics/pokemon/gen_6/diancie/shiny.pal
similarity index 100%
rename from graphics/pokemon/diancie/shiny.pal
rename to graphics/pokemon/gen_6/diancie/shiny.pal
diff --git a/graphics/pokemon/diggersby/anim_front.png b/graphics/pokemon/gen_6/diggersby/anim_front.png
similarity index 100%
rename from graphics/pokemon/diggersby/anim_front.png
rename to graphics/pokemon/gen_6/diggersby/anim_front.png
diff --git a/graphics/pokemon/diggersby/back.png b/graphics/pokemon/gen_6/diggersby/back.png
similarity index 100%
rename from graphics/pokemon/diggersby/back.png
rename to graphics/pokemon/gen_6/diggersby/back.png
diff --git a/graphics/pokemon/diggersby/footprint.png b/graphics/pokemon/gen_6/diggersby/footprint.png
similarity index 100%
rename from graphics/pokemon/diggersby/footprint.png
rename to graphics/pokemon/gen_6/diggersby/footprint.png
diff --git a/graphics/pokemon/diggersby/icon.png b/graphics/pokemon/gen_6/diggersby/icon.png
similarity index 100%
rename from graphics/pokemon/diggersby/icon.png
rename to graphics/pokemon/gen_6/diggersby/icon.png
diff --git a/graphics/pokemon/diggersby/normal.pal b/graphics/pokemon/gen_6/diggersby/normal.pal
similarity index 100%
rename from graphics/pokemon/diggersby/normal.pal
rename to graphics/pokemon/gen_6/diggersby/normal.pal
diff --git a/graphics/pokemon/diggersby/shiny.pal b/graphics/pokemon/gen_6/diggersby/shiny.pal
similarity index 100%
rename from graphics/pokemon/diggersby/shiny.pal
rename to graphics/pokemon/gen_6/diggersby/shiny.pal
diff --git a/graphics/pokemon/doublade/anim_front.png b/graphics/pokemon/gen_6/doublade/anim_front.png
similarity index 100%
rename from graphics/pokemon/doublade/anim_front.png
rename to graphics/pokemon/gen_6/doublade/anim_front.png
diff --git a/graphics/pokemon/doublade/back.png b/graphics/pokemon/gen_6/doublade/back.png
similarity index 100%
rename from graphics/pokemon/doublade/back.png
rename to graphics/pokemon/gen_6/doublade/back.png
diff --git a/graphics/pokemon/seel/footprint.png b/graphics/pokemon/gen_6/doublade/footprint.png
similarity index 100%
rename from graphics/pokemon/seel/footprint.png
rename to graphics/pokemon/gen_6/doublade/footprint.png
diff --git a/graphics/pokemon/doublade/icon.png b/graphics/pokemon/gen_6/doublade/icon.png
similarity index 100%
rename from graphics/pokemon/doublade/icon.png
rename to graphics/pokemon/gen_6/doublade/icon.png
diff --git a/graphics/pokemon/doublade/normal.pal b/graphics/pokemon/gen_6/doublade/normal.pal
similarity index 100%
rename from graphics/pokemon/doublade/normal.pal
rename to graphics/pokemon/gen_6/doublade/normal.pal
diff --git a/graphics/pokemon/doublade/shiny.pal b/graphics/pokemon/gen_6/doublade/shiny.pal
similarity index 100%
rename from graphics/pokemon/doublade/shiny.pal
rename to graphics/pokemon/gen_6/doublade/shiny.pal
diff --git a/graphics/pokemon/dragalge/anim_front.png b/graphics/pokemon/gen_6/dragalge/anim_front.png
similarity index 100%
rename from graphics/pokemon/dragalge/anim_front.png
rename to graphics/pokemon/gen_6/dragalge/anim_front.png
diff --git a/graphics/pokemon/dragalge/back.png b/graphics/pokemon/gen_6/dragalge/back.png
similarity index 100%
rename from graphics/pokemon/dragalge/back.png
rename to graphics/pokemon/gen_6/dragalge/back.png
diff --git a/graphics/pokemon/serperior/footprint.png b/graphics/pokemon/gen_6/dragalge/footprint.png
similarity index 100%
rename from graphics/pokemon/serperior/footprint.png
rename to graphics/pokemon/gen_6/dragalge/footprint.png
diff --git a/graphics/pokemon/dragalge/icon.png b/graphics/pokemon/gen_6/dragalge/icon.png
similarity index 100%
rename from graphics/pokemon/dragalge/icon.png
rename to graphics/pokemon/gen_6/dragalge/icon.png
diff --git a/graphics/pokemon/dragalge/normal.pal b/graphics/pokemon/gen_6/dragalge/normal.pal
similarity index 100%
rename from graphics/pokemon/dragalge/normal.pal
rename to graphics/pokemon/gen_6/dragalge/normal.pal
diff --git a/graphics/pokemon/dragalge/shiny.pal b/graphics/pokemon/gen_6/dragalge/shiny.pal
similarity index 100%
rename from graphics/pokemon/dragalge/shiny.pal
rename to graphics/pokemon/gen_6/dragalge/shiny.pal
diff --git a/graphics/pokemon/espurr/anim_front.png b/graphics/pokemon/gen_6/espurr/anim_front.png
similarity index 100%
rename from graphics/pokemon/espurr/anim_front.png
rename to graphics/pokemon/gen_6/espurr/anim_front.png
diff --git a/graphics/pokemon/espurr/back.png b/graphics/pokemon/gen_6/espurr/back.png
similarity index 100%
rename from graphics/pokemon/espurr/back.png
rename to graphics/pokemon/gen_6/espurr/back.png
diff --git a/graphics/pokemon/ralts/footprint.png b/graphics/pokemon/gen_6/espurr/footprint.png
similarity index 100%
rename from graphics/pokemon/ralts/footprint.png
rename to graphics/pokemon/gen_6/espurr/footprint.png
diff --git a/graphics/pokemon/espurr/icon.png b/graphics/pokemon/gen_6/espurr/icon.png
similarity index 100%
rename from graphics/pokemon/espurr/icon.png
rename to graphics/pokemon/gen_6/espurr/icon.png
diff --git a/graphics/pokemon/espurr/normal.pal b/graphics/pokemon/gen_6/espurr/normal.pal
similarity index 100%
rename from graphics/pokemon/espurr/normal.pal
rename to graphics/pokemon/gen_6/espurr/normal.pal
diff --git a/graphics/pokemon/espurr/shiny.pal b/graphics/pokemon/gen_6/espurr/shiny.pal
similarity index 100%
rename from graphics/pokemon/espurr/shiny.pal
rename to graphics/pokemon/gen_6/espurr/shiny.pal
diff --git a/graphics/pokemon/fennekin/anim_front.png b/graphics/pokemon/gen_6/fennekin/anim_front.png
similarity index 100%
rename from graphics/pokemon/fennekin/anim_front.png
rename to graphics/pokemon/gen_6/fennekin/anim_front.png
diff --git a/graphics/pokemon/fennekin/back.png b/graphics/pokemon/gen_6/fennekin/back.png
similarity index 100%
rename from graphics/pokemon/fennekin/back.png
rename to graphics/pokemon/gen_6/fennekin/back.png
diff --git a/graphics/pokemon/joltik/footprint.png b/graphics/pokemon/gen_6/fennekin/footprint.png
similarity index 100%
rename from graphics/pokemon/joltik/footprint.png
rename to graphics/pokemon/gen_6/fennekin/footprint.png
diff --git a/graphics/pokemon/fennekin/icon.png b/graphics/pokemon/gen_6/fennekin/icon.png
similarity index 100%
rename from graphics/pokemon/fennekin/icon.png
rename to graphics/pokemon/gen_6/fennekin/icon.png
diff --git a/graphics/pokemon/fennekin/normal.pal b/graphics/pokemon/gen_6/fennekin/normal.pal
similarity index 100%
rename from graphics/pokemon/fennekin/normal.pal
rename to graphics/pokemon/gen_6/fennekin/normal.pal
diff --git a/graphics/pokemon/fennekin/shiny.pal b/graphics/pokemon/gen_6/fennekin/shiny.pal
similarity index 100%
rename from graphics/pokemon/fennekin/shiny.pal
rename to graphics/pokemon/gen_6/fennekin/shiny.pal
diff --git a/graphics/pokemon/flabebe/anim_front.png b/graphics/pokemon/gen_6/flabebe/anim_front.png
similarity index 100%
rename from graphics/pokemon/flabebe/anim_front.png
rename to graphics/pokemon/gen_6/flabebe/anim_front.png
diff --git a/graphics/pokemon/flabebe/back.png b/graphics/pokemon/gen_6/flabebe/back.png
similarity index 100%
rename from graphics/pokemon/flabebe/back.png
rename to graphics/pokemon/gen_6/flabebe/back.png
diff --git a/graphics/pokemon/flabebe/blue_flower/icon.png b/graphics/pokemon/gen_6/flabebe/blue_flower/icon.png
similarity index 100%
rename from graphics/pokemon/flabebe/blue_flower/icon.png
rename to graphics/pokemon/gen_6/flabebe/blue_flower/icon.png
diff --git a/graphics/pokemon/flabebe/blue_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/blue_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/flabebe/blue_flower/normal.pal
rename to graphics/pokemon/gen_6/flabebe/blue_flower/normal.pal
diff --git a/graphics/pokemon/flabebe/blue_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/blue_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/flabebe/blue_flower/shiny.pal
rename to graphics/pokemon/gen_6/flabebe/blue_flower/shiny.pal
diff --git a/graphics/pokemon/seviper/footprint.png b/graphics/pokemon/gen_6/flabebe/footprint.png
similarity index 100%
rename from graphics/pokemon/seviper/footprint.png
rename to graphics/pokemon/gen_6/flabebe/footprint.png
diff --git a/graphics/pokemon/flabebe/icon.png b/graphics/pokemon/gen_6/flabebe/icon.png
similarity index 100%
rename from graphics/pokemon/flabebe/icon.png
rename to graphics/pokemon/gen_6/flabebe/icon.png
diff --git a/graphics/pokemon/flabebe/normal.pal b/graphics/pokemon/gen_6/flabebe/normal.pal
similarity index 100%
rename from graphics/pokemon/flabebe/normal.pal
rename to graphics/pokemon/gen_6/flabebe/normal.pal
diff --git a/graphics/pokemon/flabebe/orange_flower/icon.png b/graphics/pokemon/gen_6/flabebe/orange_flower/icon.png
similarity index 100%
rename from graphics/pokemon/flabebe/orange_flower/icon.png
rename to graphics/pokemon/gen_6/flabebe/orange_flower/icon.png
diff --git a/graphics/pokemon/flabebe/orange_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/orange_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/flabebe/orange_flower/normal.pal
rename to graphics/pokemon/gen_6/flabebe/orange_flower/normal.pal
diff --git a/graphics/pokemon/flabebe/orange_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/orange_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/flabebe/orange_flower/shiny.pal
rename to graphics/pokemon/gen_6/flabebe/orange_flower/shiny.pal
diff --git a/graphics/pokemon/flabebe/shiny.pal b/graphics/pokemon/gen_6/flabebe/shiny.pal
similarity index 100%
rename from graphics/pokemon/flabebe/shiny.pal
rename to graphics/pokemon/gen_6/flabebe/shiny.pal
diff --git a/graphics/pokemon/flabebe/white_flower/icon.png b/graphics/pokemon/gen_6/flabebe/white_flower/icon.png
similarity index 100%
rename from graphics/pokemon/flabebe/white_flower/icon.png
rename to graphics/pokemon/gen_6/flabebe/white_flower/icon.png
diff --git a/graphics/pokemon/flabebe/white_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/white_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/flabebe/white_flower/normal.pal
rename to graphics/pokemon/gen_6/flabebe/white_flower/normal.pal
diff --git a/graphics/pokemon/flabebe/white_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/white_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/flabebe/white_flower/shiny.pal
rename to graphics/pokemon/gen_6/flabebe/white_flower/shiny.pal
diff --git a/graphics/pokemon/flabebe/yellow_flower/icon.png b/graphics/pokemon/gen_6/flabebe/yellow_flower/icon.png
similarity index 100%
rename from graphics/pokemon/flabebe/yellow_flower/icon.png
rename to graphics/pokemon/gen_6/flabebe/yellow_flower/icon.png
diff --git a/graphics/pokemon/flabebe/yellow_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/yellow_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/flabebe/yellow_flower/normal.pal
rename to graphics/pokemon/gen_6/flabebe/yellow_flower/normal.pal
diff --git a/graphics/pokemon/flabebe/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/flabebe/yellow_flower/shiny.pal
rename to graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.pal
diff --git a/graphics/pokemon/fletchinder/anim_front.png b/graphics/pokemon/gen_6/fletchinder/anim_front.png
similarity index 100%
rename from graphics/pokemon/fletchinder/anim_front.png
rename to graphics/pokemon/gen_6/fletchinder/anim_front.png
diff --git a/graphics/pokemon/fletchinder/back.png b/graphics/pokemon/gen_6/fletchinder/back.png
similarity index 100%
rename from graphics/pokemon/fletchinder/back.png
rename to graphics/pokemon/gen_6/fletchinder/back.png
diff --git a/graphics/pokemon/fletchinder/footprint.png b/graphics/pokemon/gen_6/fletchinder/footprint.png
similarity index 100%
rename from graphics/pokemon/fletchinder/footprint.png
rename to graphics/pokemon/gen_6/fletchinder/footprint.png
diff --git a/graphics/pokemon/fletchinder/icon.png b/graphics/pokemon/gen_6/fletchinder/icon.png
similarity index 100%
rename from graphics/pokemon/fletchinder/icon.png
rename to graphics/pokemon/gen_6/fletchinder/icon.png
diff --git a/graphics/pokemon/fletchinder/normal.pal b/graphics/pokemon/gen_6/fletchinder/normal.pal
similarity index 100%
rename from graphics/pokemon/fletchinder/normal.pal
rename to graphics/pokemon/gen_6/fletchinder/normal.pal
diff --git a/graphics/pokemon/fletchinder/shiny.pal b/graphics/pokemon/gen_6/fletchinder/shiny.pal
similarity index 100%
rename from graphics/pokemon/fletchinder/shiny.pal
rename to graphics/pokemon/gen_6/fletchinder/shiny.pal
diff --git a/graphics/pokemon/fletchling/anim_front.png b/graphics/pokemon/gen_6/fletchling/anim_front.png
similarity index 100%
rename from graphics/pokemon/fletchling/anim_front.png
rename to graphics/pokemon/gen_6/fletchling/anim_front.png
diff --git a/graphics/pokemon/fletchling/back.png b/graphics/pokemon/gen_6/fletchling/back.png
similarity index 100%
rename from graphics/pokemon/fletchling/back.png
rename to graphics/pokemon/gen_6/fletchling/back.png
diff --git a/graphics/pokemon/fletchling/footprint.png b/graphics/pokemon/gen_6/fletchling/footprint.png
similarity index 100%
rename from graphics/pokemon/fletchling/footprint.png
rename to graphics/pokemon/gen_6/fletchling/footprint.png
diff --git a/graphics/pokemon/fletchling/icon.png b/graphics/pokemon/gen_6/fletchling/icon.png
similarity index 100%
rename from graphics/pokemon/fletchling/icon.png
rename to graphics/pokemon/gen_6/fletchling/icon.png
diff --git a/graphics/pokemon/fletchling/normal.pal b/graphics/pokemon/gen_6/fletchling/normal.pal
similarity index 100%
rename from graphics/pokemon/fletchling/normal.pal
rename to graphics/pokemon/gen_6/fletchling/normal.pal
diff --git a/graphics/pokemon/fletchling/shiny.pal b/graphics/pokemon/gen_6/fletchling/shiny.pal
similarity index 100%
rename from graphics/pokemon/fletchling/shiny.pal
rename to graphics/pokemon/gen_6/fletchling/shiny.pal
diff --git a/graphics/pokemon/floette/anim_front.png b/graphics/pokemon/gen_6/floette/anim_front.png
similarity index 100%
rename from graphics/pokemon/floette/anim_front.png
rename to graphics/pokemon/gen_6/floette/anim_front.png
diff --git a/graphics/pokemon/floette/back.png b/graphics/pokemon/gen_6/floette/back.png
similarity index 100%
rename from graphics/pokemon/floette/back.png
rename to graphics/pokemon/gen_6/floette/back.png
diff --git a/graphics/pokemon/floette/blue_flower/icon.png b/graphics/pokemon/gen_6/floette/blue_flower/icon.png
similarity index 100%
rename from graphics/pokemon/floette/blue_flower/icon.png
rename to graphics/pokemon/gen_6/floette/blue_flower/icon.png
diff --git a/graphics/pokemon/floette/blue_flower/normal.pal b/graphics/pokemon/gen_6/floette/blue_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/blue_flower/normal.pal
rename to graphics/pokemon/gen_6/floette/blue_flower/normal.pal
diff --git a/graphics/pokemon/floette/blue_flower/shiny.pal b/graphics/pokemon/gen_6/floette/blue_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/blue_flower/shiny.pal
rename to graphics/pokemon/gen_6/floette/blue_flower/shiny.pal
diff --git a/graphics/pokemon/floette/eternal_flower/anim_front.png b/graphics/pokemon/gen_6/floette/eternal_flower/anim_front.png
similarity index 100%
rename from graphics/pokemon/floette/eternal_flower/anim_front.png
rename to graphics/pokemon/gen_6/floette/eternal_flower/anim_front.png
diff --git a/graphics/pokemon/floette/eternal_flower/back.png b/graphics/pokemon/gen_6/floette/eternal_flower/back.png
similarity index 100%
rename from graphics/pokemon/floette/eternal_flower/back.png
rename to graphics/pokemon/gen_6/floette/eternal_flower/back.png
diff --git a/graphics/pokemon/floette/eternal_flower/icon.png b/graphics/pokemon/gen_6/floette/eternal_flower/icon.png
similarity index 100%
rename from graphics/pokemon/floette/eternal_flower/icon.png
rename to graphics/pokemon/gen_6/floette/eternal_flower/icon.png
diff --git a/graphics/pokemon/floette/eternal_flower/normal.pal b/graphics/pokemon/gen_6/floette/eternal_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/eternal_flower/normal.pal
rename to graphics/pokemon/gen_6/floette/eternal_flower/normal.pal
diff --git a/graphics/pokemon/floette/eternal_flower/shiny.pal b/graphics/pokemon/gen_6/floette/eternal_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/eternal_flower/shiny.pal
rename to graphics/pokemon/gen_6/floette/eternal_flower/shiny.pal
diff --git a/graphics/pokemon/sharpedo/footprint.png b/graphics/pokemon/gen_6/floette/footprint.png
similarity index 100%
rename from graphics/pokemon/sharpedo/footprint.png
rename to graphics/pokemon/gen_6/floette/footprint.png
diff --git a/graphics/pokemon/floette/icon.png b/graphics/pokemon/gen_6/floette/icon.png
similarity index 100%
rename from graphics/pokemon/floette/icon.png
rename to graphics/pokemon/gen_6/floette/icon.png
diff --git a/graphics/pokemon/floette/normal.pal b/graphics/pokemon/gen_6/floette/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/normal.pal
rename to graphics/pokemon/gen_6/floette/normal.pal
diff --git a/graphics/pokemon/floette/orange_flower/icon.png b/graphics/pokemon/gen_6/floette/orange_flower/icon.png
similarity index 100%
rename from graphics/pokemon/floette/orange_flower/icon.png
rename to graphics/pokemon/gen_6/floette/orange_flower/icon.png
diff --git a/graphics/pokemon/floette/orange_flower/normal.pal b/graphics/pokemon/gen_6/floette/orange_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/orange_flower/normal.pal
rename to graphics/pokemon/gen_6/floette/orange_flower/normal.pal
diff --git a/graphics/pokemon/floette/orange_flower/shiny.pal b/graphics/pokemon/gen_6/floette/orange_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/orange_flower/shiny.pal
rename to graphics/pokemon/gen_6/floette/orange_flower/shiny.pal
diff --git a/graphics/pokemon/floette/shiny.pal b/graphics/pokemon/gen_6/floette/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/shiny.pal
rename to graphics/pokemon/gen_6/floette/shiny.pal
diff --git a/graphics/pokemon/floette/white_flower/icon.png b/graphics/pokemon/gen_6/floette/white_flower/icon.png
similarity index 100%
rename from graphics/pokemon/floette/white_flower/icon.png
rename to graphics/pokemon/gen_6/floette/white_flower/icon.png
diff --git a/graphics/pokemon/floette/white_flower/normal.pal b/graphics/pokemon/gen_6/floette/white_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/white_flower/normal.pal
rename to graphics/pokemon/gen_6/floette/white_flower/normal.pal
diff --git a/graphics/pokemon/floette/white_flower/shiny.pal b/graphics/pokemon/gen_6/floette/white_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/white_flower/shiny.pal
rename to graphics/pokemon/gen_6/floette/white_flower/shiny.pal
diff --git a/graphics/pokemon/floette/yellow_flower/icon.png b/graphics/pokemon/gen_6/floette/yellow_flower/icon.png
similarity index 100%
rename from graphics/pokemon/floette/yellow_flower/icon.png
rename to graphics/pokemon/gen_6/floette/yellow_flower/icon.png
diff --git a/graphics/pokemon/floette/yellow_flower/normal.pal b/graphics/pokemon/gen_6/floette/yellow_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/floette/yellow_flower/normal.pal
rename to graphics/pokemon/gen_6/floette/yellow_flower/normal.pal
diff --git a/graphics/pokemon/floette/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/floette/yellow_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/floette/yellow_flower/shiny.pal
rename to graphics/pokemon/gen_6/floette/yellow_flower/shiny.pal
diff --git a/graphics/pokemon/florges/anim_front.png b/graphics/pokemon/gen_6/florges/anim_front.png
similarity index 100%
rename from graphics/pokemon/florges/anim_front.png
rename to graphics/pokemon/gen_6/florges/anim_front.png
diff --git a/graphics/pokemon/florges/back.png b/graphics/pokemon/gen_6/florges/back.png
similarity index 100%
rename from graphics/pokemon/florges/back.png
rename to graphics/pokemon/gen_6/florges/back.png
diff --git a/graphics/pokemon/florges/blue_flower/icon.png b/graphics/pokemon/gen_6/florges/blue_flower/icon.png
similarity index 100%
rename from graphics/pokemon/florges/blue_flower/icon.png
rename to graphics/pokemon/gen_6/florges/blue_flower/icon.png
diff --git a/graphics/pokemon/florges/blue_flower/normal.pal b/graphics/pokemon/gen_6/florges/blue_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/florges/blue_flower/normal.pal
rename to graphics/pokemon/gen_6/florges/blue_flower/normal.pal
diff --git a/graphics/pokemon/florges/blue_flower/shiny.pal b/graphics/pokemon/gen_6/florges/blue_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/florges/blue_flower/shiny.pal
rename to graphics/pokemon/gen_6/florges/blue_flower/shiny.pal
diff --git a/graphics/pokemon/shellder/footprint.png b/graphics/pokemon/gen_6/florges/footprint.png
similarity index 100%
rename from graphics/pokemon/shellder/footprint.png
rename to graphics/pokemon/gen_6/florges/footprint.png
diff --git a/graphics/pokemon/florges/icon.png b/graphics/pokemon/gen_6/florges/icon.png
similarity index 100%
rename from graphics/pokemon/florges/icon.png
rename to graphics/pokemon/gen_6/florges/icon.png
diff --git a/graphics/pokemon/florges/normal.pal b/graphics/pokemon/gen_6/florges/normal.pal
similarity index 100%
rename from graphics/pokemon/florges/normal.pal
rename to graphics/pokemon/gen_6/florges/normal.pal
diff --git a/graphics/pokemon/florges/orange_flower/icon.png b/graphics/pokemon/gen_6/florges/orange_flower/icon.png
similarity index 100%
rename from graphics/pokemon/florges/orange_flower/icon.png
rename to graphics/pokemon/gen_6/florges/orange_flower/icon.png
diff --git a/graphics/pokemon/florges/orange_flower/normal.pal b/graphics/pokemon/gen_6/florges/orange_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/florges/orange_flower/normal.pal
rename to graphics/pokemon/gen_6/florges/orange_flower/normal.pal
diff --git a/graphics/pokemon/florges/orange_flower/shiny.pal b/graphics/pokemon/gen_6/florges/orange_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/florges/orange_flower/shiny.pal
rename to graphics/pokemon/gen_6/florges/orange_flower/shiny.pal
diff --git a/graphics/pokemon/florges/shiny.pal b/graphics/pokemon/gen_6/florges/shiny.pal
similarity index 100%
rename from graphics/pokemon/florges/shiny.pal
rename to graphics/pokemon/gen_6/florges/shiny.pal
diff --git a/graphics/pokemon/florges/white_flower/icon.png b/graphics/pokemon/gen_6/florges/white_flower/icon.png
similarity index 100%
rename from graphics/pokemon/florges/white_flower/icon.png
rename to graphics/pokemon/gen_6/florges/white_flower/icon.png
diff --git a/graphics/pokemon/florges/white_flower/normal.pal b/graphics/pokemon/gen_6/florges/white_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/florges/white_flower/normal.pal
rename to graphics/pokemon/gen_6/florges/white_flower/normal.pal
diff --git a/graphics/pokemon/florges/white_flower/shiny.pal b/graphics/pokemon/gen_6/florges/white_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/florges/white_flower/shiny.pal
rename to graphics/pokemon/gen_6/florges/white_flower/shiny.pal
diff --git a/graphics/pokemon/florges/yellow_flower/icon.png b/graphics/pokemon/gen_6/florges/yellow_flower/icon.png
similarity index 100%
rename from graphics/pokemon/florges/yellow_flower/icon.png
rename to graphics/pokemon/gen_6/florges/yellow_flower/icon.png
diff --git a/graphics/pokemon/florges/yellow_flower/normal.pal b/graphics/pokemon/gen_6/florges/yellow_flower/normal.pal
similarity index 100%
rename from graphics/pokemon/florges/yellow_flower/normal.pal
rename to graphics/pokemon/gen_6/florges/yellow_flower/normal.pal
diff --git a/graphics/pokemon/florges/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/florges/yellow_flower/shiny.pal
similarity index 100%
rename from graphics/pokemon/florges/yellow_flower/shiny.pal
rename to graphics/pokemon/gen_6/florges/yellow_flower/shiny.pal
diff --git a/graphics/pokemon/froakie/anim_front.png b/graphics/pokemon/gen_6/froakie/anim_front.png
similarity index 100%
rename from graphics/pokemon/froakie/anim_front.png
rename to graphics/pokemon/gen_6/froakie/anim_front.png
diff --git a/graphics/pokemon/froakie/back.png b/graphics/pokemon/gen_6/froakie/back.png
similarity index 100%
rename from graphics/pokemon/froakie/back.png
rename to graphics/pokemon/gen_6/froakie/back.png
diff --git a/graphics/pokemon/froakie/footprint.png b/graphics/pokemon/gen_6/froakie/footprint.png
similarity index 100%
rename from graphics/pokemon/froakie/footprint.png
rename to graphics/pokemon/gen_6/froakie/footprint.png
diff --git a/graphics/pokemon/froakie/icon.png b/graphics/pokemon/gen_6/froakie/icon.png
similarity index 100%
rename from graphics/pokemon/froakie/icon.png
rename to graphics/pokemon/gen_6/froakie/icon.png
diff --git a/graphics/pokemon/froakie/normal.pal b/graphics/pokemon/gen_6/froakie/normal.pal
similarity index 100%
rename from graphics/pokemon/froakie/normal.pal
rename to graphics/pokemon/gen_6/froakie/normal.pal
diff --git a/graphics/pokemon/froakie/shiny.pal b/graphics/pokemon/gen_6/froakie/shiny.pal
similarity index 100%
rename from graphics/pokemon/froakie/shiny.pal
rename to graphics/pokemon/gen_6/froakie/shiny.pal
diff --git a/graphics/pokemon/frogadier/anim_front.png b/graphics/pokemon/gen_6/frogadier/anim_front.png
similarity index 100%
rename from graphics/pokemon/frogadier/anim_front.png
rename to graphics/pokemon/gen_6/frogadier/anim_front.png
diff --git a/graphics/pokemon/frogadier/back.png b/graphics/pokemon/gen_6/frogadier/back.png
similarity index 100%
rename from graphics/pokemon/frogadier/back.png
rename to graphics/pokemon/gen_6/frogadier/back.png
diff --git a/graphics/pokemon/frogadier/footprint.png b/graphics/pokemon/gen_6/frogadier/footprint.png
similarity index 100%
rename from graphics/pokemon/frogadier/footprint.png
rename to graphics/pokemon/gen_6/frogadier/footprint.png
diff --git a/graphics/pokemon/frogadier/icon.png b/graphics/pokemon/gen_6/frogadier/icon.png
similarity index 100%
rename from graphics/pokemon/frogadier/icon.png
rename to graphics/pokemon/gen_6/frogadier/icon.png
diff --git a/graphics/pokemon/frogadier/normal.pal b/graphics/pokemon/gen_6/frogadier/normal.pal
similarity index 100%
rename from graphics/pokemon/frogadier/normal.pal
rename to graphics/pokemon/gen_6/frogadier/normal.pal
diff --git a/graphics/pokemon/frogadier/shiny.pal b/graphics/pokemon/gen_6/frogadier/shiny.pal
similarity index 100%
rename from graphics/pokemon/frogadier/shiny.pal
rename to graphics/pokemon/gen_6/frogadier/shiny.pal
diff --git a/graphics/pokemon/furfrou/anim_front.png b/graphics/pokemon/gen_6/furfrou/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/anim_front.png
diff --git a/graphics/pokemon/furfrou/back.png b/graphics/pokemon/gen_6/furfrou/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/back.png
rename to graphics/pokemon/gen_6/furfrou/back.png
diff --git a/graphics/pokemon/furfrou/dandy_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/dandy_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/dandy_trim/back.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/dandy_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/dandy_trim/back.png
diff --git a/graphics/pokemon/furfrou/dandy_trim/icon.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/dandy_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/dandy_trim/icon.png
diff --git a/graphics/pokemon/furfrou/dandy_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/dandy_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/dandy_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/dandy_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/dandy_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/dandy_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/debutante_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/debutante_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/debutante_trim/back.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/debutante_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/debutante_trim/back.png
diff --git a/graphics/pokemon/furfrou/debutante_trim/icon.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/debutante_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/debutante_trim/icon.png
diff --git a/graphics/pokemon/furfrou/debutante_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/debutante_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/debutante_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/debutante_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/debutante_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/debutante_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/diamond_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/diamond_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/diamond_trim/back.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/diamond_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/diamond_trim/back.png
diff --git a/graphics/pokemon/furfrou/diamond_trim/icon.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/diamond_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/diamond_trim/icon.png
diff --git a/graphics/pokemon/furfrou/diamond_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/diamond_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/diamond_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/diamond_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/diamond_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/diamond_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.pal
diff --git a/graphics/pokemon/crabominable/footprint.png b/graphics/pokemon/gen_6/furfrou/footprint.png
similarity index 100%
rename from graphics/pokemon/crabominable/footprint.png
rename to graphics/pokemon/gen_6/furfrou/footprint.png
diff --git a/graphics/pokemon/furfrou/heart_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/heart_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/heart_trim/back.png b/graphics/pokemon/gen_6/furfrou/heart_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/heart_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/heart_trim/back.png
diff --git a/graphics/pokemon/furfrou/heart_trim/icon.png b/graphics/pokemon/gen_6/furfrou/heart_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/heart_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/heart_trim/icon.png
diff --git a/graphics/pokemon/furfrou/heart_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/heart_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/heart_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/heart_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/heart_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/heart_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/heart_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/heart_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/icon.png b/graphics/pokemon/gen_6/furfrou/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/icon.png
rename to graphics/pokemon/gen_6/furfrou/icon.png
diff --git a/graphics/pokemon/furfrou/kabuki_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/kabuki_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/kabuki_trim/back.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/kabuki_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/back.png
diff --git a/graphics/pokemon/furfrou/kabuki_trim/icon.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/kabuki_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.png
diff --git a/graphics/pokemon/furfrou/kabuki_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/kabuki_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/kabuki_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/kabuki_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/la_reine_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/la_reine_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/la_reine_trim/back.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/la_reine_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/back.png
diff --git a/graphics/pokemon/furfrou/la_reine_trim/icon.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/la_reine_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.png
diff --git a/graphics/pokemon/furfrou/la_reine_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/la_reine_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/la_reine_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/la_reine_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/matron_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/matron_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/matron_trim/back.png b/graphics/pokemon/gen_6/furfrou/matron_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/matron_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/matron_trim/back.png
diff --git a/graphics/pokemon/furfrou/matron_trim/icon.png b/graphics/pokemon/gen_6/furfrou/matron_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/matron_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/matron_trim/icon.png
diff --git a/graphics/pokemon/furfrou/matron_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/matron_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/matron_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/matron_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/matron_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/matron_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/matron_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/matron_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/normal.pal b/graphics/pokemon/gen_6/furfrou/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/normal.pal
rename to graphics/pokemon/gen_6/furfrou/normal.pal
diff --git a/graphics/pokemon/furfrou/pharaoh_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/pharaoh_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/pharaoh_trim/back.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/pharaoh_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.png
diff --git a/graphics/pokemon/furfrou/pharaoh_trim/icon.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/pharaoh_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.png
diff --git a/graphics/pokemon/furfrou/pharaoh_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/pharaoh_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/pharaoh_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/pharaoh_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.pal
diff --git a/graphics/pokemon/furfrou/shiny.pal b/graphics/pokemon/gen_6/furfrou/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/shiny.pal
diff --git a/graphics/pokemon/furfrou/star_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/star_trim/anim_front.png
similarity index 100%
rename from graphics/pokemon/furfrou/star_trim/anim_front.png
rename to graphics/pokemon/gen_6/furfrou/star_trim/anim_front.png
diff --git a/graphics/pokemon/furfrou/star_trim/back.png b/graphics/pokemon/gen_6/furfrou/star_trim/back.png
similarity index 100%
rename from graphics/pokemon/furfrou/star_trim/back.png
rename to graphics/pokemon/gen_6/furfrou/star_trim/back.png
diff --git a/graphics/pokemon/furfrou/star_trim/icon.png b/graphics/pokemon/gen_6/furfrou/star_trim/icon.png
similarity index 100%
rename from graphics/pokemon/furfrou/star_trim/icon.png
rename to graphics/pokemon/gen_6/furfrou/star_trim/icon.png
diff --git a/graphics/pokemon/furfrou/star_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/star_trim/normal.pal
similarity index 100%
rename from graphics/pokemon/furfrou/star_trim/normal.pal
rename to graphics/pokemon/gen_6/furfrou/star_trim/normal.pal
diff --git a/graphics/pokemon/furfrou/star_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/star_trim/shiny.pal
similarity index 100%
rename from graphics/pokemon/furfrou/star_trim/shiny.pal
rename to graphics/pokemon/gen_6/furfrou/star_trim/shiny.pal
diff --git a/graphics/pokemon/gogoat/anim_front.png b/graphics/pokemon/gen_6/gogoat/anim_front.png
similarity index 100%
rename from graphics/pokemon/gogoat/anim_front.png
rename to graphics/pokemon/gen_6/gogoat/anim_front.png
diff --git a/graphics/pokemon/gogoat/back.png b/graphics/pokemon/gen_6/gogoat/back.png
similarity index 100%
rename from graphics/pokemon/gogoat/back.png
rename to graphics/pokemon/gen_6/gogoat/back.png
diff --git a/graphics/pokemon/gogoat/footprint.png b/graphics/pokemon/gen_6/gogoat/footprint.png
similarity index 100%
rename from graphics/pokemon/gogoat/footprint.png
rename to graphics/pokemon/gen_6/gogoat/footprint.png
diff --git a/graphics/pokemon/gogoat/icon.png b/graphics/pokemon/gen_6/gogoat/icon.png
similarity index 100%
rename from graphics/pokemon/gogoat/icon.png
rename to graphics/pokemon/gen_6/gogoat/icon.png
diff --git a/graphics/pokemon/gogoat/normal.pal b/graphics/pokemon/gen_6/gogoat/normal.pal
similarity index 100%
rename from graphics/pokemon/gogoat/normal.pal
rename to graphics/pokemon/gen_6/gogoat/normal.pal
diff --git a/graphics/pokemon/gogoat/shiny.pal b/graphics/pokemon/gen_6/gogoat/shiny.pal
similarity index 100%
rename from graphics/pokemon/gogoat/shiny.pal
rename to graphics/pokemon/gen_6/gogoat/shiny.pal
diff --git a/graphics/pokemon/goodra/anim_front.png b/graphics/pokemon/gen_6/goodra/anim_front.png
similarity index 100%
rename from graphics/pokemon/goodra/anim_front.png
rename to graphics/pokemon/gen_6/goodra/anim_front.png
diff --git a/graphics/pokemon/goodra/back.png b/graphics/pokemon/gen_6/goodra/back.png
similarity index 100%
rename from graphics/pokemon/goodra/back.png
rename to graphics/pokemon/gen_6/goodra/back.png
diff --git a/graphics/pokemon/zorua/footprint.png b/graphics/pokemon/gen_6/goodra/footprint.png
similarity index 100%
rename from graphics/pokemon/zorua/footprint.png
rename to graphics/pokemon/gen_6/goodra/footprint.png
diff --git a/graphics/pokemon/goodra/hisuian/back.png b/graphics/pokemon/gen_6/goodra/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/goodra/hisuian/back.png
rename to graphics/pokemon/gen_6/goodra/hisuian/back.png
diff --git a/graphics/pokemon/goodra/hisuian/front.png b/graphics/pokemon/gen_6/goodra/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/goodra/hisuian/front.png
rename to graphics/pokemon/gen_6/goodra/hisuian/front.png
diff --git a/graphics/pokemon/goodra/hisuian/icon.png b/graphics/pokemon/gen_6/goodra/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/goodra/hisuian/icon.png
rename to graphics/pokemon/gen_6/goodra/hisuian/icon.png
diff --git a/graphics/pokemon/goodra/hisuian/normal.pal b/graphics/pokemon/gen_6/goodra/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/goodra/hisuian/normal.pal
rename to graphics/pokemon/gen_6/goodra/hisuian/normal.pal
diff --git a/graphics/pokemon/goodra/hisuian/shiny.pal b/graphics/pokemon/gen_6/goodra/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/goodra/hisuian/shiny.pal
rename to graphics/pokemon/gen_6/goodra/hisuian/shiny.pal
diff --git a/graphics/pokemon/goodra/icon.png b/graphics/pokemon/gen_6/goodra/icon.png
similarity index 100%
rename from graphics/pokemon/goodra/icon.png
rename to graphics/pokemon/gen_6/goodra/icon.png
diff --git a/graphics/pokemon/goodra/normal.pal b/graphics/pokemon/gen_6/goodra/normal.pal
similarity index 100%
rename from graphics/pokemon/goodra/normal.pal
rename to graphics/pokemon/gen_6/goodra/normal.pal
diff --git a/graphics/pokemon/goodra/shiny.pal b/graphics/pokemon/gen_6/goodra/shiny.pal
similarity index 100%
rename from graphics/pokemon/goodra/shiny.pal
rename to graphics/pokemon/gen_6/goodra/shiny.pal
diff --git a/graphics/pokemon/goomy/anim_front.png b/graphics/pokemon/gen_6/goomy/anim_front.png
similarity index 100%
rename from graphics/pokemon/goomy/anim_front.png
rename to graphics/pokemon/gen_6/goomy/anim_front.png
diff --git a/graphics/pokemon/goomy/back.png b/graphics/pokemon/gen_6/goomy/back.png
similarity index 100%
rename from graphics/pokemon/goomy/back.png
rename to graphics/pokemon/gen_6/goomy/back.png
diff --git a/graphics/pokemon/shuppet/footprint.png b/graphics/pokemon/gen_6/goomy/footprint.png
similarity index 100%
rename from graphics/pokemon/shuppet/footprint.png
rename to graphics/pokemon/gen_6/goomy/footprint.png
diff --git a/graphics/pokemon/goomy/icon.png b/graphics/pokemon/gen_6/goomy/icon.png
similarity index 100%
rename from graphics/pokemon/goomy/icon.png
rename to graphics/pokemon/gen_6/goomy/icon.png
diff --git a/graphics/pokemon/goomy/normal.pal b/graphics/pokemon/gen_6/goomy/normal.pal
similarity index 100%
rename from graphics/pokemon/goomy/normal.pal
rename to graphics/pokemon/gen_6/goomy/normal.pal
diff --git a/graphics/pokemon/goomy/shiny.pal b/graphics/pokemon/gen_6/goomy/shiny.pal
similarity index 100%
rename from graphics/pokemon/goomy/shiny.pal
rename to graphics/pokemon/gen_6/goomy/shiny.pal
diff --git a/graphics/pokemon/gourgeist/anim_front.png b/graphics/pokemon/gen_6/gourgeist/anim_front.png
similarity index 100%
rename from graphics/pokemon/gourgeist/anim_front.png
rename to graphics/pokemon/gen_6/gourgeist/anim_front.png
diff --git a/graphics/pokemon/gourgeist/back.png b/graphics/pokemon/gen_6/gourgeist/back.png
similarity index 100%
rename from graphics/pokemon/gourgeist/back.png
rename to graphics/pokemon/gen_6/gourgeist/back.png
diff --git a/graphics/pokemon/regice/footprint.png b/graphics/pokemon/gen_6/gourgeist/footprint.png
similarity index 100%
rename from graphics/pokemon/regice/footprint.png
rename to graphics/pokemon/gen_6/gourgeist/footprint.png
diff --git a/graphics/pokemon/gourgeist/icon.png b/graphics/pokemon/gen_6/gourgeist/icon.png
similarity index 100%
rename from graphics/pokemon/gourgeist/icon.png
rename to graphics/pokemon/gen_6/gourgeist/icon.png
diff --git a/graphics/pokemon/gourgeist/large/anim_front.png b/graphics/pokemon/gen_6/gourgeist/large/anim_front.png
similarity index 100%
rename from graphics/pokemon/gourgeist/large/anim_front.png
rename to graphics/pokemon/gen_6/gourgeist/large/anim_front.png
diff --git a/graphics/pokemon/gourgeist/large/back.png b/graphics/pokemon/gen_6/gourgeist/large/back.png
similarity index 100%
rename from graphics/pokemon/gourgeist/large/back.png
rename to graphics/pokemon/gen_6/gourgeist/large/back.png
diff --git a/graphics/pokemon/gourgeist/normal.pal b/graphics/pokemon/gen_6/gourgeist/normal.pal
similarity index 100%
rename from graphics/pokemon/gourgeist/normal.pal
rename to graphics/pokemon/gen_6/gourgeist/normal.pal
diff --git a/graphics/pokemon/gourgeist/shiny.pal b/graphics/pokemon/gen_6/gourgeist/shiny.pal
similarity index 100%
rename from graphics/pokemon/gourgeist/shiny.pal
rename to graphics/pokemon/gen_6/gourgeist/shiny.pal
diff --git a/graphics/pokemon/gourgeist/small/anim_front.png b/graphics/pokemon/gen_6/gourgeist/small/anim_front.png
similarity index 100%
rename from graphics/pokemon/gourgeist/small/anim_front.png
rename to graphics/pokemon/gen_6/gourgeist/small/anim_front.png
diff --git a/graphics/pokemon/gourgeist/small/back.png b/graphics/pokemon/gen_6/gourgeist/small/back.png
similarity index 100%
rename from graphics/pokemon/gourgeist/small/back.png
rename to graphics/pokemon/gen_6/gourgeist/small/back.png
diff --git a/graphics/pokemon/gourgeist/super/anim_front.png b/graphics/pokemon/gen_6/gourgeist/super/anim_front.png
similarity index 100%
rename from graphics/pokemon/gourgeist/super/anim_front.png
rename to graphics/pokemon/gen_6/gourgeist/super/anim_front.png
diff --git a/graphics/pokemon/gourgeist/super/back.png b/graphics/pokemon/gen_6/gourgeist/super/back.png
similarity index 100%
rename from graphics/pokemon/gourgeist/super/back.png
rename to graphics/pokemon/gen_6/gourgeist/super/back.png
diff --git a/graphics/pokemon/greninja/anim_front.png b/graphics/pokemon/gen_6/greninja/anim_front.png
similarity index 100%
rename from graphics/pokemon/greninja/anim_front.png
rename to graphics/pokemon/gen_6/greninja/anim_front.png
diff --git a/graphics/pokemon/greninja/ash/anim_front.png b/graphics/pokemon/gen_6/greninja/ash/anim_front.png
similarity index 100%
rename from graphics/pokemon/greninja/ash/anim_front.png
rename to graphics/pokemon/gen_6/greninja/ash/anim_front.png
diff --git a/graphics/pokemon/greninja/ash/back.png b/graphics/pokemon/gen_6/greninja/ash/back.png
similarity index 100%
rename from graphics/pokemon/greninja/ash/back.png
rename to graphics/pokemon/gen_6/greninja/ash/back.png
diff --git a/graphics/pokemon/greninja/ash/icon.png b/graphics/pokemon/gen_6/greninja/ash/icon.png
similarity index 100%
rename from graphics/pokemon/greninja/ash/icon.png
rename to graphics/pokemon/gen_6/greninja/ash/icon.png
diff --git a/graphics/pokemon/greninja/ash/normal.pal b/graphics/pokemon/gen_6/greninja/ash/normal.pal
similarity index 100%
rename from graphics/pokemon/greninja/ash/normal.pal
rename to graphics/pokemon/gen_6/greninja/ash/normal.pal
diff --git a/graphics/pokemon/greninja/ash/shiny.pal b/graphics/pokemon/gen_6/greninja/ash/shiny.pal
similarity index 100%
rename from graphics/pokemon/greninja/ash/shiny.pal
rename to graphics/pokemon/gen_6/greninja/ash/shiny.pal
diff --git a/graphics/pokemon/greninja/back.png b/graphics/pokemon/gen_6/greninja/back.png
similarity index 100%
rename from graphics/pokemon/greninja/back.png
rename to graphics/pokemon/gen_6/greninja/back.png
diff --git a/graphics/pokemon/greninja/footprint.png b/graphics/pokemon/gen_6/greninja/footprint.png
similarity index 100%
rename from graphics/pokemon/greninja/footprint.png
rename to graphics/pokemon/gen_6/greninja/footprint.png
diff --git a/graphics/pokemon/greninja/icon.png b/graphics/pokemon/gen_6/greninja/icon.png
similarity index 100%
rename from graphics/pokemon/greninja/icon.png
rename to graphics/pokemon/gen_6/greninja/icon.png
diff --git a/graphics/pokemon/greninja/normal.pal b/graphics/pokemon/gen_6/greninja/normal.pal
similarity index 100%
rename from graphics/pokemon/greninja/normal.pal
rename to graphics/pokemon/gen_6/greninja/normal.pal
diff --git a/graphics/pokemon/greninja/shiny.pal b/graphics/pokemon/gen_6/greninja/shiny.pal
similarity index 100%
rename from graphics/pokemon/greninja/shiny.pal
rename to graphics/pokemon/gen_6/greninja/shiny.pal
diff --git a/graphics/pokemon/hawlucha/anim_front.png b/graphics/pokemon/gen_6/hawlucha/anim_front.png
similarity index 100%
rename from graphics/pokemon/hawlucha/anim_front.png
rename to graphics/pokemon/gen_6/hawlucha/anim_front.png
diff --git a/graphics/pokemon/hawlucha/back.png b/graphics/pokemon/gen_6/hawlucha/back.png
similarity index 100%
rename from graphics/pokemon/hawlucha/back.png
rename to graphics/pokemon/gen_6/hawlucha/back.png
diff --git a/graphics/pokemon/hawlucha/footprint.png b/graphics/pokemon/gen_6/hawlucha/footprint.png
similarity index 100%
rename from graphics/pokemon/hawlucha/footprint.png
rename to graphics/pokemon/gen_6/hawlucha/footprint.png
diff --git a/graphics/pokemon/hawlucha/icon.png b/graphics/pokemon/gen_6/hawlucha/icon.png
similarity index 100%
rename from graphics/pokemon/hawlucha/icon.png
rename to graphics/pokemon/gen_6/hawlucha/icon.png
diff --git a/graphics/pokemon/hawlucha/normal.pal b/graphics/pokemon/gen_6/hawlucha/normal.pal
similarity index 100%
rename from graphics/pokemon/hawlucha/normal.pal
rename to graphics/pokemon/gen_6/hawlucha/normal.pal
diff --git a/graphics/pokemon/hawlucha/shiny.pal b/graphics/pokemon/gen_6/hawlucha/shiny.pal
similarity index 100%
rename from graphics/pokemon/hawlucha/shiny.pal
rename to graphics/pokemon/gen_6/hawlucha/shiny.pal
diff --git a/graphics/pokemon/heliolisk/anim_front.png b/graphics/pokemon/gen_6/heliolisk/anim_front.png
similarity index 100%
rename from graphics/pokemon/heliolisk/anim_front.png
rename to graphics/pokemon/gen_6/heliolisk/anim_front.png
diff --git a/graphics/pokemon/heliolisk/back.png b/graphics/pokemon/gen_6/heliolisk/back.png
similarity index 100%
rename from graphics/pokemon/heliolisk/back.png
rename to graphics/pokemon/gen_6/heliolisk/back.png
diff --git a/graphics/pokemon/heliolisk/footprint.png b/graphics/pokemon/gen_6/heliolisk/footprint.png
similarity index 100%
rename from graphics/pokemon/heliolisk/footprint.png
rename to graphics/pokemon/gen_6/heliolisk/footprint.png
diff --git a/graphics/pokemon/heliolisk/icon.png b/graphics/pokemon/gen_6/heliolisk/icon.png
similarity index 100%
rename from graphics/pokemon/heliolisk/icon.png
rename to graphics/pokemon/gen_6/heliolisk/icon.png
diff --git a/graphics/pokemon/heliolisk/normal.pal b/graphics/pokemon/gen_6/heliolisk/normal.pal
similarity index 100%
rename from graphics/pokemon/heliolisk/normal.pal
rename to graphics/pokemon/gen_6/heliolisk/normal.pal
diff --git a/graphics/pokemon/heliolisk/shiny.pal b/graphics/pokemon/gen_6/heliolisk/shiny.pal
similarity index 100%
rename from graphics/pokemon/heliolisk/shiny.pal
rename to graphics/pokemon/gen_6/heliolisk/shiny.pal
diff --git a/graphics/pokemon/helioptile/anim_front.png b/graphics/pokemon/gen_6/helioptile/anim_front.png
similarity index 100%
rename from graphics/pokemon/helioptile/anim_front.png
rename to graphics/pokemon/gen_6/helioptile/anim_front.png
diff --git a/graphics/pokemon/helioptile/back.png b/graphics/pokemon/gen_6/helioptile/back.png
similarity index 100%
rename from graphics/pokemon/helioptile/back.png
rename to graphics/pokemon/gen_6/helioptile/back.png
diff --git a/graphics/pokemon/helioptile/footprint.png b/graphics/pokemon/gen_6/helioptile/footprint.png
similarity index 100%
rename from graphics/pokemon/helioptile/footprint.png
rename to graphics/pokemon/gen_6/helioptile/footprint.png
diff --git a/graphics/pokemon/helioptile/icon.png b/graphics/pokemon/gen_6/helioptile/icon.png
similarity index 100%
rename from graphics/pokemon/helioptile/icon.png
rename to graphics/pokemon/gen_6/helioptile/icon.png
diff --git a/graphics/pokemon/helioptile/normal.pal b/graphics/pokemon/gen_6/helioptile/normal.pal
similarity index 100%
rename from graphics/pokemon/helioptile/normal.pal
rename to graphics/pokemon/gen_6/helioptile/normal.pal
diff --git a/graphics/pokemon/helioptile/shiny.pal b/graphics/pokemon/gen_6/helioptile/shiny.pal
similarity index 100%
rename from graphics/pokemon/helioptile/shiny.pal
rename to graphics/pokemon/gen_6/helioptile/shiny.pal
diff --git a/graphics/pokemon/honedge/anim_front.png b/graphics/pokemon/gen_6/honedge/anim_front.png
similarity index 100%
rename from graphics/pokemon/honedge/anim_front.png
rename to graphics/pokemon/gen_6/honedge/anim_front.png
diff --git a/graphics/pokemon/honedge/back.png b/graphics/pokemon/gen_6/honedge/back.png
similarity index 100%
rename from graphics/pokemon/honedge/back.png
rename to graphics/pokemon/gen_6/honedge/back.png
diff --git a/graphics/pokemon/sigilyph/footprint.png b/graphics/pokemon/gen_6/honedge/footprint.png
similarity index 100%
rename from graphics/pokemon/sigilyph/footprint.png
rename to graphics/pokemon/gen_6/honedge/footprint.png
diff --git a/graphics/pokemon/honedge/icon.png b/graphics/pokemon/gen_6/honedge/icon.png
similarity index 100%
rename from graphics/pokemon/honedge/icon.png
rename to graphics/pokemon/gen_6/honedge/icon.png
diff --git a/graphics/pokemon/honedge/normal.pal b/graphics/pokemon/gen_6/honedge/normal.pal
similarity index 100%
rename from graphics/pokemon/honedge/normal.pal
rename to graphics/pokemon/gen_6/honedge/normal.pal
diff --git a/graphics/pokemon/honedge/shiny.pal b/graphics/pokemon/gen_6/honedge/shiny.pal
similarity index 100%
rename from graphics/pokemon/honedge/shiny.pal
rename to graphics/pokemon/gen_6/honedge/shiny.pal
diff --git a/graphics/pokemon/hoopa/anim_front.png b/graphics/pokemon/gen_6/hoopa/anim_front.png
similarity index 100%
rename from graphics/pokemon/hoopa/anim_front.png
rename to graphics/pokemon/gen_6/hoopa/anim_front.png
diff --git a/graphics/pokemon/hoopa/back.png b/graphics/pokemon/gen_6/hoopa/back.png
similarity index 100%
rename from graphics/pokemon/hoopa/back.png
rename to graphics/pokemon/gen_6/hoopa/back.png
diff --git a/graphics/pokemon/silcoon/footprint.png b/graphics/pokemon/gen_6/hoopa/footprint.png
similarity index 100%
rename from graphics/pokemon/silcoon/footprint.png
rename to graphics/pokemon/gen_6/hoopa/footprint.png
diff --git a/graphics/pokemon/hoopa/icon.png b/graphics/pokemon/gen_6/hoopa/icon.png
similarity index 100%
rename from graphics/pokemon/hoopa/icon.png
rename to graphics/pokemon/gen_6/hoopa/icon.png
diff --git a/graphics/pokemon/hoopa/normal.pal b/graphics/pokemon/gen_6/hoopa/normal.pal
similarity index 100%
rename from graphics/pokemon/hoopa/normal.pal
rename to graphics/pokemon/gen_6/hoopa/normal.pal
diff --git a/graphics/pokemon/hoopa/shiny.pal b/graphics/pokemon/gen_6/hoopa/shiny.pal
similarity index 100%
rename from graphics/pokemon/hoopa/shiny.pal
rename to graphics/pokemon/gen_6/hoopa/shiny.pal
diff --git a/graphics/pokemon/hoopa/unbound/anim_front.png b/graphics/pokemon/gen_6/hoopa/unbound/anim_front.png
similarity index 100%
rename from graphics/pokemon/hoopa/unbound/anim_front.png
rename to graphics/pokemon/gen_6/hoopa/unbound/anim_front.png
diff --git a/graphics/pokemon/hoopa/unbound/back.png b/graphics/pokemon/gen_6/hoopa/unbound/back.png
similarity index 100%
rename from graphics/pokemon/hoopa/unbound/back.png
rename to graphics/pokemon/gen_6/hoopa/unbound/back.png
diff --git a/graphics/pokemon/hoopa/unbound/icon.png b/graphics/pokemon/gen_6/hoopa/unbound/icon.png
similarity index 100%
rename from graphics/pokemon/hoopa/unbound/icon.png
rename to graphics/pokemon/gen_6/hoopa/unbound/icon.png
diff --git a/graphics/pokemon/hoopa/unbound/normal.pal b/graphics/pokemon/gen_6/hoopa/unbound/normal.pal
similarity index 100%
rename from graphics/pokemon/hoopa/unbound/normal.pal
rename to graphics/pokemon/gen_6/hoopa/unbound/normal.pal
diff --git a/graphics/pokemon/hoopa/unbound/shiny.pal b/graphics/pokemon/gen_6/hoopa/unbound/shiny.pal
similarity index 100%
rename from graphics/pokemon/hoopa/unbound/shiny.pal
rename to graphics/pokemon/gen_6/hoopa/unbound/shiny.pal
diff --git a/graphics/pokemon/inkay/anim_front.png b/graphics/pokemon/gen_6/inkay/anim_front.png
similarity index 100%
rename from graphics/pokemon/inkay/anim_front.png
rename to graphics/pokemon/gen_6/inkay/anim_front.png
diff --git a/graphics/pokemon/inkay/back.png b/graphics/pokemon/gen_6/inkay/back.png
similarity index 100%
rename from graphics/pokemon/inkay/back.png
rename to graphics/pokemon/gen_6/inkay/back.png
diff --git a/graphics/pokemon/silicobra/footprint.png b/graphics/pokemon/gen_6/inkay/footprint.png
similarity index 100%
rename from graphics/pokemon/silicobra/footprint.png
rename to graphics/pokemon/gen_6/inkay/footprint.png
diff --git a/graphics/pokemon/inkay/icon.png b/graphics/pokemon/gen_6/inkay/icon.png
similarity index 100%
rename from graphics/pokemon/inkay/icon.png
rename to graphics/pokemon/gen_6/inkay/icon.png
diff --git a/graphics/pokemon/inkay/normal.pal b/graphics/pokemon/gen_6/inkay/normal.pal
similarity index 100%
rename from graphics/pokemon/inkay/normal.pal
rename to graphics/pokemon/gen_6/inkay/normal.pal
diff --git a/graphics/pokemon/inkay/shiny.pal b/graphics/pokemon/gen_6/inkay/shiny.pal
similarity index 100%
rename from graphics/pokemon/inkay/shiny.pal
rename to graphics/pokemon/gen_6/inkay/shiny.pal
diff --git a/graphics/pokemon/klefki/anim_front.png b/graphics/pokemon/gen_6/klefki/anim_front.png
similarity index 100%
rename from graphics/pokemon/klefki/anim_front.png
rename to graphics/pokemon/gen_6/klefki/anim_front.png
diff --git a/graphics/pokemon/klefki/back.png b/graphics/pokemon/gen_6/klefki/back.png
similarity index 100%
rename from graphics/pokemon/klefki/back.png
rename to graphics/pokemon/gen_6/klefki/back.png
diff --git a/graphics/pokemon/sinistea/footprint.png b/graphics/pokemon/gen_6/klefki/footprint.png
similarity index 100%
rename from graphics/pokemon/sinistea/footprint.png
rename to graphics/pokemon/gen_6/klefki/footprint.png
diff --git a/graphics/pokemon/klefki/icon.png b/graphics/pokemon/gen_6/klefki/icon.png
similarity index 100%
rename from graphics/pokemon/klefki/icon.png
rename to graphics/pokemon/gen_6/klefki/icon.png
diff --git a/graphics/pokemon/klefki/normal.pal b/graphics/pokemon/gen_6/klefki/normal.pal
similarity index 100%
rename from graphics/pokemon/klefki/normal.pal
rename to graphics/pokemon/gen_6/klefki/normal.pal
diff --git a/graphics/pokemon/klefki/shiny.pal b/graphics/pokemon/gen_6/klefki/shiny.pal
similarity index 100%
rename from graphics/pokemon/klefki/shiny.pal
rename to graphics/pokemon/gen_6/klefki/shiny.pal
diff --git a/graphics/pokemon/litleo/anim_front.png b/graphics/pokemon/gen_6/litleo/anim_front.png
similarity index 100%
rename from graphics/pokemon/litleo/anim_front.png
rename to graphics/pokemon/gen_6/litleo/anim_front.png
diff --git a/graphics/pokemon/litleo/back.png b/graphics/pokemon/gen_6/litleo/back.png
similarity index 100%
rename from graphics/pokemon/litleo/back.png
rename to graphics/pokemon/gen_6/litleo/back.png
diff --git a/graphics/pokemon/litleo/footprint.png b/graphics/pokemon/gen_6/litleo/footprint.png
similarity index 100%
rename from graphics/pokemon/litleo/footprint.png
rename to graphics/pokemon/gen_6/litleo/footprint.png
diff --git a/graphics/pokemon/litleo/icon.png b/graphics/pokemon/gen_6/litleo/icon.png
similarity index 100%
rename from graphics/pokemon/litleo/icon.png
rename to graphics/pokemon/gen_6/litleo/icon.png
diff --git a/graphics/pokemon/litleo/normal.pal b/graphics/pokemon/gen_6/litleo/normal.pal
similarity index 100%
rename from graphics/pokemon/litleo/normal.pal
rename to graphics/pokemon/gen_6/litleo/normal.pal
diff --git a/graphics/pokemon/litleo/shiny.pal b/graphics/pokemon/gen_6/litleo/shiny.pal
similarity index 100%
rename from graphics/pokemon/litleo/shiny.pal
rename to graphics/pokemon/gen_6/litleo/shiny.pal
diff --git a/graphics/pokemon/malamar/anim_front.png b/graphics/pokemon/gen_6/malamar/anim_front.png
similarity index 100%
rename from graphics/pokemon/malamar/anim_front.png
rename to graphics/pokemon/gen_6/malamar/anim_front.png
diff --git a/graphics/pokemon/malamar/back.png b/graphics/pokemon/gen_6/malamar/back.png
similarity index 100%
rename from graphics/pokemon/malamar/back.png
rename to graphics/pokemon/gen_6/malamar/back.png
diff --git a/graphics/pokemon/malamar/footprint.png b/graphics/pokemon/gen_6/malamar/footprint.png
similarity index 100%
rename from graphics/pokemon/malamar/footprint.png
rename to graphics/pokemon/gen_6/malamar/footprint.png
diff --git a/graphics/pokemon/malamar/icon.png b/graphics/pokemon/gen_6/malamar/icon.png
similarity index 100%
rename from graphics/pokemon/malamar/icon.png
rename to graphics/pokemon/gen_6/malamar/icon.png
diff --git a/graphics/pokemon/malamar/normal.pal b/graphics/pokemon/gen_6/malamar/normal.pal
similarity index 100%
rename from graphics/pokemon/malamar/normal.pal
rename to graphics/pokemon/gen_6/malamar/normal.pal
diff --git a/graphics/pokemon/malamar/shiny.pal b/graphics/pokemon/gen_6/malamar/shiny.pal
similarity index 100%
rename from graphics/pokemon/malamar/shiny.pal
rename to graphics/pokemon/gen_6/malamar/shiny.pal
diff --git a/graphics/pokemon/meowstic/anim_front.png b/graphics/pokemon/gen_6/meowstic/anim_front.png
similarity index 100%
rename from graphics/pokemon/meowstic/anim_front.png
rename to graphics/pokemon/gen_6/meowstic/anim_front.png
diff --git a/graphics/pokemon/meowstic/back.png b/graphics/pokemon/gen_6/meowstic/back.png
similarity index 100%
rename from graphics/pokemon/meowstic/back.png
rename to graphics/pokemon/gen_6/meowstic/back.png
diff --git a/graphics/pokemon/meowstic/female/anim_front.png b/graphics/pokemon/gen_6/meowstic/female/anim_front.png
similarity index 100%
rename from graphics/pokemon/meowstic/female/anim_front.png
rename to graphics/pokemon/gen_6/meowstic/female/anim_front.png
diff --git a/graphics/pokemon/meowstic/female/back.png b/graphics/pokemon/gen_6/meowstic/female/back.png
similarity index 100%
rename from graphics/pokemon/meowstic/female/back.png
rename to graphics/pokemon/gen_6/meowstic/female/back.png
diff --git a/graphics/pokemon/meowstic/female/icon.png b/graphics/pokemon/gen_6/meowstic/female/icon.png
similarity index 100%
rename from graphics/pokemon/meowstic/female/icon.png
rename to graphics/pokemon/gen_6/meowstic/female/icon.png
diff --git a/graphics/pokemon/meowstic/female/normal.pal b/graphics/pokemon/gen_6/meowstic/female/normal.pal
similarity index 100%
rename from graphics/pokemon/meowstic/female/normal.pal
rename to graphics/pokemon/gen_6/meowstic/female/normal.pal
diff --git a/graphics/pokemon/meowstic/female/shiny.pal b/graphics/pokemon/gen_6/meowstic/female/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowstic/female/shiny.pal
rename to graphics/pokemon/gen_6/meowstic/female/shiny.pal
diff --git a/graphics/pokemon/regieleki/footprint.png b/graphics/pokemon/gen_6/meowstic/footprint.png
similarity index 100%
rename from graphics/pokemon/regieleki/footprint.png
rename to graphics/pokemon/gen_6/meowstic/footprint.png
diff --git a/graphics/pokemon/meowstic/icon.png b/graphics/pokemon/gen_6/meowstic/icon.png
similarity index 100%
rename from graphics/pokemon/meowstic/icon.png
rename to graphics/pokemon/gen_6/meowstic/icon.png
diff --git a/graphics/pokemon/meowstic/normal.pal b/graphics/pokemon/gen_6/meowstic/normal.pal
similarity index 100%
rename from graphics/pokemon/meowstic/normal.pal
rename to graphics/pokemon/gen_6/meowstic/normal.pal
diff --git a/graphics/pokemon/meowstic/shiny.pal b/graphics/pokemon/gen_6/meowstic/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowstic/shiny.pal
rename to graphics/pokemon/gen_6/meowstic/shiny.pal
diff --git a/graphics/pokemon/noibat/anim_front.png b/graphics/pokemon/gen_6/noibat/anim_front.png
similarity index 100%
rename from graphics/pokemon/noibat/anim_front.png
rename to graphics/pokemon/gen_6/noibat/anim_front.png
diff --git a/graphics/pokemon/noibat/back.png b/graphics/pokemon/gen_6/noibat/back.png
similarity index 100%
rename from graphics/pokemon/noibat/back.png
rename to graphics/pokemon/gen_6/noibat/back.png
diff --git a/graphics/pokemon/noibat/footprint.png b/graphics/pokemon/gen_6/noibat/footprint.png
similarity index 100%
rename from graphics/pokemon/noibat/footprint.png
rename to graphics/pokemon/gen_6/noibat/footprint.png
diff --git a/graphics/pokemon/noibat/icon.png b/graphics/pokemon/gen_6/noibat/icon.png
similarity index 100%
rename from graphics/pokemon/noibat/icon.png
rename to graphics/pokemon/gen_6/noibat/icon.png
diff --git a/graphics/pokemon/noibat/normal.pal b/graphics/pokemon/gen_6/noibat/normal.pal
similarity index 100%
rename from graphics/pokemon/noibat/normal.pal
rename to graphics/pokemon/gen_6/noibat/normal.pal
diff --git a/graphics/pokemon/noibat/shiny.pal b/graphics/pokemon/gen_6/noibat/shiny.pal
similarity index 100%
rename from graphics/pokemon/noibat/shiny.pal
rename to graphics/pokemon/gen_6/noibat/shiny.pal
diff --git a/graphics/pokemon/noivern/anim_front.png b/graphics/pokemon/gen_6/noivern/anim_front.png
similarity index 100%
rename from graphics/pokemon/noivern/anim_front.png
rename to graphics/pokemon/gen_6/noivern/anim_front.png
diff --git a/graphics/pokemon/noivern/back.png b/graphics/pokemon/gen_6/noivern/back.png
similarity index 100%
rename from graphics/pokemon/noivern/back.png
rename to graphics/pokemon/gen_6/noivern/back.png
diff --git a/graphics/pokemon/noivern/footprint.png b/graphics/pokemon/gen_6/noivern/footprint.png
similarity index 100%
rename from graphics/pokemon/noivern/footprint.png
rename to graphics/pokemon/gen_6/noivern/footprint.png
diff --git a/graphics/pokemon/noivern/icon.png b/graphics/pokemon/gen_6/noivern/icon.png
similarity index 100%
rename from graphics/pokemon/noivern/icon.png
rename to graphics/pokemon/gen_6/noivern/icon.png
diff --git a/graphics/pokemon/noivern/normal.pal b/graphics/pokemon/gen_6/noivern/normal.pal
similarity index 100%
rename from graphics/pokemon/noivern/normal.pal
rename to graphics/pokemon/gen_6/noivern/normal.pal
diff --git a/graphics/pokemon/noivern/shiny.pal b/graphics/pokemon/gen_6/noivern/shiny.pal
similarity index 100%
rename from graphics/pokemon/noivern/shiny.pal
rename to graphics/pokemon/gen_6/noivern/shiny.pal
diff --git a/graphics/pokemon/pancham/anim_front.png b/graphics/pokemon/gen_6/pancham/anim_front.png
similarity index 100%
rename from graphics/pokemon/pancham/anim_front.png
rename to graphics/pokemon/gen_6/pancham/anim_front.png
diff --git a/graphics/pokemon/pancham/back.png b/graphics/pokemon/gen_6/pancham/back.png
similarity index 100%
rename from graphics/pokemon/pancham/back.png
rename to graphics/pokemon/gen_6/pancham/back.png
diff --git a/graphics/pokemon/pancham/footprint.png b/graphics/pokemon/gen_6/pancham/footprint.png
similarity index 100%
rename from graphics/pokemon/pancham/footprint.png
rename to graphics/pokemon/gen_6/pancham/footprint.png
diff --git a/graphics/pokemon/pancham/icon.png b/graphics/pokemon/gen_6/pancham/icon.png
similarity index 100%
rename from graphics/pokemon/pancham/icon.png
rename to graphics/pokemon/gen_6/pancham/icon.png
diff --git a/graphics/pokemon/pancham/normal.pal b/graphics/pokemon/gen_6/pancham/normal.pal
similarity index 100%
rename from graphics/pokemon/pancham/normal.pal
rename to graphics/pokemon/gen_6/pancham/normal.pal
diff --git a/graphics/pokemon/pancham/shiny.pal b/graphics/pokemon/gen_6/pancham/shiny.pal
similarity index 100%
rename from graphics/pokemon/pancham/shiny.pal
rename to graphics/pokemon/gen_6/pancham/shiny.pal
diff --git a/graphics/pokemon/pangoro/anim_front.png b/graphics/pokemon/gen_6/pangoro/anim_front.png
similarity index 100%
rename from graphics/pokemon/pangoro/anim_front.png
rename to graphics/pokemon/gen_6/pangoro/anim_front.png
diff --git a/graphics/pokemon/pangoro/back.png b/graphics/pokemon/gen_6/pangoro/back.png
similarity index 100%
rename from graphics/pokemon/pangoro/back.png
rename to graphics/pokemon/gen_6/pangoro/back.png
diff --git a/graphics/pokemon/pangoro/footprint.png b/graphics/pokemon/gen_6/pangoro/footprint.png
similarity index 100%
rename from graphics/pokemon/pangoro/footprint.png
rename to graphics/pokemon/gen_6/pangoro/footprint.png
diff --git a/graphics/pokemon/pangoro/icon.png b/graphics/pokemon/gen_6/pangoro/icon.png
similarity index 100%
rename from graphics/pokemon/pangoro/icon.png
rename to graphics/pokemon/gen_6/pangoro/icon.png
diff --git a/graphics/pokemon/pangoro/normal.pal b/graphics/pokemon/gen_6/pangoro/normal.pal
similarity index 100%
rename from graphics/pokemon/pangoro/normal.pal
rename to graphics/pokemon/gen_6/pangoro/normal.pal
diff --git a/graphics/pokemon/pangoro/shiny.pal b/graphics/pokemon/gen_6/pangoro/shiny.pal
similarity index 100%
rename from graphics/pokemon/pangoro/shiny.pal
rename to graphics/pokemon/gen_6/pangoro/shiny.pal
diff --git a/graphics/pokemon/phantump/anim_front.png b/graphics/pokemon/gen_6/phantump/anim_front.png
similarity index 100%
rename from graphics/pokemon/phantump/anim_front.png
rename to graphics/pokemon/gen_6/phantump/anim_front.png
diff --git a/graphics/pokemon/phantump/back.png b/graphics/pokemon/gen_6/phantump/back.png
similarity index 100%
rename from graphics/pokemon/phantump/back.png
rename to graphics/pokemon/gen_6/phantump/back.png
diff --git a/graphics/pokemon/skrelp/footprint.png b/graphics/pokemon/gen_6/phantump/footprint.png
similarity index 100%
rename from graphics/pokemon/skrelp/footprint.png
rename to graphics/pokemon/gen_6/phantump/footprint.png
diff --git a/graphics/pokemon/phantump/icon.png b/graphics/pokemon/gen_6/phantump/icon.png
similarity index 100%
rename from graphics/pokemon/phantump/icon.png
rename to graphics/pokemon/gen_6/phantump/icon.png
diff --git a/graphics/pokemon/phantump/normal.pal b/graphics/pokemon/gen_6/phantump/normal.pal
similarity index 100%
rename from graphics/pokemon/phantump/normal.pal
rename to graphics/pokemon/gen_6/phantump/normal.pal
diff --git a/graphics/pokemon/phantump/shiny.pal b/graphics/pokemon/gen_6/phantump/shiny.pal
similarity index 100%
rename from graphics/pokemon/phantump/shiny.pal
rename to graphics/pokemon/gen_6/phantump/shiny.pal
diff --git a/graphics/pokemon/pumpkaboo/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/anim_front.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/anim_front.png
rename to graphics/pokemon/gen_6/pumpkaboo/anim_front.png
diff --git a/graphics/pokemon/pumpkaboo/back.png b/graphics/pokemon/gen_6/pumpkaboo/back.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/back.png
rename to graphics/pokemon/gen_6/pumpkaboo/back.png
diff --git a/graphics/pokemon/scatterbug/footprint.png b/graphics/pokemon/gen_6/pumpkaboo/footprint.png
similarity index 100%
rename from graphics/pokemon/scatterbug/footprint.png
rename to graphics/pokemon/gen_6/pumpkaboo/footprint.png
diff --git a/graphics/pokemon/pumpkaboo/icon.png b/graphics/pokemon/gen_6/pumpkaboo/icon.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/icon.png
rename to graphics/pokemon/gen_6/pumpkaboo/icon.png
diff --git a/graphics/pokemon/pumpkaboo/large/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/large/anim_front.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/large/anim_front.png
rename to graphics/pokemon/gen_6/pumpkaboo/large/anim_front.png
diff --git a/graphics/pokemon/pumpkaboo/large/back.png b/graphics/pokemon/gen_6/pumpkaboo/large/back.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/large/back.png
rename to graphics/pokemon/gen_6/pumpkaboo/large/back.png
diff --git a/graphics/pokemon/pumpkaboo/normal.pal b/graphics/pokemon/gen_6/pumpkaboo/normal.pal
similarity index 100%
rename from graphics/pokemon/pumpkaboo/normal.pal
rename to graphics/pokemon/gen_6/pumpkaboo/normal.pal
diff --git a/graphics/pokemon/pumpkaboo/shiny.pal b/graphics/pokemon/gen_6/pumpkaboo/shiny.pal
similarity index 100%
rename from graphics/pokemon/pumpkaboo/shiny.pal
rename to graphics/pokemon/gen_6/pumpkaboo/shiny.pal
diff --git a/graphics/pokemon/pumpkaboo/small/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/small/anim_front.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/small/anim_front.png
rename to graphics/pokemon/gen_6/pumpkaboo/small/anim_front.png
diff --git a/graphics/pokemon/pumpkaboo/small/back.png b/graphics/pokemon/gen_6/pumpkaboo/small/back.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/small/back.png
rename to graphics/pokemon/gen_6/pumpkaboo/small/back.png
diff --git a/graphics/pokemon/pumpkaboo/super/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/super/anim_front.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/super/anim_front.png
rename to graphics/pokemon/gen_6/pumpkaboo/super/anim_front.png
diff --git a/graphics/pokemon/pumpkaboo/super/back.png b/graphics/pokemon/gen_6/pumpkaboo/super/back.png
similarity index 100%
rename from graphics/pokemon/pumpkaboo/super/back.png
rename to graphics/pokemon/gen_6/pumpkaboo/super/back.png
diff --git a/graphics/pokemon/pyroar/anim_front.png b/graphics/pokemon/gen_6/pyroar/anim_front.png
similarity index 100%
rename from graphics/pokemon/pyroar/anim_front.png
rename to graphics/pokemon/gen_6/pyroar/anim_front.png
diff --git a/graphics/pokemon/pyroar/anim_frontf.png b/graphics/pokemon/gen_6/pyroar/anim_frontf.png
similarity index 100%
rename from graphics/pokemon/pyroar/anim_frontf.png
rename to graphics/pokemon/gen_6/pyroar/anim_frontf.png
diff --git a/graphics/pokemon/pyroar/back.png b/graphics/pokemon/gen_6/pyroar/back.png
similarity index 100%
rename from graphics/pokemon/pyroar/back.png
rename to graphics/pokemon/gen_6/pyroar/back.png
diff --git a/graphics/pokemon/pyroar/backf.png b/graphics/pokemon/gen_6/pyroar/backf.png
similarity index 100%
rename from graphics/pokemon/pyroar/backf.png
rename to graphics/pokemon/gen_6/pyroar/backf.png
diff --git a/graphics/pokemon/pyroar/footprint.png b/graphics/pokemon/gen_6/pyroar/footprint.png
similarity index 100%
rename from graphics/pokemon/pyroar/footprint.png
rename to graphics/pokemon/gen_6/pyroar/footprint.png
diff --git a/graphics/pokemon/pyroar/frontf.png b/graphics/pokemon/gen_6/pyroar/frontf.png
similarity index 100%
rename from graphics/pokemon/pyroar/frontf.png
rename to graphics/pokemon/gen_6/pyroar/frontf.png
diff --git a/graphics/pokemon/pyroar/icon.png b/graphics/pokemon/gen_6/pyroar/icon.png
similarity index 100%
rename from graphics/pokemon/pyroar/icon.png
rename to graphics/pokemon/gen_6/pyroar/icon.png
diff --git a/graphics/pokemon/pyroar/iconf.png b/graphics/pokemon/gen_6/pyroar/iconf.png
similarity index 100%
rename from graphics/pokemon/pyroar/iconf.png
rename to graphics/pokemon/gen_6/pyroar/iconf.png
diff --git a/graphics/pokemon/pyroar/normal.pal b/graphics/pokemon/gen_6/pyroar/normal.pal
similarity index 100%
rename from graphics/pokemon/pyroar/normal.pal
rename to graphics/pokemon/gen_6/pyroar/normal.pal
diff --git a/graphics/pokemon/pyroar/shiny.pal b/graphics/pokemon/gen_6/pyroar/shiny.pal
similarity index 100%
rename from graphics/pokemon/pyroar/shiny.pal
rename to graphics/pokemon/gen_6/pyroar/shiny.pal
diff --git a/graphics/pokemon/quilladin/anim_front.png b/graphics/pokemon/gen_6/quilladin/anim_front.png
similarity index 100%
rename from graphics/pokemon/quilladin/anim_front.png
rename to graphics/pokemon/gen_6/quilladin/anim_front.png
diff --git a/graphics/pokemon/quilladin/back.png b/graphics/pokemon/gen_6/quilladin/back.png
similarity index 100%
rename from graphics/pokemon/quilladin/back.png
rename to graphics/pokemon/gen_6/quilladin/back.png
diff --git a/graphics/pokemon/quilladin/footprint.png b/graphics/pokemon/gen_6/quilladin/footprint.png
similarity index 100%
rename from graphics/pokemon/quilladin/footprint.png
rename to graphics/pokemon/gen_6/quilladin/footprint.png
diff --git a/graphics/pokemon/quilladin/icon.png b/graphics/pokemon/gen_6/quilladin/icon.png
similarity index 100%
rename from graphics/pokemon/quilladin/icon.png
rename to graphics/pokemon/gen_6/quilladin/icon.png
diff --git a/graphics/pokemon/quilladin/normal.pal b/graphics/pokemon/gen_6/quilladin/normal.pal
similarity index 100%
rename from graphics/pokemon/quilladin/normal.pal
rename to graphics/pokemon/gen_6/quilladin/normal.pal
diff --git a/graphics/pokemon/quilladin/shiny.pal b/graphics/pokemon/gen_6/quilladin/shiny.pal
similarity index 100%
rename from graphics/pokemon/quilladin/shiny.pal
rename to graphics/pokemon/gen_6/quilladin/shiny.pal
diff --git a/graphics/pokemon/scatterbug/anim_front.png b/graphics/pokemon/gen_6/scatterbug/anim_front.png
similarity index 100%
rename from graphics/pokemon/scatterbug/anim_front.png
rename to graphics/pokemon/gen_6/scatterbug/anim_front.png
diff --git a/graphics/pokemon/scatterbug/back.png b/graphics/pokemon/gen_6/scatterbug/back.png
similarity index 100%
rename from graphics/pokemon/scatterbug/back.png
rename to graphics/pokemon/gen_6/scatterbug/back.png
diff --git a/graphics/pokemon/sizzlipede/footprint.png b/graphics/pokemon/gen_6/scatterbug/footprint.png
similarity index 100%
rename from graphics/pokemon/sizzlipede/footprint.png
rename to graphics/pokemon/gen_6/scatterbug/footprint.png
diff --git a/graphics/pokemon/scatterbug/icon.png b/graphics/pokemon/gen_6/scatterbug/icon.png
similarity index 100%
rename from graphics/pokemon/scatterbug/icon.png
rename to graphics/pokemon/gen_6/scatterbug/icon.png
diff --git a/graphics/pokemon/scatterbug/normal.pal b/graphics/pokemon/gen_6/scatterbug/normal.pal
similarity index 100%
rename from graphics/pokemon/scatterbug/normal.pal
rename to graphics/pokemon/gen_6/scatterbug/normal.pal
diff --git a/graphics/pokemon/scatterbug/shiny.pal b/graphics/pokemon/gen_6/scatterbug/shiny.pal
similarity index 100%
rename from graphics/pokemon/scatterbug/shiny.pal
rename to graphics/pokemon/gen_6/scatterbug/shiny.pal
diff --git a/graphics/pokemon/skiddo/anim_front.png b/graphics/pokemon/gen_6/skiddo/anim_front.png
similarity index 100%
rename from graphics/pokemon/skiddo/anim_front.png
rename to graphics/pokemon/gen_6/skiddo/anim_front.png
diff --git a/graphics/pokemon/skiddo/back.png b/graphics/pokemon/gen_6/skiddo/back.png
similarity index 100%
rename from graphics/pokemon/skiddo/back.png
rename to graphics/pokemon/gen_6/skiddo/back.png
diff --git a/graphics/pokemon/skiddo/footprint.png b/graphics/pokemon/gen_6/skiddo/footprint.png
similarity index 100%
rename from graphics/pokemon/skiddo/footprint.png
rename to graphics/pokemon/gen_6/skiddo/footprint.png
diff --git a/graphics/pokemon/skiddo/icon.png b/graphics/pokemon/gen_6/skiddo/icon.png
similarity index 100%
rename from graphics/pokemon/skiddo/icon.png
rename to graphics/pokemon/gen_6/skiddo/icon.png
diff --git a/graphics/pokemon/skiddo/normal.pal b/graphics/pokemon/gen_6/skiddo/normal.pal
similarity index 100%
rename from graphics/pokemon/skiddo/normal.pal
rename to graphics/pokemon/gen_6/skiddo/normal.pal
diff --git a/graphics/pokemon/skiddo/shiny.pal b/graphics/pokemon/gen_6/skiddo/shiny.pal
similarity index 100%
rename from graphics/pokemon/skiddo/shiny.pal
rename to graphics/pokemon/gen_6/skiddo/shiny.pal
diff --git a/graphics/pokemon/skrelp/anim_front.png b/graphics/pokemon/gen_6/skrelp/anim_front.png
similarity index 100%
rename from graphics/pokemon/skrelp/anim_front.png
rename to graphics/pokemon/gen_6/skrelp/anim_front.png
diff --git a/graphics/pokemon/skrelp/back.png b/graphics/pokemon/gen_6/skrelp/back.png
similarity index 100%
rename from graphics/pokemon/skrelp/back.png
rename to graphics/pokemon/gen_6/skrelp/back.png
diff --git a/graphics/pokemon/sliggoo/footprint.png b/graphics/pokemon/gen_6/skrelp/footprint.png
similarity index 100%
rename from graphics/pokemon/sliggoo/footprint.png
rename to graphics/pokemon/gen_6/skrelp/footprint.png
diff --git a/graphics/pokemon/skrelp/icon.png b/graphics/pokemon/gen_6/skrelp/icon.png
similarity index 100%
rename from graphics/pokemon/skrelp/icon.png
rename to graphics/pokemon/gen_6/skrelp/icon.png
diff --git a/graphics/pokemon/skrelp/normal.pal b/graphics/pokemon/gen_6/skrelp/normal.pal
similarity index 100%
rename from graphics/pokemon/skrelp/normal.pal
rename to graphics/pokemon/gen_6/skrelp/normal.pal
diff --git a/graphics/pokemon/skrelp/shiny.pal b/graphics/pokemon/gen_6/skrelp/shiny.pal
similarity index 100%
rename from graphics/pokemon/skrelp/shiny.pal
rename to graphics/pokemon/gen_6/skrelp/shiny.pal
diff --git a/graphics/pokemon/sliggoo/anim_front.png b/graphics/pokemon/gen_6/sliggoo/anim_front.png
similarity index 100%
rename from graphics/pokemon/sliggoo/anim_front.png
rename to graphics/pokemon/gen_6/sliggoo/anim_front.png
diff --git a/graphics/pokemon/sliggoo/back.png b/graphics/pokemon/gen_6/sliggoo/back.png
similarity index 100%
rename from graphics/pokemon/sliggoo/back.png
rename to graphics/pokemon/gen_6/sliggoo/back.png
diff --git a/graphics/pokemon/slugma/footprint.png b/graphics/pokemon/gen_6/sliggoo/footprint.png
similarity index 100%
rename from graphics/pokemon/slugma/footprint.png
rename to graphics/pokemon/gen_6/sliggoo/footprint.png
diff --git a/graphics/pokemon/sliggoo/hisuian/back.png b/graphics/pokemon/gen_6/sliggoo/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sliggoo/hisuian/back.png
rename to graphics/pokemon/gen_6/sliggoo/hisuian/back.png
diff --git a/graphics/pokemon/sliggoo/hisuian/front.png b/graphics/pokemon/gen_6/sliggoo/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sliggoo/hisuian/front.png
rename to graphics/pokemon/gen_6/sliggoo/hisuian/front.png
diff --git a/graphics/pokemon/sliggoo/hisuian/icon.png b/graphics/pokemon/gen_6/sliggoo/hisuian/icon.png
similarity index 100%
rename from graphics/pokemon/sliggoo/hisuian/icon.png
rename to graphics/pokemon/gen_6/sliggoo/hisuian/icon.png
diff --git a/graphics/pokemon/sliggoo/hisuian/normal.pal b/graphics/pokemon/gen_6/sliggoo/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sliggoo/hisuian/normal.pal
rename to graphics/pokemon/gen_6/sliggoo/hisuian/normal.pal
diff --git a/graphics/pokemon/sliggoo/hisuian/shiny.pal b/graphics/pokemon/gen_6/sliggoo/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sliggoo/hisuian/shiny.pal
rename to graphics/pokemon/gen_6/sliggoo/hisuian/shiny.pal
diff --git a/graphics/pokemon/sliggoo/icon.png b/graphics/pokemon/gen_6/sliggoo/icon.png
similarity index 100%
rename from graphics/pokemon/sliggoo/icon.png
rename to graphics/pokemon/gen_6/sliggoo/icon.png
diff --git a/graphics/pokemon/sliggoo/normal.pal b/graphics/pokemon/gen_6/sliggoo/normal.pal
similarity index 100%
rename from graphics/pokemon/sliggoo/normal.pal
rename to graphics/pokemon/gen_6/sliggoo/normal.pal
diff --git a/graphics/pokemon/sliggoo/shiny.pal b/graphics/pokemon/gen_6/sliggoo/shiny.pal
similarity index 100%
rename from graphics/pokemon/sliggoo/shiny.pal
rename to graphics/pokemon/gen_6/sliggoo/shiny.pal
diff --git a/graphics/pokemon/slurpuff/anim_front.png b/graphics/pokemon/gen_6/slurpuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/slurpuff/anim_front.png
rename to graphics/pokemon/gen_6/slurpuff/anim_front.png
diff --git a/graphics/pokemon/slurpuff/back.png b/graphics/pokemon/gen_6/slurpuff/back.png
similarity index 100%
rename from graphics/pokemon/slurpuff/back.png
rename to graphics/pokemon/gen_6/slurpuff/back.png
diff --git a/graphics/pokemon/kirlia/footprint.png b/graphics/pokemon/gen_6/slurpuff/footprint.png
similarity index 100%
rename from graphics/pokemon/kirlia/footprint.png
rename to graphics/pokemon/gen_6/slurpuff/footprint.png
diff --git a/graphics/pokemon/slurpuff/icon.png b/graphics/pokemon/gen_6/slurpuff/icon.png
similarity index 100%
rename from graphics/pokemon/slurpuff/icon.png
rename to graphics/pokemon/gen_6/slurpuff/icon.png
diff --git a/graphics/pokemon/slurpuff/normal.pal b/graphics/pokemon/gen_6/slurpuff/normal.pal
similarity index 100%
rename from graphics/pokemon/slurpuff/normal.pal
rename to graphics/pokemon/gen_6/slurpuff/normal.pal
diff --git a/graphics/pokemon/slurpuff/shiny.pal b/graphics/pokemon/gen_6/slurpuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/slurpuff/shiny.pal
rename to graphics/pokemon/gen_6/slurpuff/shiny.pal
diff --git a/graphics/pokemon/spewpa/anim_front.png b/graphics/pokemon/gen_6/spewpa/anim_front.png
similarity index 100%
rename from graphics/pokemon/spewpa/anim_front.png
rename to graphics/pokemon/gen_6/spewpa/anim_front.png
diff --git a/graphics/pokemon/spewpa/back.png b/graphics/pokemon/gen_6/spewpa/back.png
similarity index 100%
rename from graphics/pokemon/spewpa/back.png
rename to graphics/pokemon/gen_6/spewpa/back.png
diff --git a/graphics/pokemon/snom/footprint.png b/graphics/pokemon/gen_6/spewpa/footprint.png
similarity index 100%
rename from graphics/pokemon/snom/footprint.png
rename to graphics/pokemon/gen_6/spewpa/footprint.png
diff --git a/graphics/pokemon/spewpa/icon.png b/graphics/pokemon/gen_6/spewpa/icon.png
similarity index 100%
rename from graphics/pokemon/spewpa/icon.png
rename to graphics/pokemon/gen_6/spewpa/icon.png
diff --git a/graphics/pokemon/spewpa/normal.pal b/graphics/pokemon/gen_6/spewpa/normal.pal
similarity index 100%
rename from graphics/pokemon/spewpa/normal.pal
rename to graphics/pokemon/gen_6/spewpa/normal.pal
diff --git a/graphics/pokemon/spewpa/shiny.pal b/graphics/pokemon/gen_6/spewpa/shiny.pal
similarity index 100%
rename from graphics/pokemon/spewpa/shiny.pal
rename to graphics/pokemon/gen_6/spewpa/shiny.pal
diff --git a/graphics/pokemon/spritzee/anim_front.png b/graphics/pokemon/gen_6/spritzee/anim_front.png
similarity index 100%
rename from graphics/pokemon/spritzee/anim_front.png
rename to graphics/pokemon/gen_6/spritzee/anim_front.png
diff --git a/graphics/pokemon/spritzee/back.png b/graphics/pokemon/gen_6/spritzee/back.png
similarity index 100%
rename from graphics/pokemon/spritzee/back.png
rename to graphics/pokemon/gen_6/spritzee/back.png
diff --git a/graphics/pokemon/skorupi/footprint.png b/graphics/pokemon/gen_6/spritzee/footprint.png
similarity index 100%
rename from graphics/pokemon/skorupi/footprint.png
rename to graphics/pokemon/gen_6/spritzee/footprint.png
diff --git a/graphics/pokemon/spritzee/icon.png b/graphics/pokemon/gen_6/spritzee/icon.png
similarity index 100%
rename from graphics/pokemon/spritzee/icon.png
rename to graphics/pokemon/gen_6/spritzee/icon.png
diff --git a/graphics/pokemon/spritzee/normal.pal b/graphics/pokemon/gen_6/spritzee/normal.pal
similarity index 100%
rename from graphics/pokemon/spritzee/normal.pal
rename to graphics/pokemon/gen_6/spritzee/normal.pal
diff --git a/graphics/pokemon/spritzee/shiny.pal b/graphics/pokemon/gen_6/spritzee/shiny.pal
similarity index 100%
rename from graphics/pokemon/spritzee/shiny.pal
rename to graphics/pokemon/gen_6/spritzee/shiny.pal
diff --git a/graphics/pokemon/swirlix/anim_front.png b/graphics/pokemon/gen_6/swirlix/anim_front.png
similarity index 100%
rename from graphics/pokemon/swirlix/anim_front.png
rename to graphics/pokemon/gen_6/swirlix/anim_front.png
diff --git a/graphics/pokemon/swirlix/back.png b/graphics/pokemon/gen_6/swirlix/back.png
similarity index 100%
rename from graphics/pokemon/swirlix/back.png
rename to graphics/pokemon/gen_6/swirlix/back.png
diff --git a/graphics/pokemon/solosis/footprint.png b/graphics/pokemon/gen_6/swirlix/footprint.png
similarity index 100%
rename from graphics/pokemon/solosis/footprint.png
rename to graphics/pokemon/gen_6/swirlix/footprint.png
diff --git a/graphics/pokemon/swirlix/icon.png b/graphics/pokemon/gen_6/swirlix/icon.png
similarity index 100%
rename from graphics/pokemon/swirlix/icon.png
rename to graphics/pokemon/gen_6/swirlix/icon.png
diff --git a/graphics/pokemon/swirlix/normal.pal b/graphics/pokemon/gen_6/swirlix/normal.pal
similarity index 100%
rename from graphics/pokemon/swirlix/normal.pal
rename to graphics/pokemon/gen_6/swirlix/normal.pal
diff --git a/graphics/pokemon/swirlix/shiny.pal b/graphics/pokemon/gen_6/swirlix/shiny.pal
similarity index 100%
rename from graphics/pokemon/swirlix/shiny.pal
rename to graphics/pokemon/gen_6/swirlix/shiny.pal
diff --git a/graphics/pokemon/sylveon/anim_front.png b/graphics/pokemon/gen_6/sylveon/anim_front.png
similarity index 100%
rename from graphics/pokemon/sylveon/anim_front.png
rename to graphics/pokemon/gen_6/sylveon/anim_front.png
diff --git a/graphics/pokemon/sylveon/back.png b/graphics/pokemon/gen_6/sylveon/back.png
similarity index 100%
rename from graphics/pokemon/sylveon/back.png
rename to graphics/pokemon/gen_6/sylveon/back.png
diff --git a/graphics/pokemon/sylveon/footprint.png b/graphics/pokemon/gen_6/sylveon/footprint.png
similarity index 100%
rename from graphics/pokemon/sylveon/footprint.png
rename to graphics/pokemon/gen_6/sylveon/footprint.png
diff --git a/graphics/pokemon/sylveon/icon.png b/graphics/pokemon/gen_6/sylveon/icon.png
similarity index 100%
rename from graphics/pokemon/sylveon/icon.png
rename to graphics/pokemon/gen_6/sylveon/icon.png
diff --git a/graphics/pokemon/sylveon/normal.pal b/graphics/pokemon/gen_6/sylveon/normal.pal
similarity index 100%
rename from graphics/pokemon/sylveon/normal.pal
rename to graphics/pokemon/gen_6/sylveon/normal.pal
diff --git a/graphics/pokemon/sylveon/shiny.pal b/graphics/pokemon/gen_6/sylveon/shiny.pal
similarity index 100%
rename from graphics/pokemon/sylveon/shiny.pal
rename to graphics/pokemon/gen_6/sylveon/shiny.pal
diff --git a/graphics/pokemon/talonflame/anim_front.png b/graphics/pokemon/gen_6/talonflame/anim_front.png
similarity index 100%
rename from graphics/pokemon/talonflame/anim_front.png
rename to graphics/pokemon/gen_6/talonflame/anim_front.png
diff --git a/graphics/pokemon/talonflame/back.png b/graphics/pokemon/gen_6/talonflame/back.png
similarity index 100%
rename from graphics/pokemon/talonflame/back.png
rename to graphics/pokemon/gen_6/talonflame/back.png
diff --git a/graphics/pokemon/talonflame/footprint.png b/graphics/pokemon/gen_6/talonflame/footprint.png
similarity index 100%
rename from graphics/pokemon/talonflame/footprint.png
rename to graphics/pokemon/gen_6/talonflame/footprint.png
diff --git a/graphics/pokemon/talonflame/icon.png b/graphics/pokemon/gen_6/talonflame/icon.png
similarity index 100%
rename from graphics/pokemon/talonflame/icon.png
rename to graphics/pokemon/gen_6/talonflame/icon.png
diff --git a/graphics/pokemon/talonflame/normal.pal b/graphics/pokemon/gen_6/talonflame/normal.pal
similarity index 100%
rename from graphics/pokemon/talonflame/normal.pal
rename to graphics/pokemon/gen_6/talonflame/normal.pal
diff --git a/graphics/pokemon/talonflame/shiny.pal b/graphics/pokemon/gen_6/talonflame/shiny.pal
similarity index 100%
rename from graphics/pokemon/talonflame/shiny.pal
rename to graphics/pokemon/gen_6/talonflame/shiny.pal
diff --git a/graphics/pokemon/trevenant/anim_front.png b/graphics/pokemon/gen_6/trevenant/anim_front.png
similarity index 100%
rename from graphics/pokemon/trevenant/anim_front.png
rename to graphics/pokemon/gen_6/trevenant/anim_front.png
diff --git a/graphics/pokemon/trevenant/back.png b/graphics/pokemon/gen_6/trevenant/back.png
similarity index 100%
rename from graphics/pokemon/trevenant/back.png
rename to graphics/pokemon/gen_6/trevenant/back.png
diff --git a/graphics/pokemon/larvesta/footprint.png b/graphics/pokemon/gen_6/trevenant/footprint.png
similarity index 100%
rename from graphics/pokemon/larvesta/footprint.png
rename to graphics/pokemon/gen_6/trevenant/footprint.png
diff --git a/graphics/pokemon/trevenant/icon.png b/graphics/pokemon/gen_6/trevenant/icon.png
similarity index 100%
rename from graphics/pokemon/trevenant/icon.png
rename to graphics/pokemon/gen_6/trevenant/icon.png
diff --git a/graphics/pokemon/trevenant/normal.pal b/graphics/pokemon/gen_6/trevenant/normal.pal
similarity index 100%
rename from graphics/pokemon/trevenant/normal.pal
rename to graphics/pokemon/gen_6/trevenant/normal.pal
diff --git a/graphics/pokemon/trevenant/shiny.pal b/graphics/pokemon/gen_6/trevenant/shiny.pal
similarity index 100%
rename from graphics/pokemon/trevenant/shiny.pal
rename to graphics/pokemon/gen_6/trevenant/shiny.pal
diff --git a/graphics/pokemon/tyrantrum/anim_front.png b/graphics/pokemon/gen_6/tyrantrum/anim_front.png
similarity index 100%
rename from graphics/pokemon/tyrantrum/anim_front.png
rename to graphics/pokemon/gen_6/tyrantrum/anim_front.png
diff --git a/graphics/pokemon/tyrantrum/back.png b/graphics/pokemon/gen_6/tyrantrum/back.png
similarity index 100%
rename from graphics/pokemon/tyrantrum/back.png
rename to graphics/pokemon/gen_6/tyrantrum/back.png
diff --git a/graphics/pokemon/tyrantrum/footprint.png b/graphics/pokemon/gen_6/tyrantrum/footprint.png
similarity index 100%
rename from graphics/pokemon/tyrantrum/footprint.png
rename to graphics/pokemon/gen_6/tyrantrum/footprint.png
diff --git a/graphics/pokemon/tyrantrum/icon.png b/graphics/pokemon/gen_6/tyrantrum/icon.png
similarity index 100%
rename from graphics/pokemon/tyrantrum/icon.png
rename to graphics/pokemon/gen_6/tyrantrum/icon.png
diff --git a/graphics/pokemon/tyrantrum/normal.pal b/graphics/pokemon/gen_6/tyrantrum/normal.pal
similarity index 100%
rename from graphics/pokemon/tyrantrum/normal.pal
rename to graphics/pokemon/gen_6/tyrantrum/normal.pal
diff --git a/graphics/pokemon/tyrantrum/shiny.pal b/graphics/pokemon/gen_6/tyrantrum/shiny.pal
similarity index 100%
rename from graphics/pokemon/tyrantrum/shiny.pal
rename to graphics/pokemon/gen_6/tyrantrum/shiny.pal
diff --git a/graphics/pokemon/tyrunt/anim_front.png b/graphics/pokemon/gen_6/tyrunt/anim_front.png
similarity index 100%
rename from graphics/pokemon/tyrunt/anim_front.png
rename to graphics/pokemon/gen_6/tyrunt/anim_front.png
diff --git a/graphics/pokemon/tyrunt/back.png b/graphics/pokemon/gen_6/tyrunt/back.png
similarity index 100%
rename from graphics/pokemon/tyrunt/back.png
rename to graphics/pokemon/gen_6/tyrunt/back.png
diff --git a/graphics/pokemon/tyrunt/footprint.png b/graphics/pokemon/gen_6/tyrunt/footprint.png
similarity index 100%
rename from graphics/pokemon/tyrunt/footprint.png
rename to graphics/pokemon/gen_6/tyrunt/footprint.png
diff --git a/graphics/pokemon/tyrunt/icon.png b/graphics/pokemon/gen_6/tyrunt/icon.png
similarity index 100%
rename from graphics/pokemon/tyrunt/icon.png
rename to graphics/pokemon/gen_6/tyrunt/icon.png
diff --git a/graphics/pokemon/tyrunt/normal.pal b/graphics/pokemon/gen_6/tyrunt/normal.pal
similarity index 100%
rename from graphics/pokemon/tyrunt/normal.pal
rename to graphics/pokemon/gen_6/tyrunt/normal.pal
diff --git a/graphics/pokemon/tyrunt/shiny.pal b/graphics/pokemon/gen_6/tyrunt/shiny.pal
similarity index 100%
rename from graphics/pokemon/tyrunt/shiny.pal
rename to graphics/pokemon/gen_6/tyrunt/shiny.pal
diff --git a/graphics/pokemon/vivillon/anim_front.png b/graphics/pokemon/gen_6/vivillon/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/anim_front.png
diff --git a/graphics/pokemon/vivillon/archipelago/anim_front.png b/graphics/pokemon/gen_6/vivillon/archipelago/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/archipelago/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/archipelago/anim_front.png
diff --git a/graphics/pokemon/vivillon/archipelago/back.png b/graphics/pokemon/gen_6/vivillon/archipelago/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/archipelago/back.png
rename to graphics/pokemon/gen_6/vivillon/archipelago/back.png
diff --git a/graphics/pokemon/vivillon/archipelago/icon.png b/graphics/pokemon/gen_6/vivillon/archipelago/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/archipelago/icon.png
rename to graphics/pokemon/gen_6/vivillon/archipelago/icon.png
diff --git a/graphics/pokemon/vivillon/archipelago/normal.pal b/graphics/pokemon/gen_6/vivillon/archipelago/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/archipelago/normal.pal
rename to graphics/pokemon/gen_6/vivillon/archipelago/normal.pal
diff --git a/graphics/pokemon/vivillon/archipelago/shiny.pal b/graphics/pokemon/gen_6/vivillon/archipelago/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/archipelago/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/archipelago/shiny.pal
diff --git a/graphics/pokemon/vivillon/back.png b/graphics/pokemon/gen_6/vivillon/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/back.png
rename to graphics/pokemon/gen_6/vivillon/back.png
diff --git a/graphics/pokemon/vivillon/continental/anim_front.png b/graphics/pokemon/gen_6/vivillon/continental/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/continental/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/continental/anim_front.png
diff --git a/graphics/pokemon/vivillon/continental/back.png b/graphics/pokemon/gen_6/vivillon/continental/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/continental/back.png
rename to graphics/pokemon/gen_6/vivillon/continental/back.png
diff --git a/graphics/pokemon/vivillon/continental/icon.png b/graphics/pokemon/gen_6/vivillon/continental/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/continental/icon.png
rename to graphics/pokemon/gen_6/vivillon/continental/icon.png
diff --git a/graphics/pokemon/vivillon/continental/normal.pal b/graphics/pokemon/gen_6/vivillon/continental/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/continental/normal.pal
rename to graphics/pokemon/gen_6/vivillon/continental/normal.pal
diff --git a/graphics/pokemon/vivillon/continental/shiny.pal b/graphics/pokemon/gen_6/vivillon/continental/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/continental/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/continental/shiny.pal
diff --git a/graphics/pokemon/vivillon/elegant/anim_front.png b/graphics/pokemon/gen_6/vivillon/elegant/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/elegant/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/elegant/anim_front.png
diff --git a/graphics/pokemon/vivillon/elegant/back.png b/graphics/pokemon/gen_6/vivillon/elegant/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/elegant/back.png
rename to graphics/pokemon/gen_6/vivillon/elegant/back.png
diff --git a/graphics/pokemon/vivillon/elegant/icon.png b/graphics/pokemon/gen_6/vivillon/elegant/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/elegant/icon.png
rename to graphics/pokemon/gen_6/vivillon/elegant/icon.png
diff --git a/graphics/pokemon/vivillon/elegant/normal.pal b/graphics/pokemon/gen_6/vivillon/elegant/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/elegant/normal.pal
rename to graphics/pokemon/gen_6/vivillon/elegant/normal.pal
diff --git a/graphics/pokemon/vivillon/elegant/shiny.pal b/graphics/pokemon/gen_6/vivillon/elegant/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/elegant/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/elegant/shiny.pal
diff --git a/graphics/pokemon/vivillon/fancy/anim_front.png b/graphics/pokemon/gen_6/vivillon/fancy/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/fancy/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/fancy/anim_front.png
diff --git a/graphics/pokemon/vivillon/fancy/back.png b/graphics/pokemon/gen_6/vivillon/fancy/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/fancy/back.png
rename to graphics/pokemon/gen_6/vivillon/fancy/back.png
diff --git a/graphics/pokemon/vivillon/fancy/icon.png b/graphics/pokemon/gen_6/vivillon/fancy/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/fancy/icon.png
rename to graphics/pokemon/gen_6/vivillon/fancy/icon.png
diff --git a/graphics/pokemon/vivillon/fancy/normal.pal b/graphics/pokemon/gen_6/vivillon/fancy/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/fancy/normal.pal
rename to graphics/pokemon/gen_6/vivillon/fancy/normal.pal
diff --git a/graphics/pokemon/vivillon/fancy/shiny.pal b/graphics/pokemon/gen_6/vivillon/fancy/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/fancy/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/fancy/shiny.pal
diff --git a/graphics/pokemon/solrock/footprint.png b/graphics/pokemon/gen_6/vivillon/footprint.png
similarity index 100%
rename from graphics/pokemon/solrock/footprint.png
rename to graphics/pokemon/gen_6/vivillon/footprint.png
diff --git a/graphics/pokemon/vivillon/garden/anim_front.png b/graphics/pokemon/gen_6/vivillon/garden/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/garden/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/garden/anim_front.png
diff --git a/graphics/pokemon/vivillon/garden/back.png b/graphics/pokemon/gen_6/vivillon/garden/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/garden/back.png
rename to graphics/pokemon/gen_6/vivillon/garden/back.png
diff --git a/graphics/pokemon/vivillon/garden/icon.png b/graphics/pokemon/gen_6/vivillon/garden/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/garden/icon.png
rename to graphics/pokemon/gen_6/vivillon/garden/icon.png
diff --git a/graphics/pokemon/vivillon/garden/normal.pal b/graphics/pokemon/gen_6/vivillon/garden/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/garden/normal.pal
rename to graphics/pokemon/gen_6/vivillon/garden/normal.pal
diff --git a/graphics/pokemon/vivillon/garden/shiny.pal b/graphics/pokemon/gen_6/vivillon/garden/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/garden/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/garden/shiny.pal
diff --git a/graphics/pokemon/vivillon/high_plains/anim_front.png b/graphics/pokemon/gen_6/vivillon/high_plains/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/high_plains/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/high_plains/anim_front.png
diff --git a/graphics/pokemon/vivillon/high_plains/back.png b/graphics/pokemon/gen_6/vivillon/high_plains/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/high_plains/back.png
rename to graphics/pokemon/gen_6/vivillon/high_plains/back.png
diff --git a/graphics/pokemon/vivillon/high_plains/icon.png b/graphics/pokemon/gen_6/vivillon/high_plains/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/high_plains/icon.png
rename to graphics/pokemon/gen_6/vivillon/high_plains/icon.png
diff --git a/graphics/pokemon/vivillon/high_plains/normal.pal b/graphics/pokemon/gen_6/vivillon/high_plains/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/high_plains/normal.pal
rename to graphics/pokemon/gen_6/vivillon/high_plains/normal.pal
diff --git a/graphics/pokemon/vivillon/high_plains/shiny.pal b/graphics/pokemon/gen_6/vivillon/high_plains/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/high_plains/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/high_plains/shiny.pal
diff --git a/graphics/pokemon/vivillon/icon.png b/graphics/pokemon/gen_6/vivillon/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/icon.png
rename to graphics/pokemon/gen_6/vivillon/icon.png
diff --git a/graphics/pokemon/vivillon/jungle/anim_front.png b/graphics/pokemon/gen_6/vivillon/jungle/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/jungle/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/jungle/anim_front.png
diff --git a/graphics/pokemon/vivillon/jungle/back.png b/graphics/pokemon/gen_6/vivillon/jungle/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/jungle/back.png
rename to graphics/pokemon/gen_6/vivillon/jungle/back.png
diff --git a/graphics/pokemon/vivillon/jungle/icon.png b/graphics/pokemon/gen_6/vivillon/jungle/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/jungle/icon.png
rename to graphics/pokemon/gen_6/vivillon/jungle/icon.png
diff --git a/graphics/pokemon/vivillon/jungle/normal.pal b/graphics/pokemon/gen_6/vivillon/jungle/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/jungle/normal.pal
rename to graphics/pokemon/gen_6/vivillon/jungle/normal.pal
diff --git a/graphics/pokemon/vivillon/jungle/shiny.pal b/graphics/pokemon/gen_6/vivillon/jungle/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/jungle/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/jungle/shiny.pal
diff --git a/graphics/pokemon/vivillon/marine/anim_front.png b/graphics/pokemon/gen_6/vivillon/marine/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/marine/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/marine/anim_front.png
diff --git a/graphics/pokemon/vivillon/marine/back.png b/graphics/pokemon/gen_6/vivillon/marine/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/marine/back.png
rename to graphics/pokemon/gen_6/vivillon/marine/back.png
diff --git a/graphics/pokemon/vivillon/marine/icon.png b/graphics/pokemon/gen_6/vivillon/marine/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/marine/icon.png
rename to graphics/pokemon/gen_6/vivillon/marine/icon.png
diff --git a/graphics/pokemon/vivillon/marine/normal.pal b/graphics/pokemon/gen_6/vivillon/marine/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/marine/normal.pal
rename to graphics/pokemon/gen_6/vivillon/marine/normal.pal
diff --git a/graphics/pokemon/vivillon/marine/shiny.pal b/graphics/pokemon/gen_6/vivillon/marine/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/marine/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/marine/shiny.pal
diff --git a/graphics/pokemon/vivillon/meadow/anim_front.png b/graphics/pokemon/gen_6/vivillon/meadow/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/meadow/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/meadow/anim_front.png
diff --git a/graphics/pokemon/vivillon/meadow/back.png b/graphics/pokemon/gen_6/vivillon/meadow/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/meadow/back.png
rename to graphics/pokemon/gen_6/vivillon/meadow/back.png
diff --git a/graphics/pokemon/vivillon/meadow/icon.png b/graphics/pokemon/gen_6/vivillon/meadow/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/meadow/icon.png
rename to graphics/pokemon/gen_6/vivillon/meadow/icon.png
diff --git a/graphics/pokemon/vivillon/meadow/normal.pal b/graphics/pokemon/gen_6/vivillon/meadow/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/meadow/normal.pal
rename to graphics/pokemon/gen_6/vivillon/meadow/normal.pal
diff --git a/graphics/pokemon/vivillon/meadow/shiny.pal b/graphics/pokemon/gen_6/vivillon/meadow/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/meadow/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/meadow/shiny.pal
diff --git a/graphics/pokemon/vivillon/modern/anim_front.png b/graphics/pokemon/gen_6/vivillon/modern/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/modern/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/modern/anim_front.png
diff --git a/graphics/pokemon/vivillon/modern/back.png b/graphics/pokemon/gen_6/vivillon/modern/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/modern/back.png
rename to graphics/pokemon/gen_6/vivillon/modern/back.png
diff --git a/graphics/pokemon/vivillon/modern/icon.png b/graphics/pokemon/gen_6/vivillon/modern/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/modern/icon.png
rename to graphics/pokemon/gen_6/vivillon/modern/icon.png
diff --git a/graphics/pokemon/vivillon/modern/normal.pal b/graphics/pokemon/gen_6/vivillon/modern/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/modern/normal.pal
rename to graphics/pokemon/gen_6/vivillon/modern/normal.pal
diff --git a/graphics/pokemon/vivillon/modern/shiny.pal b/graphics/pokemon/gen_6/vivillon/modern/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/modern/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/modern/shiny.pal
diff --git a/graphics/pokemon/vivillon/monsoon/anim_front.png b/graphics/pokemon/gen_6/vivillon/monsoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/monsoon/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/monsoon/anim_front.png
diff --git a/graphics/pokemon/vivillon/monsoon/back.png b/graphics/pokemon/gen_6/vivillon/monsoon/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/monsoon/back.png
rename to graphics/pokemon/gen_6/vivillon/monsoon/back.png
diff --git a/graphics/pokemon/vivillon/monsoon/icon.png b/graphics/pokemon/gen_6/vivillon/monsoon/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/monsoon/icon.png
rename to graphics/pokemon/gen_6/vivillon/monsoon/icon.png
diff --git a/graphics/pokemon/vivillon/monsoon/normal.pal b/graphics/pokemon/gen_6/vivillon/monsoon/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/monsoon/normal.pal
rename to graphics/pokemon/gen_6/vivillon/monsoon/normal.pal
diff --git a/graphics/pokemon/vivillon/monsoon/shiny.pal b/graphics/pokemon/gen_6/vivillon/monsoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/monsoon/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/monsoon/shiny.pal
diff --git a/graphics/pokemon/vivillon/normal.pal b/graphics/pokemon/gen_6/vivillon/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/normal.pal
rename to graphics/pokemon/gen_6/vivillon/normal.pal
diff --git a/graphics/pokemon/vivillon/ocean/anim_front.png b/graphics/pokemon/gen_6/vivillon/ocean/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/ocean/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/ocean/anim_front.png
diff --git a/graphics/pokemon/vivillon/ocean/back.png b/graphics/pokemon/gen_6/vivillon/ocean/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/ocean/back.png
rename to graphics/pokemon/gen_6/vivillon/ocean/back.png
diff --git a/graphics/pokemon/vivillon/ocean/icon.png b/graphics/pokemon/gen_6/vivillon/ocean/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/ocean/icon.png
rename to graphics/pokemon/gen_6/vivillon/ocean/icon.png
diff --git a/graphics/pokemon/vivillon/ocean/normal.pal b/graphics/pokemon/gen_6/vivillon/ocean/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/ocean/normal.pal
rename to graphics/pokemon/gen_6/vivillon/ocean/normal.pal
diff --git a/graphics/pokemon/vivillon/ocean/shiny.pal b/graphics/pokemon/gen_6/vivillon/ocean/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/ocean/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/ocean/shiny.pal
diff --git a/graphics/pokemon/vivillon/poke_ball/anim_front.png b/graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/poke_ball/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.png
diff --git a/graphics/pokemon/vivillon/poke_ball/back.png b/graphics/pokemon/gen_6/vivillon/poke_ball/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/poke_ball/back.png
rename to graphics/pokemon/gen_6/vivillon/poke_ball/back.png
diff --git a/graphics/pokemon/vivillon/poke_ball/icon.png b/graphics/pokemon/gen_6/vivillon/poke_ball/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/poke_ball/icon.png
rename to graphics/pokemon/gen_6/vivillon/poke_ball/icon.png
diff --git a/graphics/pokemon/vivillon/poke_ball/normal.pal b/graphics/pokemon/gen_6/vivillon/poke_ball/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/poke_ball/normal.pal
rename to graphics/pokemon/gen_6/vivillon/poke_ball/normal.pal
diff --git a/graphics/pokemon/vivillon/poke_ball/shiny.pal b/graphics/pokemon/gen_6/vivillon/poke_ball/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/poke_ball/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/poke_ball/shiny.pal
diff --git a/graphics/pokemon/vivillon/polar/anim_front.png b/graphics/pokemon/gen_6/vivillon/polar/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/polar/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/polar/anim_front.png
diff --git a/graphics/pokemon/vivillon/polar/back.png b/graphics/pokemon/gen_6/vivillon/polar/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/polar/back.png
rename to graphics/pokemon/gen_6/vivillon/polar/back.png
diff --git a/graphics/pokemon/vivillon/polar/icon.png b/graphics/pokemon/gen_6/vivillon/polar/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/polar/icon.png
rename to graphics/pokemon/gen_6/vivillon/polar/icon.png
diff --git a/graphics/pokemon/vivillon/polar/normal.pal b/graphics/pokemon/gen_6/vivillon/polar/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/polar/normal.pal
rename to graphics/pokemon/gen_6/vivillon/polar/normal.pal
diff --git a/graphics/pokemon/vivillon/polar/shiny.pal b/graphics/pokemon/gen_6/vivillon/polar/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/polar/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/polar/shiny.pal
diff --git a/graphics/pokemon/vivillon/river/anim_front.png b/graphics/pokemon/gen_6/vivillon/river/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/river/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/river/anim_front.png
diff --git a/graphics/pokemon/vivillon/river/back.png b/graphics/pokemon/gen_6/vivillon/river/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/river/back.png
rename to graphics/pokemon/gen_6/vivillon/river/back.png
diff --git a/graphics/pokemon/vivillon/river/icon.png b/graphics/pokemon/gen_6/vivillon/river/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/river/icon.png
rename to graphics/pokemon/gen_6/vivillon/river/icon.png
diff --git a/graphics/pokemon/vivillon/river/normal.pal b/graphics/pokemon/gen_6/vivillon/river/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/river/normal.pal
rename to graphics/pokemon/gen_6/vivillon/river/normal.pal
diff --git a/graphics/pokemon/vivillon/river/shiny.pal b/graphics/pokemon/gen_6/vivillon/river/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/river/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/river/shiny.pal
diff --git a/graphics/pokemon/vivillon/sandstorm/anim_front.png b/graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/sandstorm/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.png
diff --git a/graphics/pokemon/vivillon/sandstorm/back.png b/graphics/pokemon/gen_6/vivillon/sandstorm/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/sandstorm/back.png
rename to graphics/pokemon/gen_6/vivillon/sandstorm/back.png
diff --git a/graphics/pokemon/vivillon/sandstorm/icon.png b/graphics/pokemon/gen_6/vivillon/sandstorm/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/sandstorm/icon.png
rename to graphics/pokemon/gen_6/vivillon/sandstorm/icon.png
diff --git a/graphics/pokemon/vivillon/sandstorm/normal.pal b/graphics/pokemon/gen_6/vivillon/sandstorm/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/sandstorm/normal.pal
rename to graphics/pokemon/gen_6/vivillon/sandstorm/normal.pal
diff --git a/graphics/pokemon/vivillon/sandstorm/shiny.pal b/graphics/pokemon/gen_6/vivillon/sandstorm/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/sandstorm/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/sandstorm/shiny.pal
diff --git a/graphics/pokemon/vivillon/savanna/anim_front.png b/graphics/pokemon/gen_6/vivillon/savanna/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/savanna/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/savanna/anim_front.png
diff --git a/graphics/pokemon/vivillon/savanna/back.png b/graphics/pokemon/gen_6/vivillon/savanna/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/savanna/back.png
rename to graphics/pokemon/gen_6/vivillon/savanna/back.png
diff --git a/graphics/pokemon/vivillon/savanna/icon.png b/graphics/pokemon/gen_6/vivillon/savanna/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/savanna/icon.png
rename to graphics/pokemon/gen_6/vivillon/savanna/icon.png
diff --git a/graphics/pokemon/vivillon/savanna/normal.pal b/graphics/pokemon/gen_6/vivillon/savanna/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/savanna/normal.pal
rename to graphics/pokemon/gen_6/vivillon/savanna/normal.pal
diff --git a/graphics/pokemon/vivillon/savanna/shiny.pal b/graphics/pokemon/gen_6/vivillon/savanna/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/savanna/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/savanna/shiny.pal
diff --git a/graphics/pokemon/vivillon/shiny.pal b/graphics/pokemon/gen_6/vivillon/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/shiny.pal
diff --git a/graphics/pokemon/vivillon/sun/anim_front.png b/graphics/pokemon/gen_6/vivillon/sun/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/sun/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/sun/anim_front.png
diff --git a/graphics/pokemon/vivillon/sun/back.png b/graphics/pokemon/gen_6/vivillon/sun/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/sun/back.png
rename to graphics/pokemon/gen_6/vivillon/sun/back.png
diff --git a/graphics/pokemon/vivillon/sun/icon.png b/graphics/pokemon/gen_6/vivillon/sun/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/sun/icon.png
rename to graphics/pokemon/gen_6/vivillon/sun/icon.png
diff --git a/graphics/pokemon/vivillon/sun/normal.pal b/graphics/pokemon/gen_6/vivillon/sun/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/sun/normal.pal
rename to graphics/pokemon/gen_6/vivillon/sun/normal.pal
diff --git a/graphics/pokemon/vivillon/sun/shiny.pal b/graphics/pokemon/gen_6/vivillon/sun/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/sun/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/sun/shiny.pal
diff --git a/graphics/pokemon/vivillon/tundra/anim_front.png b/graphics/pokemon/gen_6/vivillon/tundra/anim_front.png
similarity index 100%
rename from graphics/pokemon/vivillon/tundra/anim_front.png
rename to graphics/pokemon/gen_6/vivillon/tundra/anim_front.png
diff --git a/graphics/pokemon/vivillon/tundra/back.png b/graphics/pokemon/gen_6/vivillon/tundra/back.png
similarity index 100%
rename from graphics/pokemon/vivillon/tundra/back.png
rename to graphics/pokemon/gen_6/vivillon/tundra/back.png
diff --git a/graphics/pokemon/vivillon/tundra/icon.png b/graphics/pokemon/gen_6/vivillon/tundra/icon.png
similarity index 100%
rename from graphics/pokemon/vivillon/tundra/icon.png
rename to graphics/pokemon/gen_6/vivillon/tundra/icon.png
diff --git a/graphics/pokemon/vivillon/tundra/normal.pal b/graphics/pokemon/gen_6/vivillon/tundra/normal.pal
similarity index 100%
rename from graphics/pokemon/vivillon/tundra/normal.pal
rename to graphics/pokemon/gen_6/vivillon/tundra/normal.pal
diff --git a/graphics/pokemon/vivillon/tundra/shiny.pal b/graphics/pokemon/gen_6/vivillon/tundra/shiny.pal
similarity index 100%
rename from graphics/pokemon/vivillon/tundra/shiny.pal
rename to graphics/pokemon/gen_6/vivillon/tundra/shiny.pal
diff --git a/graphics/pokemon/volcanion/anim_front.png b/graphics/pokemon/gen_6/volcanion/anim_front.png
similarity index 100%
rename from graphics/pokemon/volcanion/anim_front.png
rename to graphics/pokemon/gen_6/volcanion/anim_front.png
diff --git a/graphics/pokemon/volcanion/back.png b/graphics/pokemon/gen_6/volcanion/back.png
similarity index 100%
rename from graphics/pokemon/volcanion/back.png
rename to graphics/pokemon/gen_6/volcanion/back.png
diff --git a/graphics/pokemon/volcanion/footprint.png b/graphics/pokemon/gen_6/volcanion/footprint.png
similarity index 100%
rename from graphics/pokemon/volcanion/footprint.png
rename to graphics/pokemon/gen_6/volcanion/footprint.png
diff --git a/graphics/pokemon/volcanion/icon.png b/graphics/pokemon/gen_6/volcanion/icon.png
similarity index 100%
rename from graphics/pokemon/volcanion/icon.png
rename to graphics/pokemon/gen_6/volcanion/icon.png
diff --git a/graphics/pokemon/volcanion/normal.pal b/graphics/pokemon/gen_6/volcanion/normal.pal
similarity index 100%
rename from graphics/pokemon/volcanion/normal.pal
rename to graphics/pokemon/gen_6/volcanion/normal.pal
diff --git a/graphics/pokemon/volcanion/shiny.pal b/graphics/pokemon/gen_6/volcanion/shiny.pal
similarity index 100%
rename from graphics/pokemon/volcanion/shiny.pal
rename to graphics/pokemon/gen_6/volcanion/shiny.pal
diff --git a/graphics/pokemon/xerneas/active/anim_front.png b/graphics/pokemon/gen_6/xerneas/active/anim_front.png
similarity index 100%
rename from graphics/pokemon/xerneas/active/anim_front.png
rename to graphics/pokemon/gen_6/xerneas/active/anim_front.png
diff --git a/graphics/pokemon/xerneas/active/back.png b/graphics/pokemon/gen_6/xerneas/active/back.png
similarity index 100%
rename from graphics/pokemon/xerneas/active/back.png
rename to graphics/pokemon/gen_6/xerneas/active/back.png
diff --git a/graphics/pokemon/xerneas/active/icon.png b/graphics/pokemon/gen_6/xerneas/active/icon.png
similarity index 100%
rename from graphics/pokemon/xerneas/active/icon.png
rename to graphics/pokemon/gen_6/xerneas/active/icon.png
diff --git a/graphics/pokemon/xerneas/active/normal.pal b/graphics/pokemon/gen_6/xerneas/active/normal.pal
similarity index 100%
rename from graphics/pokemon/xerneas/active/normal.pal
rename to graphics/pokemon/gen_6/xerneas/active/normal.pal
diff --git a/graphics/pokemon/xerneas/active/shiny.pal b/graphics/pokemon/gen_6/xerneas/active/shiny.pal
similarity index 100%
rename from graphics/pokemon/xerneas/active/shiny.pal
rename to graphics/pokemon/gen_6/xerneas/active/shiny.pal
diff --git a/graphics/pokemon/xerneas/back.png b/graphics/pokemon/gen_6/xerneas/back.png
similarity index 100%
rename from graphics/pokemon/xerneas/back.png
rename to graphics/pokemon/gen_6/xerneas/back.png
diff --git a/graphics/pokemon/lurantis/footprint.png b/graphics/pokemon/gen_6/xerneas/footprint.png
similarity index 100%
rename from graphics/pokemon/lurantis/footprint.png
rename to graphics/pokemon/gen_6/xerneas/footprint.png
diff --git a/graphics/pokemon/xerneas/front.png b/graphics/pokemon/gen_6/xerneas/front.png
similarity index 100%
rename from graphics/pokemon/xerneas/front.png
rename to graphics/pokemon/gen_6/xerneas/front.png
diff --git a/graphics/pokemon/xerneas/icon.png b/graphics/pokemon/gen_6/xerneas/icon.png
similarity index 100%
rename from graphics/pokemon/xerneas/icon.png
rename to graphics/pokemon/gen_6/xerneas/icon.png
diff --git a/graphics/pokemon/xerneas/normal.pal b/graphics/pokemon/gen_6/xerneas/normal.pal
similarity index 100%
rename from graphics/pokemon/xerneas/normal.pal
rename to graphics/pokemon/gen_6/xerneas/normal.pal
diff --git a/graphics/pokemon/xerneas/shiny.pal b/graphics/pokemon/gen_6/xerneas/shiny.pal
similarity index 100%
rename from graphics/pokemon/xerneas/shiny.pal
rename to graphics/pokemon/gen_6/xerneas/shiny.pal
diff --git a/graphics/pokemon/yveltal/anim_front.png b/graphics/pokemon/gen_6/yveltal/anim_front.png
similarity index 100%
rename from graphics/pokemon/yveltal/anim_front.png
rename to graphics/pokemon/gen_6/yveltal/anim_front.png
diff --git a/graphics/pokemon/yveltal/back.png b/graphics/pokemon/gen_6/yveltal/back.png
similarity index 100%
rename from graphics/pokemon/yveltal/back.png
rename to graphics/pokemon/gen_6/yveltal/back.png
diff --git a/graphics/pokemon/yveltal/footprint.png b/graphics/pokemon/gen_6/yveltal/footprint.png
similarity index 100%
rename from graphics/pokemon/yveltal/footprint.png
rename to graphics/pokemon/gen_6/yveltal/footprint.png
diff --git a/graphics/pokemon/yveltal/icon.png b/graphics/pokemon/gen_6/yveltal/icon.png
similarity index 100%
rename from graphics/pokemon/yveltal/icon.png
rename to graphics/pokemon/gen_6/yveltal/icon.png
diff --git a/graphics/pokemon/yveltal/normal.pal b/graphics/pokemon/gen_6/yveltal/normal.pal
similarity index 100%
rename from graphics/pokemon/yveltal/normal.pal
rename to graphics/pokemon/gen_6/yveltal/normal.pal
diff --git a/graphics/pokemon/yveltal/shiny.pal b/graphics/pokemon/gen_6/yveltal/shiny.pal
similarity index 100%
rename from graphics/pokemon/yveltal/shiny.pal
rename to graphics/pokemon/gen_6/yveltal/shiny.pal
diff --git a/graphics/pokemon/zygarde/10_percent/anim_front.png b/graphics/pokemon/gen_6/zygarde/10_percent/anim_front.png
similarity index 100%
rename from graphics/pokemon/zygarde/10_percent/anim_front.png
rename to graphics/pokemon/gen_6/zygarde/10_percent/anim_front.png
diff --git a/graphics/pokemon/zygarde/10_percent/back.png b/graphics/pokemon/gen_6/zygarde/10_percent/back.png
similarity index 100%
rename from graphics/pokemon/zygarde/10_percent/back.png
rename to graphics/pokemon/gen_6/zygarde/10_percent/back.png
diff --git a/graphics/pokemon/zygarde/10_percent/icon.png b/graphics/pokemon/gen_6/zygarde/10_percent/icon.png
similarity index 100%
rename from graphics/pokemon/zygarde/10_percent/icon.png
rename to graphics/pokemon/gen_6/zygarde/10_percent/icon.png
diff --git a/graphics/pokemon/zygarde/10_percent/normal.pal b/graphics/pokemon/gen_6/zygarde/10_percent/normal.pal
similarity index 100%
rename from graphics/pokemon/zygarde/10_percent/normal.pal
rename to graphics/pokemon/gen_6/zygarde/10_percent/normal.pal
diff --git a/graphics/pokemon/zygarde/10_percent/shiny.pal b/graphics/pokemon/gen_6/zygarde/10_percent/shiny.pal
similarity index 100%
rename from graphics/pokemon/zygarde/10_percent/shiny.pal
rename to graphics/pokemon/gen_6/zygarde/10_percent/shiny.pal
diff --git a/graphics/pokemon/zygarde/anim_front.png b/graphics/pokemon/gen_6/zygarde/anim_front.png
similarity index 100%
rename from graphics/pokemon/zygarde/anim_front.png
rename to graphics/pokemon/gen_6/zygarde/anim_front.png
diff --git a/graphics/pokemon/zygarde/back.png b/graphics/pokemon/gen_6/zygarde/back.png
similarity index 100%
rename from graphics/pokemon/zygarde/back.png
rename to graphics/pokemon/gen_6/zygarde/back.png
diff --git a/graphics/pokemon/zygarde/complete/anim_front.png b/graphics/pokemon/gen_6/zygarde/complete/anim_front.png
similarity index 100%
rename from graphics/pokemon/zygarde/complete/anim_front.png
rename to graphics/pokemon/gen_6/zygarde/complete/anim_front.png
diff --git a/graphics/pokemon/zygarde/complete/back.png b/graphics/pokemon/gen_6/zygarde/complete/back.png
similarity index 100%
rename from graphics/pokemon/zygarde/complete/back.png
rename to graphics/pokemon/gen_6/zygarde/complete/back.png
diff --git a/graphics/pokemon/zygarde/complete/icon.png b/graphics/pokemon/gen_6/zygarde/complete/icon.png
similarity index 100%
rename from graphics/pokemon/zygarde/complete/icon.png
rename to graphics/pokemon/gen_6/zygarde/complete/icon.png
diff --git a/graphics/pokemon/zygarde/complete/normal.pal b/graphics/pokemon/gen_6/zygarde/complete/normal.pal
similarity index 100%
rename from graphics/pokemon/zygarde/complete/normal.pal
rename to graphics/pokemon/gen_6/zygarde/complete/normal.pal
diff --git a/graphics/pokemon/zygarde/complete/shiny.pal b/graphics/pokemon/gen_6/zygarde/complete/shiny.pal
similarity index 100%
rename from graphics/pokemon/zygarde/complete/shiny.pal
rename to graphics/pokemon/gen_6/zygarde/complete/shiny.pal
diff --git a/graphics/pokemon/zygarde/footprint.png b/graphics/pokemon/gen_6/zygarde/footprint.png
similarity index 100%
rename from graphics/pokemon/zygarde/footprint.png
rename to graphics/pokemon/gen_6/zygarde/footprint.png
diff --git a/graphics/pokemon/zygarde/icon.png b/graphics/pokemon/gen_6/zygarde/icon.png
similarity index 100%
rename from graphics/pokemon/zygarde/icon.png
rename to graphics/pokemon/gen_6/zygarde/icon.png
diff --git a/graphics/pokemon/zygarde/normal.pal b/graphics/pokemon/gen_6/zygarde/normal.pal
similarity index 100%
rename from graphics/pokemon/zygarde/normal.pal
rename to graphics/pokemon/gen_6/zygarde/normal.pal
diff --git a/graphics/pokemon/zygarde/shiny.pal b/graphics/pokemon/gen_6/zygarde/shiny.pal
similarity index 100%
rename from graphics/pokemon/zygarde/shiny.pal
rename to graphics/pokemon/gen_6/zygarde/shiny.pal
diff --git a/graphics/pokemon/araquanid/anim_front.png b/graphics/pokemon/gen_7/araquanid/anim_front.png
similarity index 100%
rename from graphics/pokemon/araquanid/anim_front.png
rename to graphics/pokemon/gen_7/araquanid/anim_front.png
diff --git a/graphics/pokemon/araquanid/back.png b/graphics/pokemon/gen_7/araquanid/back.png
similarity index 100%
rename from graphics/pokemon/araquanid/back.png
rename to graphics/pokemon/gen_7/araquanid/back.png
diff --git a/graphics/pokemon/magearna/footprint.png b/graphics/pokemon/gen_7/araquanid/footprint.png
similarity index 100%
rename from graphics/pokemon/magearna/footprint.png
rename to graphics/pokemon/gen_7/araquanid/footprint.png
diff --git a/graphics/pokemon/araquanid/icon.png b/graphics/pokemon/gen_7/araquanid/icon.png
similarity index 100%
rename from graphics/pokemon/araquanid/icon.png
rename to graphics/pokemon/gen_7/araquanid/icon.png
diff --git a/graphics/pokemon/araquanid/normal.pal b/graphics/pokemon/gen_7/araquanid/normal.pal
similarity index 100%
rename from graphics/pokemon/araquanid/normal.pal
rename to graphics/pokemon/gen_7/araquanid/normal.pal
diff --git a/graphics/pokemon/araquanid/shiny.pal b/graphics/pokemon/gen_7/araquanid/shiny.pal
similarity index 100%
rename from graphics/pokemon/araquanid/shiny.pal
rename to graphics/pokemon/gen_7/araquanid/shiny.pal
diff --git a/graphics/pokemon/bewear/anim_front.png b/graphics/pokemon/gen_7/bewear/anim_front.png
similarity index 100%
rename from graphics/pokemon/bewear/anim_front.png
rename to graphics/pokemon/gen_7/bewear/anim_front.png
diff --git a/graphics/pokemon/bewear/back.png b/graphics/pokemon/gen_7/bewear/back.png
similarity index 100%
rename from graphics/pokemon/bewear/back.png
rename to graphics/pokemon/gen_7/bewear/back.png
diff --git a/graphics/pokemon/bewear/footprint.png b/graphics/pokemon/gen_7/bewear/footprint.png
similarity index 100%
rename from graphics/pokemon/bewear/footprint.png
rename to graphics/pokemon/gen_7/bewear/footprint.png
diff --git a/graphics/pokemon/bewear/icon.png b/graphics/pokemon/gen_7/bewear/icon.png
similarity index 100%
rename from graphics/pokemon/bewear/icon.png
rename to graphics/pokemon/gen_7/bewear/icon.png
diff --git a/graphics/pokemon/bewear/normal.pal b/graphics/pokemon/gen_7/bewear/normal.pal
similarity index 100%
rename from graphics/pokemon/bewear/normal.pal
rename to graphics/pokemon/gen_7/bewear/normal.pal
diff --git a/graphics/pokemon/bewear/shiny.pal b/graphics/pokemon/gen_7/bewear/shiny.pal
similarity index 100%
rename from graphics/pokemon/bewear/shiny.pal
rename to graphics/pokemon/gen_7/bewear/shiny.pal
diff --git a/graphics/pokemon/blacephalon/back.png b/graphics/pokemon/gen_7/blacephalon/back.png
similarity index 100%
rename from graphics/pokemon/blacephalon/back.png
rename to graphics/pokemon/gen_7/blacephalon/back.png
diff --git a/graphics/pokemon/mr_mime/footprint.png b/graphics/pokemon/gen_7/blacephalon/footprint.png
similarity index 100%
rename from graphics/pokemon/mr_mime/footprint.png
rename to graphics/pokemon/gen_7/blacephalon/footprint.png
diff --git a/graphics/pokemon/blacephalon/front.png b/graphics/pokemon/gen_7/blacephalon/front.png
similarity index 100%
rename from graphics/pokemon/blacephalon/front.png
rename to graphics/pokemon/gen_7/blacephalon/front.png
diff --git a/graphics/pokemon/blacephalon/icon.png b/graphics/pokemon/gen_7/blacephalon/icon.png
similarity index 100%
rename from graphics/pokemon/blacephalon/icon.png
rename to graphics/pokemon/gen_7/blacephalon/icon.png
diff --git a/graphics/pokemon/blacephalon/normal.pal b/graphics/pokemon/gen_7/blacephalon/normal.pal
similarity index 100%
rename from graphics/pokemon/blacephalon/normal.pal
rename to graphics/pokemon/gen_7/blacephalon/normal.pal
diff --git a/graphics/pokemon/blacephalon/shiny.pal b/graphics/pokemon/gen_7/blacephalon/shiny.pal
similarity index 100%
rename from graphics/pokemon/blacephalon/shiny.pal
rename to graphics/pokemon/gen_7/blacephalon/shiny.pal
diff --git a/graphics/pokemon/bounsweet/back.png b/graphics/pokemon/gen_7/bounsweet/back.png
similarity index 100%
rename from graphics/pokemon/bounsweet/back.png
rename to graphics/pokemon/gen_7/bounsweet/back.png
diff --git a/graphics/pokemon/meloetta/footprint.png b/graphics/pokemon/gen_7/bounsweet/footprint.png
similarity index 100%
rename from graphics/pokemon/meloetta/footprint.png
rename to graphics/pokemon/gen_7/bounsweet/footprint.png
diff --git a/graphics/pokemon/bounsweet/front.png b/graphics/pokemon/gen_7/bounsweet/front.png
similarity index 100%
rename from graphics/pokemon/bounsweet/front.png
rename to graphics/pokemon/gen_7/bounsweet/front.png
diff --git a/graphics/pokemon/bounsweet/icon.png b/graphics/pokemon/gen_7/bounsweet/icon.png
similarity index 100%
rename from graphics/pokemon/bounsweet/icon.png
rename to graphics/pokemon/gen_7/bounsweet/icon.png
diff --git a/graphics/pokemon/bounsweet/normal.pal b/graphics/pokemon/gen_7/bounsweet/normal.pal
similarity index 100%
rename from graphics/pokemon/bounsweet/normal.pal
rename to graphics/pokemon/gen_7/bounsweet/normal.pal
diff --git a/graphics/pokemon/bounsweet/shiny.pal b/graphics/pokemon/gen_7/bounsweet/shiny.pal
similarity index 100%
rename from graphics/pokemon/bounsweet/shiny.pal
rename to graphics/pokemon/gen_7/bounsweet/shiny.pal
diff --git a/graphics/pokemon/brionne/back.png b/graphics/pokemon/gen_7/brionne/back.png
similarity index 100%
rename from graphics/pokemon/brionne/back.png
rename to graphics/pokemon/gen_7/brionne/back.png
diff --git a/graphics/pokemon/spewpa/footprint.png b/graphics/pokemon/gen_7/brionne/footprint.png
similarity index 100%
rename from graphics/pokemon/spewpa/footprint.png
rename to graphics/pokemon/gen_7/brionne/footprint.png
diff --git a/graphics/pokemon/brionne/front.png b/graphics/pokemon/gen_7/brionne/front.png
similarity index 100%
rename from graphics/pokemon/brionne/front.png
rename to graphics/pokemon/gen_7/brionne/front.png
diff --git a/graphics/pokemon/brionne/icon.png b/graphics/pokemon/gen_7/brionne/icon.png
similarity index 100%
rename from graphics/pokemon/brionne/icon.png
rename to graphics/pokemon/gen_7/brionne/icon.png
diff --git a/graphics/pokemon/brionne/normal.pal b/graphics/pokemon/gen_7/brionne/normal.pal
similarity index 100%
rename from graphics/pokemon/brionne/normal.pal
rename to graphics/pokemon/gen_7/brionne/normal.pal
diff --git a/graphics/pokemon/brionne/shiny.pal b/graphics/pokemon/gen_7/brionne/shiny.pal
similarity index 100%
rename from graphics/pokemon/brionne/shiny.pal
rename to graphics/pokemon/gen_7/brionne/shiny.pal
diff --git a/graphics/pokemon/bruxish/back.png b/graphics/pokemon/gen_7/bruxish/back.png
similarity index 100%
rename from graphics/pokemon/bruxish/back.png
rename to graphics/pokemon/gen_7/bruxish/back.png
diff --git a/graphics/pokemon/spheal/footprint.png b/graphics/pokemon/gen_7/bruxish/footprint.png
similarity index 100%
rename from graphics/pokemon/spheal/footprint.png
rename to graphics/pokemon/gen_7/bruxish/footprint.png
diff --git a/graphics/pokemon/bruxish/front.png b/graphics/pokemon/gen_7/bruxish/front.png
similarity index 100%
rename from graphics/pokemon/bruxish/front.png
rename to graphics/pokemon/gen_7/bruxish/front.png
diff --git a/graphics/pokemon/bruxish/icon.png b/graphics/pokemon/gen_7/bruxish/icon.png
similarity index 100%
rename from graphics/pokemon/bruxish/icon.png
rename to graphics/pokemon/gen_7/bruxish/icon.png
diff --git a/graphics/pokemon/bruxish/normal.pal b/graphics/pokemon/gen_7/bruxish/normal.pal
similarity index 100%
rename from graphics/pokemon/bruxish/normal.pal
rename to graphics/pokemon/gen_7/bruxish/normal.pal
diff --git a/graphics/pokemon/bruxish/shiny.pal b/graphics/pokemon/gen_7/bruxish/shiny.pal
similarity index 100%
rename from graphics/pokemon/bruxish/shiny.pal
rename to graphics/pokemon/gen_7/bruxish/shiny.pal
diff --git a/graphics/pokemon/buzzwole/back.png b/graphics/pokemon/gen_7/buzzwole/back.png
similarity index 100%
rename from graphics/pokemon/buzzwole/back.png
rename to graphics/pokemon/gen_7/buzzwole/back.png
diff --git a/graphics/pokemon/munna/footprint.png b/graphics/pokemon/gen_7/buzzwole/footprint.png
similarity index 100%
rename from graphics/pokemon/munna/footprint.png
rename to graphics/pokemon/gen_7/buzzwole/footprint.png
diff --git a/graphics/pokemon/buzzwole/front.png b/graphics/pokemon/gen_7/buzzwole/front.png
similarity index 100%
rename from graphics/pokemon/buzzwole/front.png
rename to graphics/pokemon/gen_7/buzzwole/front.png
diff --git a/graphics/pokemon/buzzwole/icon.png b/graphics/pokemon/gen_7/buzzwole/icon.png
similarity index 100%
rename from graphics/pokemon/buzzwole/icon.png
rename to graphics/pokemon/gen_7/buzzwole/icon.png
diff --git a/graphics/pokemon/buzzwole/normal.pal b/graphics/pokemon/gen_7/buzzwole/normal.pal
similarity index 100%
rename from graphics/pokemon/buzzwole/normal.pal
rename to graphics/pokemon/gen_7/buzzwole/normal.pal
diff --git a/graphics/pokemon/buzzwole/shiny.pal b/graphics/pokemon/gen_7/buzzwole/shiny.pal
similarity index 100%
rename from graphics/pokemon/buzzwole/shiny.pal
rename to graphics/pokemon/gen_7/buzzwole/shiny.pal
diff --git a/graphics/pokemon/celesteela/back.png b/graphics/pokemon/gen_7/celesteela/back.png
similarity index 100%
rename from graphics/pokemon/celesteela/back.png
rename to graphics/pokemon/gen_7/celesteela/back.png
diff --git a/graphics/pokemon/celesteela/footprint.png b/graphics/pokemon/gen_7/celesteela/footprint.png
similarity index 100%
rename from graphics/pokemon/celesteela/footprint.png
rename to graphics/pokemon/gen_7/celesteela/footprint.png
diff --git a/graphics/pokemon/celesteela/front.png b/graphics/pokemon/gen_7/celesteela/front.png
similarity index 100%
rename from graphics/pokemon/celesteela/front.png
rename to graphics/pokemon/gen_7/celesteela/front.png
diff --git a/graphics/pokemon/celesteela/icon.png b/graphics/pokemon/gen_7/celesteela/icon.png
similarity index 100%
rename from graphics/pokemon/celesteela/icon.png
rename to graphics/pokemon/gen_7/celesteela/icon.png
diff --git a/graphics/pokemon/celesteela/normal.pal b/graphics/pokemon/gen_7/celesteela/normal.pal
similarity index 100%
rename from graphics/pokemon/celesteela/normal.pal
rename to graphics/pokemon/gen_7/celesteela/normal.pal
diff --git a/graphics/pokemon/celesteela/shiny.pal b/graphics/pokemon/gen_7/celesteela/shiny.pal
similarity index 100%
rename from graphics/pokemon/celesteela/shiny.pal
rename to graphics/pokemon/gen_7/celesteela/shiny.pal
diff --git a/graphics/pokemon/charjabug/anim_front.png b/graphics/pokemon/gen_7/charjabug/anim_front.png
similarity index 100%
rename from graphics/pokemon/charjabug/anim_front.png
rename to graphics/pokemon/gen_7/charjabug/anim_front.png
diff --git a/graphics/pokemon/charjabug/back.png b/graphics/pokemon/gen_7/charjabug/back.png
similarity index 100%
rename from graphics/pokemon/charjabug/back.png
rename to graphics/pokemon/gen_7/charjabug/back.png
diff --git a/graphics/pokemon/spiritomb/footprint.png b/graphics/pokemon/gen_7/charjabug/footprint.png
similarity index 100%
rename from graphics/pokemon/spiritomb/footprint.png
rename to graphics/pokemon/gen_7/charjabug/footprint.png
diff --git a/graphics/pokemon/charjabug/icon.png b/graphics/pokemon/gen_7/charjabug/icon.png
similarity index 100%
rename from graphics/pokemon/charjabug/icon.png
rename to graphics/pokemon/gen_7/charjabug/icon.png
diff --git a/graphics/pokemon/charjabug/normal.pal b/graphics/pokemon/gen_7/charjabug/normal.pal
similarity index 100%
rename from graphics/pokemon/charjabug/normal.pal
rename to graphics/pokemon/gen_7/charjabug/normal.pal
diff --git a/graphics/pokemon/charjabug/shiny.pal b/graphics/pokemon/gen_7/charjabug/shiny.pal
similarity index 100%
rename from graphics/pokemon/charjabug/shiny.pal
rename to graphics/pokemon/gen_7/charjabug/shiny.pal
diff --git a/graphics/pokemon/comfey/back.png b/graphics/pokemon/gen_7/comfey/back.png
similarity index 100%
rename from graphics/pokemon/comfey/back.png
rename to graphics/pokemon/gen_7/comfey/back.png
diff --git a/graphics/pokemon/spoink/footprint.png b/graphics/pokemon/gen_7/comfey/footprint.png
similarity index 100%
rename from graphics/pokemon/spoink/footprint.png
rename to graphics/pokemon/gen_7/comfey/footprint.png
diff --git a/graphics/pokemon/comfey/front.png b/graphics/pokemon/gen_7/comfey/front.png
similarity index 100%
rename from graphics/pokemon/comfey/front.png
rename to graphics/pokemon/gen_7/comfey/front.png
diff --git a/graphics/pokemon/comfey/icon.png b/graphics/pokemon/gen_7/comfey/icon.png
similarity index 100%
rename from graphics/pokemon/comfey/icon.png
rename to graphics/pokemon/gen_7/comfey/icon.png
diff --git a/graphics/pokemon/comfey/normal.pal b/graphics/pokemon/gen_7/comfey/normal.pal
similarity index 100%
rename from graphics/pokemon/comfey/normal.pal
rename to graphics/pokemon/gen_7/comfey/normal.pal
diff --git a/graphics/pokemon/comfey/shiny.pal b/graphics/pokemon/gen_7/comfey/shiny.pal
similarity index 100%
rename from graphics/pokemon/comfey/shiny.pal
rename to graphics/pokemon/gen_7/comfey/shiny.pal
diff --git a/graphics/pokemon/cosmoem/back.png b/graphics/pokemon/gen_7/cosmoem/back.png
similarity index 100%
rename from graphics/pokemon/cosmoem/back.png
rename to graphics/pokemon/gen_7/cosmoem/back.png
diff --git a/graphics/pokemon/stakataka/footprint.png b/graphics/pokemon/gen_7/cosmoem/footprint.png
similarity index 100%
rename from graphics/pokemon/stakataka/footprint.png
rename to graphics/pokemon/gen_7/cosmoem/footprint.png
diff --git a/graphics/pokemon/cosmoem/front.png b/graphics/pokemon/gen_7/cosmoem/front.png
similarity index 100%
rename from graphics/pokemon/cosmoem/front.png
rename to graphics/pokemon/gen_7/cosmoem/front.png
diff --git a/graphics/pokemon/cosmoem/icon.png b/graphics/pokemon/gen_7/cosmoem/icon.png
similarity index 100%
rename from graphics/pokemon/cosmoem/icon.png
rename to graphics/pokemon/gen_7/cosmoem/icon.png
diff --git a/graphics/pokemon/cosmoem/normal.pal b/graphics/pokemon/gen_7/cosmoem/normal.pal
similarity index 100%
rename from graphics/pokemon/cosmoem/normal.pal
rename to graphics/pokemon/gen_7/cosmoem/normal.pal
diff --git a/graphics/pokemon/cosmoem/shiny.pal b/graphics/pokemon/gen_7/cosmoem/shiny.pal
similarity index 100%
rename from graphics/pokemon/cosmoem/shiny.pal
rename to graphics/pokemon/gen_7/cosmoem/shiny.pal
diff --git a/graphics/pokemon/cosmog/back.png b/graphics/pokemon/gen_7/cosmog/back.png
similarity index 100%
rename from graphics/pokemon/cosmog/back.png
rename to graphics/pokemon/gen_7/cosmog/back.png
diff --git a/graphics/pokemon/steelix/footprint.png b/graphics/pokemon/gen_7/cosmog/footprint.png
similarity index 100%
rename from graphics/pokemon/steelix/footprint.png
rename to graphics/pokemon/gen_7/cosmog/footprint.png
diff --git a/graphics/pokemon/cosmog/front.png b/graphics/pokemon/gen_7/cosmog/front.png
similarity index 100%
rename from graphics/pokemon/cosmog/front.png
rename to graphics/pokemon/gen_7/cosmog/front.png
diff --git a/graphics/pokemon/cosmog/icon.png b/graphics/pokemon/gen_7/cosmog/icon.png
similarity index 100%
rename from graphics/pokemon/cosmog/icon.png
rename to graphics/pokemon/gen_7/cosmog/icon.png
diff --git a/graphics/pokemon/cosmog/normal.pal b/graphics/pokemon/gen_7/cosmog/normal.pal
similarity index 100%
rename from graphics/pokemon/cosmog/normal.pal
rename to graphics/pokemon/gen_7/cosmog/normal.pal
diff --git a/graphics/pokemon/cosmog/shiny.pal b/graphics/pokemon/gen_7/cosmog/shiny.pal
similarity index 100%
rename from graphics/pokemon/cosmog/shiny.pal
rename to graphics/pokemon/gen_7/cosmog/shiny.pal
diff --git a/graphics/pokemon/crabominable/back.png b/graphics/pokemon/gen_7/crabominable/back.png
similarity index 100%
rename from graphics/pokemon/crabominable/back.png
rename to graphics/pokemon/gen_7/crabominable/back.png
diff --git a/graphics/pokemon/furfrou/footprint.png b/graphics/pokemon/gen_7/crabominable/footprint.png
similarity index 100%
rename from graphics/pokemon/furfrou/footprint.png
rename to graphics/pokemon/gen_7/crabominable/footprint.png
diff --git a/graphics/pokemon/crabominable/front.png b/graphics/pokemon/gen_7/crabominable/front.png
similarity index 100%
rename from graphics/pokemon/crabominable/front.png
rename to graphics/pokemon/gen_7/crabominable/front.png
diff --git a/graphics/pokemon/crabominable/icon.png b/graphics/pokemon/gen_7/crabominable/icon.png
similarity index 100%
rename from graphics/pokemon/crabominable/icon.png
rename to graphics/pokemon/gen_7/crabominable/icon.png
diff --git a/graphics/pokemon/crabominable/normal.pal b/graphics/pokemon/gen_7/crabominable/normal.pal
similarity index 100%
rename from graphics/pokemon/crabominable/normal.pal
rename to graphics/pokemon/gen_7/crabominable/normal.pal
diff --git a/graphics/pokemon/crabominable/shiny.pal b/graphics/pokemon/gen_7/crabominable/shiny.pal
similarity index 100%
rename from graphics/pokemon/crabominable/shiny.pal
rename to graphics/pokemon/gen_7/crabominable/shiny.pal
diff --git a/graphics/pokemon/crabrawler/back.png b/graphics/pokemon/gen_7/crabrawler/back.png
similarity index 100%
rename from graphics/pokemon/crabrawler/back.png
rename to graphics/pokemon/gen_7/crabrawler/back.png
diff --git a/graphics/pokemon/musharna/footprint.png b/graphics/pokemon/gen_7/crabrawler/footprint.png
similarity index 100%
rename from graphics/pokemon/musharna/footprint.png
rename to graphics/pokemon/gen_7/crabrawler/footprint.png
diff --git a/graphics/pokemon/crabrawler/front.png b/graphics/pokemon/gen_7/crabrawler/front.png
similarity index 100%
rename from graphics/pokemon/crabrawler/front.png
rename to graphics/pokemon/gen_7/crabrawler/front.png
diff --git a/graphics/pokemon/crabrawler/icon.png b/graphics/pokemon/gen_7/crabrawler/icon.png
similarity index 100%
rename from graphics/pokemon/crabrawler/icon.png
rename to graphics/pokemon/gen_7/crabrawler/icon.png
diff --git a/graphics/pokemon/crabrawler/normal.pal b/graphics/pokemon/gen_7/crabrawler/normal.pal
similarity index 100%
rename from graphics/pokemon/crabrawler/normal.pal
rename to graphics/pokemon/gen_7/crabrawler/normal.pal
diff --git a/graphics/pokemon/crabrawler/shiny.pal b/graphics/pokemon/gen_7/crabrawler/shiny.pal
similarity index 100%
rename from graphics/pokemon/crabrawler/shiny.pal
rename to graphics/pokemon/gen_7/crabrawler/shiny.pal
diff --git a/graphics/pokemon/cutiefly/anim_front.png b/graphics/pokemon/gen_7/cutiefly/anim_front.png
similarity index 100%
rename from graphics/pokemon/cutiefly/anim_front.png
rename to graphics/pokemon/gen_7/cutiefly/anim_front.png
diff --git a/graphics/pokemon/cutiefly/back.png b/graphics/pokemon/gen_7/cutiefly/back.png
similarity index 100%
rename from graphics/pokemon/cutiefly/back.png
rename to graphics/pokemon/gen_7/cutiefly/back.png
diff --git a/graphics/pokemon/poipole/footprint.png b/graphics/pokemon/gen_7/cutiefly/footprint.png
similarity index 100%
rename from graphics/pokemon/poipole/footprint.png
rename to graphics/pokemon/gen_7/cutiefly/footprint.png
diff --git a/graphics/pokemon/cutiefly/icon.png b/graphics/pokemon/gen_7/cutiefly/icon.png
similarity index 100%
rename from graphics/pokemon/cutiefly/icon.png
rename to graphics/pokemon/gen_7/cutiefly/icon.png
diff --git a/graphics/pokemon/cutiefly/normal.pal b/graphics/pokemon/gen_7/cutiefly/normal.pal
similarity index 100%
rename from graphics/pokemon/cutiefly/normal.pal
rename to graphics/pokemon/gen_7/cutiefly/normal.pal
diff --git a/graphics/pokemon/cutiefly/shiny.pal b/graphics/pokemon/gen_7/cutiefly/shiny.pal
similarity index 100%
rename from graphics/pokemon/cutiefly/shiny.pal
rename to graphics/pokemon/gen_7/cutiefly/shiny.pal
diff --git a/graphics/pokemon/dartrix/anim_front.png b/graphics/pokemon/gen_7/dartrix/anim_front.png
similarity index 100%
rename from graphics/pokemon/dartrix/anim_front.png
rename to graphics/pokemon/gen_7/dartrix/anim_front.png
diff --git a/graphics/pokemon/dartrix/back.png b/graphics/pokemon/gen_7/dartrix/back.png
similarity index 100%
rename from graphics/pokemon/dartrix/back.png
rename to graphics/pokemon/gen_7/dartrix/back.png
diff --git a/graphics/pokemon/dartrix/footprint.png b/graphics/pokemon/gen_7/dartrix/footprint.png
similarity index 100%
rename from graphics/pokemon/dartrix/footprint.png
rename to graphics/pokemon/gen_7/dartrix/footprint.png
diff --git a/graphics/pokemon/dartrix/icon.png b/graphics/pokemon/gen_7/dartrix/icon.png
similarity index 100%
rename from graphics/pokemon/dartrix/icon.png
rename to graphics/pokemon/gen_7/dartrix/icon.png
diff --git a/graphics/pokemon/dartrix/normal.pal b/graphics/pokemon/gen_7/dartrix/normal.pal
similarity index 100%
rename from graphics/pokemon/dartrix/normal.pal
rename to graphics/pokemon/gen_7/dartrix/normal.pal
diff --git a/graphics/pokemon/dartrix/shiny.pal b/graphics/pokemon/gen_7/dartrix/shiny.pal
similarity index 100%
rename from graphics/pokemon/dartrix/shiny.pal
rename to graphics/pokemon/gen_7/dartrix/shiny.pal
diff --git a/graphics/pokemon/decidueye/anim_front.png b/graphics/pokemon/gen_7/decidueye/anim_front.png
similarity index 100%
rename from graphics/pokemon/decidueye/anim_front.png
rename to graphics/pokemon/gen_7/decidueye/anim_front.png
diff --git a/graphics/pokemon/decidueye/back.png b/graphics/pokemon/gen_7/decidueye/back.png
similarity index 100%
rename from graphics/pokemon/decidueye/back.png
rename to graphics/pokemon/gen_7/decidueye/back.png
diff --git a/graphics/pokemon/decidueye/footprint.png b/graphics/pokemon/gen_7/decidueye/footprint.png
similarity index 100%
rename from graphics/pokemon/decidueye/footprint.png
rename to graphics/pokemon/gen_7/decidueye/footprint.png
diff --git a/graphics/pokemon/decidueye/hisuian/back.png b/graphics/pokemon/gen_7/decidueye/hisuian/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/decidueye/hisuian/back.png
rename to graphics/pokemon/gen_7/decidueye/hisuian/back.png
diff --git a/graphics/pokemon/decidueye/hisuian/front.png b/graphics/pokemon/gen_7/decidueye/hisuian/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/decidueye/hisuian/front.png
rename to graphics/pokemon/gen_7/decidueye/hisuian/front.png
diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/gen_7/decidueye/hisuian/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/decidueye/hisuian/icon.png
rename to graphics/pokemon/gen_7/decidueye/hisuian/icon.png
diff --git a/graphics/pokemon/decidueye/hisuian/normal.pal b/graphics/pokemon/gen_7/decidueye/hisuian/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/decidueye/hisuian/normal.pal
rename to graphics/pokemon/gen_7/decidueye/hisuian/normal.pal
diff --git a/graphics/pokemon/decidueye/hisuian/shiny.pal b/graphics/pokemon/gen_7/decidueye/hisuian/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/decidueye/hisuian/shiny.pal
rename to graphics/pokemon/gen_7/decidueye/hisuian/shiny.pal
diff --git a/graphics/pokemon/decidueye/icon.png b/graphics/pokemon/gen_7/decidueye/icon.png
similarity index 100%
rename from graphics/pokemon/decidueye/icon.png
rename to graphics/pokemon/gen_7/decidueye/icon.png
diff --git a/graphics/pokemon/decidueye/normal.pal b/graphics/pokemon/gen_7/decidueye/normal.pal
similarity index 100%
rename from graphics/pokemon/decidueye/normal.pal
rename to graphics/pokemon/gen_7/decidueye/normal.pal
diff --git a/graphics/pokemon/decidueye/shiny.pal b/graphics/pokemon/gen_7/decidueye/shiny.pal
similarity index 100%
rename from graphics/pokemon/decidueye/shiny.pal
rename to graphics/pokemon/gen_7/decidueye/shiny.pal
diff --git a/graphics/pokemon/dewpider/anim_front.png b/graphics/pokemon/gen_7/dewpider/anim_front.png
similarity index 100%
rename from graphics/pokemon/dewpider/anim_front.png
rename to graphics/pokemon/gen_7/dewpider/anim_front.png
diff --git a/graphics/pokemon/dewpider/back.png b/graphics/pokemon/gen_7/dewpider/back.png
similarity index 100%
rename from graphics/pokemon/dewpider/back.png
rename to graphics/pokemon/gen_7/dewpider/back.png
diff --git a/graphics/pokemon/polteageist/footprint.png b/graphics/pokemon/gen_7/dewpider/footprint.png
similarity index 100%
rename from graphics/pokemon/polteageist/footprint.png
rename to graphics/pokemon/gen_7/dewpider/footprint.png
diff --git a/graphics/pokemon/dewpider/icon.png b/graphics/pokemon/gen_7/dewpider/icon.png
similarity index 100%
rename from graphics/pokemon/dewpider/icon.png
rename to graphics/pokemon/gen_7/dewpider/icon.png
diff --git a/graphics/pokemon/dewpider/normal.pal b/graphics/pokemon/gen_7/dewpider/normal.pal
similarity index 100%
rename from graphics/pokemon/dewpider/normal.pal
rename to graphics/pokemon/gen_7/dewpider/normal.pal
diff --git a/graphics/pokemon/dewpider/shiny.pal b/graphics/pokemon/gen_7/dewpider/shiny.pal
similarity index 100%
rename from graphics/pokemon/dewpider/shiny.pal
rename to graphics/pokemon/gen_7/dewpider/shiny.pal
diff --git a/graphics/pokemon/dhelmise/back.png b/graphics/pokemon/gen_7/dhelmise/back.png
similarity index 100%
rename from graphics/pokemon/dhelmise/back.png
rename to graphics/pokemon/gen_7/dhelmise/back.png
diff --git a/graphics/pokemon/stunfisk/footprint.png b/graphics/pokemon/gen_7/dhelmise/footprint.png
similarity index 100%
rename from graphics/pokemon/stunfisk/footprint.png
rename to graphics/pokemon/gen_7/dhelmise/footprint.png
diff --git a/graphics/pokemon/dhelmise/front.png b/graphics/pokemon/gen_7/dhelmise/front.png
similarity index 100%
rename from graphics/pokemon/dhelmise/front.png
rename to graphics/pokemon/gen_7/dhelmise/front.png
diff --git a/graphics/pokemon/dhelmise/icon.png b/graphics/pokemon/gen_7/dhelmise/icon.png
similarity index 100%
rename from graphics/pokemon/dhelmise/icon.png
rename to graphics/pokemon/gen_7/dhelmise/icon.png
diff --git a/graphics/pokemon/dhelmise/normal.pal b/graphics/pokemon/gen_7/dhelmise/normal.pal
similarity index 100%
rename from graphics/pokemon/dhelmise/normal.pal
rename to graphics/pokemon/gen_7/dhelmise/normal.pal
diff --git a/graphics/pokemon/dhelmise/shiny.pal b/graphics/pokemon/gen_7/dhelmise/shiny.pal
similarity index 100%
rename from graphics/pokemon/dhelmise/shiny.pal
rename to graphics/pokemon/gen_7/dhelmise/shiny.pal
diff --git a/graphics/pokemon/drampa/anim_front.png b/graphics/pokemon/gen_7/drampa/anim_front.png
similarity index 100%
rename from graphics/pokemon/drampa/anim_front.png
rename to graphics/pokemon/gen_7/drampa/anim_front.png
diff --git a/graphics/pokemon/drampa/back.png b/graphics/pokemon/gen_7/drampa/back.png
similarity index 100%
rename from graphics/pokemon/drampa/back.png
rename to graphics/pokemon/gen_7/drampa/back.png
diff --git a/graphics/pokemon/sunkern/footprint.png b/graphics/pokemon/gen_7/drampa/footprint.png
similarity index 100%
rename from graphics/pokemon/sunkern/footprint.png
rename to graphics/pokemon/gen_7/drampa/footprint.png
diff --git a/graphics/pokemon/drampa/icon.png b/graphics/pokemon/gen_7/drampa/icon.png
similarity index 100%
rename from graphics/pokemon/drampa/icon.png
rename to graphics/pokemon/gen_7/drampa/icon.png
diff --git a/graphics/pokemon/drampa/normal.pal b/graphics/pokemon/gen_7/drampa/normal.pal
similarity index 100%
rename from graphics/pokemon/drampa/normal.pal
rename to graphics/pokemon/gen_7/drampa/normal.pal
diff --git a/graphics/pokemon/drampa/shiny.pal b/graphics/pokemon/gen_7/drampa/shiny.pal
similarity index 100%
rename from graphics/pokemon/drampa/shiny.pal
rename to graphics/pokemon/gen_7/drampa/shiny.pal
diff --git a/graphics/pokemon/fomantis/back.png b/graphics/pokemon/gen_7/fomantis/back.png
similarity index 100%
rename from graphics/pokemon/fomantis/back.png
rename to graphics/pokemon/gen_7/fomantis/back.png
diff --git a/graphics/pokemon/porygon_z/footprint.png b/graphics/pokemon/gen_7/fomantis/footprint.png
similarity index 100%
rename from graphics/pokemon/porygon_z/footprint.png
rename to graphics/pokemon/gen_7/fomantis/footprint.png
diff --git a/graphics/pokemon/fomantis/front.png b/graphics/pokemon/gen_7/fomantis/front.png
similarity index 100%
rename from graphics/pokemon/fomantis/front.png
rename to graphics/pokemon/gen_7/fomantis/front.png
diff --git a/graphics/pokemon/fomantis/icon.png b/graphics/pokemon/gen_7/fomantis/icon.png
similarity index 100%
rename from graphics/pokemon/fomantis/icon.png
rename to graphics/pokemon/gen_7/fomantis/icon.png
diff --git a/graphics/pokemon/fomantis/normal.pal b/graphics/pokemon/gen_7/fomantis/normal.pal
similarity index 100%
rename from graphics/pokemon/fomantis/normal.pal
rename to graphics/pokemon/gen_7/fomantis/normal.pal
diff --git a/graphics/pokemon/fomantis/shiny.pal b/graphics/pokemon/gen_7/fomantis/shiny.pal
similarity index 100%
rename from graphics/pokemon/fomantis/shiny.pal
rename to graphics/pokemon/gen_7/fomantis/shiny.pal
diff --git a/graphics/pokemon/golisopod/anim_front.png b/graphics/pokemon/gen_7/golisopod/anim_front.png
similarity index 100%
rename from graphics/pokemon/golisopod/anim_front.png
rename to graphics/pokemon/gen_7/golisopod/anim_front.png
diff --git a/graphics/pokemon/golisopod/back.png b/graphics/pokemon/gen_7/golisopod/back.png
similarity index 100%
rename from graphics/pokemon/golisopod/back.png
rename to graphics/pokemon/gen_7/golisopod/back.png
diff --git a/graphics/pokemon/golisopod/footprint.png b/graphics/pokemon/gen_7/golisopod/footprint.png
similarity index 100%
rename from graphics/pokemon/golisopod/footprint.png
rename to graphics/pokemon/gen_7/golisopod/footprint.png
diff --git a/graphics/pokemon/golisopod/icon.png b/graphics/pokemon/gen_7/golisopod/icon.png
similarity index 100%
rename from graphics/pokemon/golisopod/icon.png
rename to graphics/pokemon/gen_7/golisopod/icon.png
diff --git a/graphics/pokemon/golisopod/normal.pal b/graphics/pokemon/gen_7/golisopod/normal.pal
similarity index 100%
rename from graphics/pokemon/golisopod/normal.pal
rename to graphics/pokemon/gen_7/golisopod/normal.pal
diff --git a/graphics/pokemon/golisopod/shiny.pal b/graphics/pokemon/gen_7/golisopod/shiny.pal
similarity index 100%
rename from graphics/pokemon/golisopod/shiny.pal
rename to graphics/pokemon/gen_7/golisopod/shiny.pal
diff --git a/graphics/pokemon/grubbin/anim_front.png b/graphics/pokemon/gen_7/grubbin/anim_front.png
similarity index 100%
rename from graphics/pokemon/grubbin/anim_front.png
rename to graphics/pokemon/gen_7/grubbin/anim_front.png
diff --git a/graphics/pokemon/grubbin/back.png b/graphics/pokemon/gen_7/grubbin/back.png
similarity index 100%
rename from graphics/pokemon/grubbin/back.png
rename to graphics/pokemon/gen_7/grubbin/back.png
diff --git a/graphics/pokemon/sewaddle/footprint.png b/graphics/pokemon/gen_7/grubbin/footprint.png
similarity index 100%
rename from graphics/pokemon/sewaddle/footprint.png
rename to graphics/pokemon/gen_7/grubbin/footprint.png
diff --git a/graphics/pokemon/grubbin/icon.png b/graphics/pokemon/gen_7/grubbin/icon.png
similarity index 100%
rename from graphics/pokemon/grubbin/icon.png
rename to graphics/pokemon/gen_7/grubbin/icon.png
diff --git a/graphics/pokemon/grubbin/normal.pal b/graphics/pokemon/gen_7/grubbin/normal.pal
similarity index 100%
rename from graphics/pokemon/grubbin/normal.pal
rename to graphics/pokemon/gen_7/grubbin/normal.pal
diff --git a/graphics/pokemon/grubbin/shiny.pal b/graphics/pokemon/gen_7/grubbin/shiny.pal
similarity index 100%
rename from graphics/pokemon/grubbin/shiny.pal
rename to graphics/pokemon/gen_7/grubbin/shiny.pal
diff --git a/graphics/pokemon/gumshoos/back.png b/graphics/pokemon/gen_7/gumshoos/back.png
similarity index 100%
rename from graphics/pokemon/gumshoos/back.png
rename to graphics/pokemon/gen_7/gumshoos/back.png
diff --git a/graphics/pokemon/raticate/footprint.png b/graphics/pokemon/gen_7/gumshoos/footprint.png
similarity index 100%
rename from graphics/pokemon/raticate/footprint.png
rename to graphics/pokemon/gen_7/gumshoos/footprint.png
diff --git a/graphics/pokemon/gumshoos/front.png b/graphics/pokemon/gen_7/gumshoos/front.png
similarity index 100%
rename from graphics/pokemon/gumshoos/front.png
rename to graphics/pokemon/gen_7/gumshoos/front.png
diff --git a/graphics/pokemon/gumshoos/icon.png b/graphics/pokemon/gen_7/gumshoos/icon.png
similarity index 100%
rename from graphics/pokemon/gumshoos/icon.png
rename to graphics/pokemon/gen_7/gumshoos/icon.png
diff --git a/graphics/pokemon/gumshoos/normal.pal b/graphics/pokemon/gen_7/gumshoos/normal.pal
similarity index 100%
rename from graphics/pokemon/gumshoos/normal.pal
rename to graphics/pokemon/gen_7/gumshoos/normal.pal
diff --git a/graphics/pokemon/gumshoos/shiny.pal b/graphics/pokemon/gen_7/gumshoos/shiny.pal
similarity index 100%
rename from graphics/pokemon/gumshoos/shiny.pal
rename to graphics/pokemon/gen_7/gumshoos/shiny.pal
diff --git a/graphics/pokemon/guzzlord/back.png b/graphics/pokemon/gen_7/guzzlord/back.png
similarity index 100%
rename from graphics/pokemon/guzzlord/back.png
rename to graphics/pokemon/gen_7/guzzlord/back.png
diff --git a/graphics/pokemon/guzzlord/footprint.png b/graphics/pokemon/gen_7/guzzlord/footprint.png
similarity index 100%
rename from graphics/pokemon/guzzlord/footprint.png
rename to graphics/pokemon/gen_7/guzzlord/footprint.png
diff --git a/graphics/pokemon/guzzlord/front.png b/graphics/pokemon/gen_7/guzzlord/front.png
similarity index 100%
rename from graphics/pokemon/guzzlord/front.png
rename to graphics/pokemon/gen_7/guzzlord/front.png
diff --git a/graphics/pokemon/guzzlord/icon.png b/graphics/pokemon/gen_7/guzzlord/icon.png
similarity index 100%
rename from graphics/pokemon/guzzlord/icon.png
rename to graphics/pokemon/gen_7/guzzlord/icon.png
diff --git a/graphics/pokemon/guzzlord/normal.pal b/graphics/pokemon/gen_7/guzzlord/normal.pal
similarity index 100%
rename from graphics/pokemon/guzzlord/normal.pal
rename to graphics/pokemon/gen_7/guzzlord/normal.pal
diff --git a/graphics/pokemon/guzzlord/shiny.pal b/graphics/pokemon/gen_7/guzzlord/shiny.pal
similarity index 100%
rename from graphics/pokemon/guzzlord/shiny.pal
rename to graphics/pokemon/gen_7/guzzlord/shiny.pal
diff --git a/graphics/pokemon/hakamo_o/anim_front.png b/graphics/pokemon/gen_7/hakamo_o/anim_front.png
similarity index 100%
rename from graphics/pokemon/hakamo_o/anim_front.png
rename to graphics/pokemon/gen_7/hakamo_o/anim_front.png
diff --git a/graphics/pokemon/hakamo_o/back.png b/graphics/pokemon/gen_7/hakamo_o/back.png
similarity index 100%
rename from graphics/pokemon/hakamo_o/back.png
rename to graphics/pokemon/gen_7/hakamo_o/back.png
diff --git a/graphics/pokemon/hakamo_o/footprint.png b/graphics/pokemon/gen_7/hakamo_o/footprint.png
similarity index 100%
rename from graphics/pokemon/hakamo_o/footprint.png
rename to graphics/pokemon/gen_7/hakamo_o/footprint.png
diff --git a/graphics/pokemon/hakamo_o/icon.png b/graphics/pokemon/gen_7/hakamo_o/icon.png
similarity index 100%
rename from graphics/pokemon/hakamo_o/icon.png
rename to graphics/pokemon/gen_7/hakamo_o/icon.png
diff --git a/graphics/pokemon/hakamo_o/normal.pal b/graphics/pokemon/gen_7/hakamo_o/normal.pal
similarity index 100%
rename from graphics/pokemon/hakamo_o/normal.pal
rename to graphics/pokemon/gen_7/hakamo_o/normal.pal
diff --git a/graphics/pokemon/hakamo_o/shiny.pal b/graphics/pokemon/gen_7/hakamo_o/shiny.pal
similarity index 100%
rename from graphics/pokemon/hakamo_o/shiny.pal
rename to graphics/pokemon/gen_7/hakamo_o/shiny.pal
diff --git a/graphics/pokemon/incineroar/back.png b/graphics/pokemon/gen_7/incineroar/back.png
similarity index 100%
rename from graphics/pokemon/incineroar/back.png
rename to graphics/pokemon/gen_7/incineroar/back.png
diff --git a/graphics/pokemon/vaporeon/footprint.png b/graphics/pokemon/gen_7/incineroar/footprint.png
similarity index 100%
rename from graphics/pokemon/vaporeon/footprint.png
rename to graphics/pokemon/gen_7/incineroar/footprint.png
diff --git a/graphics/pokemon/incineroar/front.png b/graphics/pokemon/gen_7/incineroar/front.png
similarity index 100%
rename from graphics/pokemon/incineroar/front.png
rename to graphics/pokemon/gen_7/incineroar/front.png
diff --git a/graphics/pokemon/incineroar/icon.png b/graphics/pokemon/gen_7/incineroar/icon.png
similarity index 100%
rename from graphics/pokemon/incineroar/icon.png
rename to graphics/pokemon/gen_7/incineroar/icon.png
diff --git a/graphics/pokemon/incineroar/normal.pal b/graphics/pokemon/gen_7/incineroar/normal.pal
similarity index 100%
rename from graphics/pokemon/incineroar/normal.pal
rename to graphics/pokemon/gen_7/incineroar/normal.pal
diff --git a/graphics/pokemon/incineroar/shiny.pal b/graphics/pokemon/gen_7/incineroar/shiny.pal
similarity index 100%
rename from graphics/pokemon/incineroar/shiny.pal
rename to graphics/pokemon/gen_7/incineroar/shiny.pal
diff --git a/graphics/pokemon/jangmo_o/anim_front.png b/graphics/pokemon/gen_7/jangmo_o/anim_front.png
similarity index 100%
rename from graphics/pokemon/jangmo_o/anim_front.png
rename to graphics/pokemon/gen_7/jangmo_o/anim_front.png
diff --git a/graphics/pokemon/jangmo_o/back.png b/graphics/pokemon/gen_7/jangmo_o/back.png
similarity index 100%
rename from graphics/pokemon/jangmo_o/back.png
rename to graphics/pokemon/gen_7/jangmo_o/back.png
diff --git a/graphics/pokemon/jangmo_o/footprint.png b/graphics/pokemon/gen_7/jangmo_o/footprint.png
similarity index 100%
rename from graphics/pokemon/jangmo_o/footprint.png
rename to graphics/pokemon/gen_7/jangmo_o/footprint.png
diff --git a/graphics/pokemon/jangmo_o/icon.png b/graphics/pokemon/gen_7/jangmo_o/icon.png
similarity index 100%
rename from graphics/pokemon/jangmo_o/icon.png
rename to graphics/pokemon/gen_7/jangmo_o/icon.png
diff --git a/graphics/pokemon/jangmo_o/normal.pal b/graphics/pokemon/gen_7/jangmo_o/normal.pal
similarity index 100%
rename from graphics/pokemon/jangmo_o/normal.pal
rename to graphics/pokemon/gen_7/jangmo_o/normal.pal
diff --git a/graphics/pokemon/jangmo_o/shiny.pal b/graphics/pokemon/gen_7/jangmo_o/shiny.pal
similarity index 100%
rename from graphics/pokemon/jangmo_o/shiny.pal
rename to graphics/pokemon/gen_7/jangmo_o/shiny.pal
diff --git a/graphics/pokemon/kartana/back.png b/graphics/pokemon/gen_7/kartana/back.png
similarity index 100%
rename from graphics/pokemon/kartana/back.png
rename to graphics/pokemon/gen_7/kartana/back.png
diff --git a/graphics/pokemon/swadloon/footprint.png b/graphics/pokemon/gen_7/kartana/footprint.png
similarity index 100%
rename from graphics/pokemon/swadloon/footprint.png
rename to graphics/pokemon/gen_7/kartana/footprint.png
diff --git a/graphics/pokemon/kartana/front.png b/graphics/pokemon/gen_7/kartana/front.png
similarity index 100%
rename from graphics/pokemon/kartana/front.png
rename to graphics/pokemon/gen_7/kartana/front.png
diff --git a/graphics/pokemon/kartana/icon.png b/graphics/pokemon/gen_7/kartana/icon.png
similarity index 100%
rename from graphics/pokemon/kartana/icon.png
rename to graphics/pokemon/gen_7/kartana/icon.png
diff --git a/graphics/pokemon/kartana/normal.pal b/graphics/pokemon/gen_7/kartana/normal.pal
similarity index 100%
rename from graphics/pokemon/kartana/normal.pal
rename to graphics/pokemon/gen_7/kartana/normal.pal
diff --git a/graphics/pokemon/kartana/shiny.pal b/graphics/pokemon/gen_7/kartana/shiny.pal
similarity index 100%
rename from graphics/pokemon/kartana/shiny.pal
rename to graphics/pokemon/gen_7/kartana/shiny.pal
diff --git a/graphics/pokemon/komala/back.png b/graphics/pokemon/gen_7/komala/back.png
similarity index 100%
rename from graphics/pokemon/komala/back.png
rename to graphics/pokemon/gen_7/komala/back.png
diff --git a/graphics/pokemon/komala/footprint.png b/graphics/pokemon/gen_7/komala/footprint.png
similarity index 100%
rename from graphics/pokemon/komala/footprint.png
rename to graphics/pokemon/gen_7/komala/footprint.png
diff --git a/graphics/pokemon/komala/front.png b/graphics/pokemon/gen_7/komala/front.png
similarity index 100%
rename from graphics/pokemon/komala/front.png
rename to graphics/pokemon/gen_7/komala/front.png
diff --git a/graphics/pokemon/komala/icon.png b/graphics/pokemon/gen_7/komala/icon.png
similarity index 100%
rename from graphics/pokemon/komala/icon.png
rename to graphics/pokemon/gen_7/komala/icon.png
diff --git a/graphics/pokemon/komala/normal.pal b/graphics/pokemon/gen_7/komala/normal.pal
similarity index 100%
rename from graphics/pokemon/komala/normal.pal
rename to graphics/pokemon/gen_7/komala/normal.pal
diff --git a/graphics/pokemon/komala/shiny.pal b/graphics/pokemon/gen_7/komala/shiny.pal
similarity index 100%
rename from graphics/pokemon/komala/shiny.pal
rename to graphics/pokemon/gen_7/komala/shiny.pal
diff --git a/graphics/pokemon/kommo_o/anim_front.png b/graphics/pokemon/gen_7/kommo_o/anim_front.png
similarity index 100%
rename from graphics/pokemon/kommo_o/anim_front.png
rename to graphics/pokemon/gen_7/kommo_o/anim_front.png
diff --git a/graphics/pokemon/kommo_o/back.png b/graphics/pokemon/gen_7/kommo_o/back.png
similarity index 100%
rename from graphics/pokemon/kommo_o/back.png
rename to graphics/pokemon/gen_7/kommo_o/back.png
diff --git a/graphics/pokemon/kommo_o/footprint.png b/graphics/pokemon/gen_7/kommo_o/footprint.png
similarity index 100%
rename from graphics/pokemon/kommo_o/footprint.png
rename to graphics/pokemon/gen_7/kommo_o/footprint.png
diff --git a/graphics/pokemon/kommo_o/icon.png b/graphics/pokemon/gen_7/kommo_o/icon.png
similarity index 100%
rename from graphics/pokemon/kommo_o/icon.png
rename to graphics/pokemon/gen_7/kommo_o/icon.png
diff --git a/graphics/pokemon/kommo_o/normal.pal b/graphics/pokemon/gen_7/kommo_o/normal.pal
similarity index 100%
rename from graphics/pokemon/kommo_o/normal.pal
rename to graphics/pokemon/gen_7/kommo_o/normal.pal
diff --git a/graphics/pokemon/kommo_o/shiny.pal b/graphics/pokemon/gen_7/kommo_o/shiny.pal
similarity index 100%
rename from graphics/pokemon/kommo_o/shiny.pal
rename to graphics/pokemon/gen_7/kommo_o/shiny.pal
diff --git a/graphics/pokemon/litten/back.png b/graphics/pokemon/gen_7/litten/back.png
similarity index 100%
rename from graphics/pokemon/litten/back.png
rename to graphics/pokemon/gen_7/litten/back.png
diff --git a/graphics/pokemon/appletun/footprint.png b/graphics/pokemon/gen_7/litten/footprint.png
similarity index 100%
rename from graphics/pokemon/appletun/footprint.png
rename to graphics/pokemon/gen_7/litten/footprint.png
diff --git a/graphics/pokemon/litten/front.png b/graphics/pokemon/gen_7/litten/front.png
similarity index 100%
rename from graphics/pokemon/litten/front.png
rename to graphics/pokemon/gen_7/litten/front.png
diff --git a/graphics/pokemon/litten/icon.png b/graphics/pokemon/gen_7/litten/icon.png
similarity index 100%
rename from graphics/pokemon/litten/icon.png
rename to graphics/pokemon/gen_7/litten/icon.png
diff --git a/graphics/pokemon/litten/normal.pal b/graphics/pokemon/gen_7/litten/normal.pal
similarity index 100%
rename from graphics/pokemon/litten/normal.pal
rename to graphics/pokemon/gen_7/litten/normal.pal
diff --git a/graphics/pokemon/litten/shiny.pal b/graphics/pokemon/gen_7/litten/shiny.pal
similarity index 100%
rename from graphics/pokemon/litten/shiny.pal
rename to graphics/pokemon/gen_7/litten/shiny.pal
diff --git a/graphics/pokemon/lunala/back.png b/graphics/pokemon/gen_7/lunala/back.png
similarity index 100%
rename from graphics/pokemon/lunala/back.png
rename to graphics/pokemon/gen_7/lunala/back.png
diff --git a/graphics/pokemon/swalot/footprint.png b/graphics/pokemon/gen_7/lunala/footprint.png
similarity index 100%
rename from graphics/pokemon/swalot/footprint.png
rename to graphics/pokemon/gen_7/lunala/footprint.png
diff --git a/graphics/pokemon/lunala/front.png b/graphics/pokemon/gen_7/lunala/front.png
similarity index 100%
rename from graphics/pokemon/lunala/front.png
rename to graphics/pokemon/gen_7/lunala/front.png
diff --git a/graphics/pokemon/lunala/icon.png b/graphics/pokemon/gen_7/lunala/icon.png
similarity index 100%
rename from graphics/pokemon/lunala/icon.png
rename to graphics/pokemon/gen_7/lunala/icon.png
diff --git a/graphics/pokemon/lunala/normal.pal b/graphics/pokemon/gen_7/lunala/normal.pal
similarity index 100%
rename from graphics/pokemon/lunala/normal.pal
rename to graphics/pokemon/gen_7/lunala/normal.pal
diff --git a/graphics/pokemon/lunala/shiny.pal b/graphics/pokemon/gen_7/lunala/shiny.pal
similarity index 100%
rename from graphics/pokemon/lunala/shiny.pal
rename to graphics/pokemon/gen_7/lunala/shiny.pal
diff --git a/graphics/pokemon/lurantis/back.png b/graphics/pokemon/gen_7/lurantis/back.png
similarity index 100%
rename from graphics/pokemon/lurantis/back.png
rename to graphics/pokemon/gen_7/lurantis/back.png
diff --git a/graphics/pokemon/shelmet/footprint.png b/graphics/pokemon/gen_7/lurantis/footprint.png
similarity index 100%
rename from graphics/pokemon/shelmet/footprint.png
rename to graphics/pokemon/gen_7/lurantis/footprint.png
diff --git a/graphics/pokemon/lurantis/front.png b/graphics/pokemon/gen_7/lurantis/front.png
similarity index 100%
rename from graphics/pokemon/lurantis/front.png
rename to graphics/pokemon/gen_7/lurantis/front.png
diff --git a/graphics/pokemon/lurantis/icon.png b/graphics/pokemon/gen_7/lurantis/icon.png
similarity index 100%
rename from graphics/pokemon/lurantis/icon.png
rename to graphics/pokemon/gen_7/lurantis/icon.png
diff --git a/graphics/pokemon/lurantis/normal.pal b/graphics/pokemon/gen_7/lurantis/normal.pal
similarity index 100%
rename from graphics/pokemon/lurantis/normal.pal
rename to graphics/pokemon/gen_7/lurantis/normal.pal
diff --git a/graphics/pokemon/lurantis/shiny.pal b/graphics/pokemon/gen_7/lurantis/shiny.pal
similarity index 100%
rename from graphics/pokemon/lurantis/shiny.pal
rename to graphics/pokemon/gen_7/lurantis/shiny.pal
diff --git a/graphics/pokemon/lycanroc/anim_front.png b/graphics/pokemon/gen_7/lycanroc/anim_front.png
similarity index 100%
rename from graphics/pokemon/lycanroc/anim_front.png
rename to graphics/pokemon/gen_7/lycanroc/anim_front.png
diff --git a/graphics/pokemon/lycanroc/back.png b/graphics/pokemon/gen_7/lycanroc/back.png
similarity index 100%
rename from graphics/pokemon/lycanroc/back.png
rename to graphics/pokemon/gen_7/lycanroc/back.png
diff --git a/graphics/pokemon/lycanroc/dusk/anim_front.png b/graphics/pokemon/gen_7/lycanroc/dusk/anim_front.png
similarity index 100%
rename from graphics/pokemon/lycanroc/dusk/anim_front.png
rename to graphics/pokemon/gen_7/lycanroc/dusk/anim_front.png
diff --git a/graphics/pokemon/lycanroc/dusk/back.png b/graphics/pokemon/gen_7/lycanroc/dusk/back.png
similarity index 100%
rename from graphics/pokemon/lycanroc/dusk/back.png
rename to graphics/pokemon/gen_7/lycanroc/dusk/back.png
diff --git a/graphics/pokemon/lycanroc/dusk/icon.png b/graphics/pokemon/gen_7/lycanroc/dusk/icon.png
similarity index 100%
rename from graphics/pokemon/lycanroc/dusk/icon.png
rename to graphics/pokemon/gen_7/lycanroc/dusk/icon.png
diff --git a/graphics/pokemon/lycanroc/dusk/normal.pal b/graphics/pokemon/gen_7/lycanroc/dusk/normal.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/dusk/normal.pal
rename to graphics/pokemon/gen_7/lycanroc/dusk/normal.pal
diff --git a/graphics/pokemon/lycanroc/dusk/shiny.pal b/graphics/pokemon/gen_7/lycanroc/dusk/shiny.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/dusk/shiny.pal
rename to graphics/pokemon/gen_7/lycanroc/dusk/shiny.pal
diff --git a/graphics/pokemon/lycanroc/footprint.png b/graphics/pokemon/gen_7/lycanroc/footprint.png
similarity index 100%
rename from graphics/pokemon/lycanroc/footprint.png
rename to graphics/pokemon/gen_7/lycanroc/footprint.png
diff --git a/graphics/pokemon/lycanroc/icon.png b/graphics/pokemon/gen_7/lycanroc/icon.png
similarity index 100%
rename from graphics/pokemon/lycanroc/icon.png
rename to graphics/pokemon/gen_7/lycanroc/icon.png
diff --git a/graphics/pokemon/lycanroc/midnight/anim_front.png b/graphics/pokemon/gen_7/lycanroc/midnight/anim_front.png
similarity index 100%
rename from graphics/pokemon/lycanroc/midnight/anim_front.png
rename to graphics/pokemon/gen_7/lycanroc/midnight/anim_front.png
diff --git a/graphics/pokemon/lycanroc/midnight/back.png b/graphics/pokemon/gen_7/lycanroc/midnight/back.png
similarity index 100%
rename from graphics/pokemon/lycanroc/midnight/back.png
rename to graphics/pokemon/gen_7/lycanroc/midnight/back.png
diff --git a/graphics/pokemon/lycanroc/midnight/icon.png b/graphics/pokemon/gen_7/lycanroc/midnight/icon.png
similarity index 100%
rename from graphics/pokemon/lycanroc/midnight/icon.png
rename to graphics/pokemon/gen_7/lycanroc/midnight/icon.png
diff --git a/graphics/pokemon/lycanroc/midnight/normal.pal b/graphics/pokemon/gen_7/lycanroc/midnight/normal.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/midnight/normal.pal
rename to graphics/pokemon/gen_7/lycanroc/midnight/normal.pal
diff --git a/graphics/pokemon/lycanroc/midnight/shiny.pal b/graphics/pokemon/gen_7/lycanroc/midnight/shiny.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/midnight/shiny.pal
rename to graphics/pokemon/gen_7/lycanroc/midnight/shiny.pal
diff --git a/graphics/pokemon/lycanroc/normal.pal b/graphics/pokemon/gen_7/lycanroc/normal.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/normal.pal
rename to graphics/pokemon/gen_7/lycanroc/normal.pal
diff --git a/graphics/pokemon/lycanroc/shiny.pal b/graphics/pokemon/gen_7/lycanroc/shiny.pal
similarity index 100%
rename from graphics/pokemon/lycanroc/shiny.pal
rename to graphics/pokemon/gen_7/lycanroc/shiny.pal
diff --git a/graphics/pokemon/magearna/back.png b/graphics/pokemon/gen_7/magearna/back.png
similarity index 100%
rename from graphics/pokemon/magearna/back.png
rename to graphics/pokemon/gen_7/magearna/back.png
diff --git a/graphics/pokemon/slurpuff/footprint.png b/graphics/pokemon/gen_7/magearna/footprint.png
similarity index 100%
rename from graphics/pokemon/slurpuff/footprint.png
rename to graphics/pokemon/gen_7/magearna/footprint.png
diff --git a/graphics/pokemon/magearna/front.png b/graphics/pokemon/gen_7/magearna/front.png
similarity index 100%
rename from graphics/pokemon/magearna/front.png
rename to graphics/pokemon/gen_7/magearna/front.png
diff --git a/graphics/pokemon/magearna/icon.png b/graphics/pokemon/gen_7/magearna/icon.png
similarity index 100%
rename from graphics/pokemon/magearna/icon.png
rename to graphics/pokemon/gen_7/magearna/icon.png
diff --git a/graphics/pokemon/magearna/normal.pal b/graphics/pokemon/gen_7/magearna/normal.pal
similarity index 100%
rename from graphics/pokemon/magearna/normal.pal
rename to graphics/pokemon/gen_7/magearna/normal.pal
diff --git a/graphics/pokemon/magearna/original_color/back.png b/graphics/pokemon/gen_7/magearna/original_color/back.png
similarity index 100%
rename from graphics/pokemon/magearna/original_color/back.png
rename to graphics/pokemon/gen_7/magearna/original_color/back.png
diff --git a/graphics/pokemon/magearna/original_color/front.png b/graphics/pokemon/gen_7/magearna/original_color/front.png
similarity index 100%
rename from graphics/pokemon/magearna/original_color/front.png
rename to graphics/pokemon/gen_7/magearna/original_color/front.png
diff --git a/graphics/pokemon/magearna/original_color/icon.png b/graphics/pokemon/gen_7/magearna/original_color/icon.png
similarity index 100%
rename from graphics/pokemon/magearna/original_color/icon.png
rename to graphics/pokemon/gen_7/magearna/original_color/icon.png
diff --git a/graphics/pokemon/magearna/original_color/normal.pal b/graphics/pokemon/gen_7/magearna/original_color/normal.pal
similarity index 100%
rename from graphics/pokemon/magearna/original_color/normal.pal
rename to graphics/pokemon/gen_7/magearna/original_color/normal.pal
diff --git a/graphics/pokemon/magearna/original_color/shiny.pal b/graphics/pokemon/gen_7/magearna/original_color/shiny.pal
similarity index 100%
rename from graphics/pokemon/magearna/original_color/shiny.pal
rename to graphics/pokemon/gen_7/magearna/original_color/shiny.pal
diff --git a/graphics/pokemon/magearna/shiny.pal b/graphics/pokemon/gen_7/magearna/shiny.pal
similarity index 100%
rename from graphics/pokemon/magearna/shiny.pal
rename to graphics/pokemon/gen_7/magearna/shiny.pal
diff --git a/graphics/pokemon/mareanie/back.png b/graphics/pokemon/gen_7/mareanie/back.png
similarity index 100%
rename from graphics/pokemon/mareanie/back.png
rename to graphics/pokemon/gen_7/mareanie/back.png
diff --git a/graphics/pokemon/swirlix/footprint.png b/graphics/pokemon/gen_7/mareanie/footprint.png
similarity index 100%
rename from graphics/pokemon/swirlix/footprint.png
rename to graphics/pokemon/gen_7/mareanie/footprint.png
diff --git a/graphics/pokemon/mareanie/front.png b/graphics/pokemon/gen_7/mareanie/front.png
similarity index 100%
rename from graphics/pokemon/mareanie/front.png
rename to graphics/pokemon/gen_7/mareanie/front.png
diff --git a/graphics/pokemon/mareanie/icon.png b/graphics/pokemon/gen_7/mareanie/icon.png
similarity index 100%
rename from graphics/pokemon/mareanie/icon.png
rename to graphics/pokemon/gen_7/mareanie/icon.png
diff --git a/graphics/pokemon/mareanie/normal.pal b/graphics/pokemon/gen_7/mareanie/normal.pal
similarity index 100%
rename from graphics/pokemon/mareanie/normal.pal
rename to graphics/pokemon/gen_7/mareanie/normal.pal
diff --git a/graphics/pokemon/mareanie/shiny.pal b/graphics/pokemon/gen_7/mareanie/shiny.pal
similarity index 100%
rename from graphics/pokemon/mareanie/shiny.pal
rename to graphics/pokemon/gen_7/mareanie/shiny.pal
diff --git a/graphics/pokemon/marshadow/anim_front.png b/graphics/pokemon/gen_7/marshadow/anim_front.png
similarity index 100%
rename from graphics/pokemon/marshadow/anim_front.png
rename to graphics/pokemon/gen_7/marshadow/anim_front.png
diff --git a/graphics/pokemon/marshadow/back.png b/graphics/pokemon/gen_7/marshadow/back.png
similarity index 100%
rename from graphics/pokemon/marshadow/back.png
rename to graphics/pokemon/gen_7/marshadow/back.png
diff --git a/graphics/pokemon/marshadow/footprint.png b/graphics/pokemon/gen_7/marshadow/footprint.png
similarity index 100%
rename from graphics/pokemon/marshadow/footprint.png
rename to graphics/pokemon/gen_7/marshadow/footprint.png
diff --git a/graphics/pokemon/marshadow/icon.png b/graphics/pokemon/gen_7/marshadow/icon.png
similarity index 100%
rename from graphics/pokemon/marshadow/icon.png
rename to graphics/pokemon/gen_7/marshadow/icon.png
diff --git a/graphics/pokemon/marshadow/normal.pal b/graphics/pokemon/gen_7/marshadow/normal.pal
similarity index 100%
rename from graphics/pokemon/marshadow/normal.pal
rename to graphics/pokemon/gen_7/marshadow/normal.pal
diff --git a/graphics/pokemon/marshadow/shiny.pal b/graphics/pokemon/gen_7/marshadow/shiny.pal
similarity index 100%
rename from graphics/pokemon/marshadow/shiny.pal
rename to graphics/pokemon/gen_7/marshadow/shiny.pal
diff --git a/graphics/pokemon/melmetal/back.png b/graphics/pokemon/gen_7/melmetal/back.png
similarity index 100%
rename from graphics/pokemon/melmetal/back.png
rename to graphics/pokemon/gen_7/melmetal/back.png
diff --git a/graphics/pokemon/melmetal/footprint.png b/graphics/pokemon/gen_7/melmetal/footprint.png
similarity index 100%
rename from graphics/pokemon/melmetal/footprint.png
rename to graphics/pokemon/gen_7/melmetal/footprint.png
diff --git a/graphics/pokemon/melmetal/front.png b/graphics/pokemon/gen_7/melmetal/front.png
similarity index 100%
rename from graphics/pokemon/melmetal/front.png
rename to graphics/pokemon/gen_7/melmetal/front.png
diff --git a/graphics/pokemon/melmetal/gigantamax/back.png b/graphics/pokemon/gen_7/melmetal/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/melmetal/gigantamax/back.png
rename to graphics/pokemon/gen_7/melmetal/gigantamax/back.png
diff --git a/graphics/pokemon/melmetal/gigantamax/front.png b/graphics/pokemon/gen_7/melmetal/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/melmetal/gigantamax/front.png
rename to graphics/pokemon/gen_7/melmetal/gigantamax/front.png
diff --git a/graphics/pokemon/melmetal/gigantamax/icon.png b/graphics/pokemon/gen_7/melmetal/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/melmetal/gigantamax/icon.png
rename to graphics/pokemon/gen_7/melmetal/gigantamax/icon.png
diff --git a/graphics/pokemon/melmetal/gigantamax/normal.pal b/graphics/pokemon/gen_7/melmetal/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/melmetal/gigantamax/normal.pal
rename to graphics/pokemon/gen_7/melmetal/gigantamax/normal.pal
diff --git a/graphics/pokemon/melmetal/gigantamax/shiny.pal b/graphics/pokemon/gen_7/melmetal/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/melmetal/gigantamax/shiny.pal
rename to graphics/pokemon/gen_7/melmetal/gigantamax/shiny.pal
diff --git a/graphics/pokemon/melmetal/icon.png b/graphics/pokemon/gen_7/melmetal/icon.png
similarity index 100%
rename from graphics/pokemon/melmetal/icon.png
rename to graphics/pokemon/gen_7/melmetal/icon.png
diff --git a/graphics/pokemon/melmetal/normal.pal b/graphics/pokemon/gen_7/melmetal/normal.pal
similarity index 100%
rename from graphics/pokemon/melmetal/normal.pal
rename to graphics/pokemon/gen_7/melmetal/normal.pal
diff --git a/graphics/pokemon/melmetal/shiny.pal b/graphics/pokemon/gen_7/melmetal/shiny.pal
similarity index 100%
rename from graphics/pokemon/melmetal/shiny.pal
rename to graphics/pokemon/gen_7/melmetal/shiny.pal
diff --git a/graphics/pokemon/meltan/back.png b/graphics/pokemon/gen_7/meltan/back.png
similarity index 100%
rename from graphics/pokemon/meltan/back.png
rename to graphics/pokemon/gen_7/meltan/back.png
diff --git a/graphics/pokemon/tapu_bulu/footprint.png b/graphics/pokemon/gen_7/meltan/footprint.png
similarity index 100%
rename from graphics/pokemon/tapu_bulu/footprint.png
rename to graphics/pokemon/gen_7/meltan/footprint.png
diff --git a/graphics/pokemon/meltan/front.png b/graphics/pokemon/gen_7/meltan/front.png
similarity index 100%
rename from graphics/pokemon/meltan/front.png
rename to graphics/pokemon/gen_7/meltan/front.png
diff --git a/graphics/pokemon/meltan/icon.png b/graphics/pokemon/gen_7/meltan/icon.png
similarity index 100%
rename from graphics/pokemon/meltan/icon.png
rename to graphics/pokemon/gen_7/meltan/icon.png
diff --git a/graphics/pokemon/meltan/normal.pal b/graphics/pokemon/gen_7/meltan/normal.pal
similarity index 100%
rename from graphics/pokemon/meltan/normal.pal
rename to graphics/pokemon/gen_7/meltan/normal.pal
diff --git a/graphics/pokemon/meltan/shiny.pal b/graphics/pokemon/gen_7/meltan/shiny.pal
similarity index 100%
rename from graphics/pokemon/meltan/shiny.pal
rename to graphics/pokemon/gen_7/meltan/shiny.pal
diff --git a/graphics/pokemon/mimikyu/back.png b/graphics/pokemon/gen_7/mimikyu/back.png
similarity index 100%
rename from graphics/pokemon/mimikyu/back.png
rename to graphics/pokemon/gen_7/mimikyu/back.png
diff --git a/graphics/pokemon/mimikyu/busted/back.png b/graphics/pokemon/gen_7/mimikyu/busted/back.png
similarity index 100%
rename from graphics/pokemon/mimikyu/busted/back.png
rename to graphics/pokemon/gen_7/mimikyu/busted/back.png
diff --git a/graphics/pokemon/mimikyu/busted/front.png b/graphics/pokemon/gen_7/mimikyu/busted/front.png
similarity index 100%
rename from graphics/pokemon/mimikyu/busted/front.png
rename to graphics/pokemon/gen_7/mimikyu/busted/front.png
diff --git a/graphics/pokemon/mimikyu/busted/icon.png b/graphics/pokemon/gen_7/mimikyu/busted/icon.png
similarity index 100%
rename from graphics/pokemon/mimikyu/busted/icon.png
rename to graphics/pokemon/gen_7/mimikyu/busted/icon.png
diff --git a/graphics/pokemon/mimikyu/busted/normal.pal b/graphics/pokemon/gen_7/mimikyu/busted/normal.pal
similarity index 100%
rename from graphics/pokemon/mimikyu/busted/normal.pal
rename to graphics/pokemon/gen_7/mimikyu/busted/normal.pal
diff --git a/graphics/pokemon/mimikyu/busted/shiny.pal b/graphics/pokemon/gen_7/mimikyu/busted/shiny.pal
similarity index 100%
rename from graphics/pokemon/mimikyu/busted/shiny.pal
rename to graphics/pokemon/gen_7/mimikyu/busted/shiny.pal
diff --git a/graphics/pokemon/tapu_fini/footprint.png b/graphics/pokemon/gen_7/mimikyu/footprint.png
similarity index 100%
rename from graphics/pokemon/tapu_fini/footprint.png
rename to graphics/pokemon/gen_7/mimikyu/footprint.png
diff --git a/graphics/pokemon/mimikyu/front.png b/graphics/pokemon/gen_7/mimikyu/front.png
similarity index 100%
rename from graphics/pokemon/mimikyu/front.png
rename to graphics/pokemon/gen_7/mimikyu/front.png
diff --git a/graphics/pokemon/mimikyu/icon.png b/graphics/pokemon/gen_7/mimikyu/icon.png
similarity index 100%
rename from graphics/pokemon/mimikyu/icon.png
rename to graphics/pokemon/gen_7/mimikyu/icon.png
diff --git a/graphics/pokemon/mimikyu/normal.pal b/graphics/pokemon/gen_7/mimikyu/normal.pal
similarity index 100%
rename from graphics/pokemon/mimikyu/normal.pal
rename to graphics/pokemon/gen_7/mimikyu/normal.pal
diff --git a/graphics/pokemon/mimikyu/shiny.pal b/graphics/pokemon/gen_7/mimikyu/shiny.pal
similarity index 100%
rename from graphics/pokemon/mimikyu/shiny.pal
rename to graphics/pokemon/gen_7/mimikyu/shiny.pal
diff --git a/graphics/pokemon/minior/back.png b/graphics/pokemon/gen_7/minior/back.png
similarity index 100%
rename from graphics/pokemon/minior/back.png
rename to graphics/pokemon/gen_7/minior/back.png
diff --git a/graphics/pokemon/minior/core/back.png b/graphics/pokemon/gen_7/minior/core/back.png
similarity index 100%
rename from graphics/pokemon/minior/core/back.png
rename to graphics/pokemon/gen_7/minior/core/back.png
diff --git a/graphics/pokemon/minior/core/blue/icon.png b/graphics/pokemon/gen_7/minior/core/blue/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/blue/icon.png
rename to graphics/pokemon/gen_7/minior/core/blue/icon.png
diff --git a/graphics/pokemon/minior/core/blue/normal.pal b/graphics/pokemon/gen_7/minior/core/blue/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/blue/normal.pal
rename to graphics/pokemon/gen_7/minior/core/blue/normal.pal
diff --git a/graphics/pokemon/minior/core/front.png b/graphics/pokemon/gen_7/minior/core/front.png
similarity index 100%
rename from graphics/pokemon/minior/core/front.png
rename to graphics/pokemon/gen_7/minior/core/front.png
diff --git a/graphics/pokemon/minior/core/green/icon.png b/graphics/pokemon/gen_7/minior/core/green/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/green/icon.png
rename to graphics/pokemon/gen_7/minior/core/green/icon.png
diff --git a/graphics/pokemon/minior/core/green/normal.pal b/graphics/pokemon/gen_7/minior/core/green/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/green/normal.pal
rename to graphics/pokemon/gen_7/minior/core/green/normal.pal
diff --git a/graphics/pokemon/minior/core/indigo/icon.png b/graphics/pokemon/gen_7/minior/core/indigo/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/indigo/icon.png
rename to graphics/pokemon/gen_7/minior/core/indigo/icon.png
diff --git a/graphics/pokemon/minior/core/indigo/normal.pal b/graphics/pokemon/gen_7/minior/core/indigo/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/indigo/normal.pal
rename to graphics/pokemon/gen_7/minior/core/indigo/normal.pal
diff --git a/graphics/pokemon/minior/core/orange/icon.png b/graphics/pokemon/gen_7/minior/core/orange/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/orange/icon.png
rename to graphics/pokemon/gen_7/minior/core/orange/icon.png
diff --git a/graphics/pokemon/minior/core/orange/normal.pal b/graphics/pokemon/gen_7/minior/core/orange/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/orange/normal.pal
rename to graphics/pokemon/gen_7/minior/core/orange/normal.pal
diff --git a/graphics/pokemon/minior/core/red/icon.png b/graphics/pokemon/gen_7/minior/core/red/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/red/icon.png
rename to graphics/pokemon/gen_7/minior/core/red/icon.png
diff --git a/graphics/pokemon/minior/core/red/normal.pal b/graphics/pokemon/gen_7/minior/core/red/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/red/normal.pal
rename to graphics/pokemon/gen_7/minior/core/red/normal.pal
diff --git a/graphics/pokemon/minior/core/shiny.pal b/graphics/pokemon/gen_7/minior/core/shiny.pal
similarity index 100%
rename from graphics/pokemon/minior/core/shiny.pal
rename to graphics/pokemon/gen_7/minior/core/shiny.pal
diff --git a/graphics/pokemon/minior/core/violet/icon.png b/graphics/pokemon/gen_7/minior/core/violet/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/violet/icon.png
rename to graphics/pokemon/gen_7/minior/core/violet/icon.png
diff --git a/graphics/pokemon/minior/core/violet/normal.pal b/graphics/pokemon/gen_7/minior/core/violet/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/violet/normal.pal
rename to graphics/pokemon/gen_7/minior/core/violet/normal.pal
diff --git a/graphics/pokemon/minior/core/yellow/icon.png b/graphics/pokemon/gen_7/minior/core/yellow/icon.png
similarity index 100%
rename from graphics/pokemon/minior/core/yellow/icon.png
rename to graphics/pokemon/gen_7/minior/core/yellow/icon.png
diff --git a/graphics/pokemon/minior/core/yellow/normal.pal b/graphics/pokemon/gen_7/minior/core/yellow/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/core/yellow/normal.pal
rename to graphics/pokemon/gen_7/minior/core/yellow/normal.pal
diff --git a/graphics/pokemon/tapu_koko/footprint.png b/graphics/pokemon/gen_7/minior/footprint.png
similarity index 100%
rename from graphics/pokemon/tapu_koko/footprint.png
rename to graphics/pokemon/gen_7/minior/footprint.png
diff --git a/graphics/pokemon/minior/front.png b/graphics/pokemon/gen_7/minior/front.png
similarity index 100%
rename from graphics/pokemon/minior/front.png
rename to graphics/pokemon/gen_7/minior/front.png
diff --git a/graphics/pokemon/minior/icon.png b/graphics/pokemon/gen_7/minior/icon.png
similarity index 100%
rename from graphics/pokemon/minior/icon.png
rename to graphics/pokemon/gen_7/minior/icon.png
diff --git a/graphics/pokemon/minior/normal.pal b/graphics/pokemon/gen_7/minior/normal.pal
similarity index 100%
rename from graphics/pokemon/minior/normal.pal
rename to graphics/pokemon/gen_7/minior/normal.pal
diff --git a/graphics/pokemon/minior/shiny.pal b/graphics/pokemon/gen_7/minior/shiny.pal
similarity index 100%
rename from graphics/pokemon/minior/shiny.pal
rename to graphics/pokemon/gen_7/minior/shiny.pal
diff --git a/graphics/pokemon/morelull/back.png b/graphics/pokemon/gen_7/morelull/back.png
similarity index 100%
rename from graphics/pokemon/morelull/back.png
rename to graphics/pokemon/gen_7/morelull/back.png
diff --git a/graphics/pokemon/morelull/footprint.png b/graphics/pokemon/gen_7/morelull/footprint.png
similarity index 100%
rename from graphics/pokemon/morelull/footprint.png
rename to graphics/pokemon/gen_7/morelull/footprint.png
diff --git a/graphics/pokemon/morelull/front.png b/graphics/pokemon/gen_7/morelull/front.png
similarity index 100%
rename from graphics/pokemon/morelull/front.png
rename to graphics/pokemon/gen_7/morelull/front.png
diff --git a/graphics/pokemon/morelull/icon.png b/graphics/pokemon/gen_7/morelull/icon.png
similarity index 100%
rename from graphics/pokemon/morelull/icon.png
rename to graphics/pokemon/gen_7/morelull/icon.png
diff --git a/graphics/pokemon/morelull/normal.pal b/graphics/pokemon/gen_7/morelull/normal.pal
similarity index 100%
rename from graphics/pokemon/morelull/normal.pal
rename to graphics/pokemon/gen_7/morelull/normal.pal
diff --git a/graphics/pokemon/morelull/shiny.pal b/graphics/pokemon/gen_7/morelull/shiny.pal
similarity index 100%
rename from graphics/pokemon/morelull/shiny.pal
rename to graphics/pokemon/gen_7/morelull/shiny.pal
diff --git a/graphics/pokemon/mudbray/back.png b/graphics/pokemon/gen_7/mudbray/back.png
similarity index 100%
rename from graphics/pokemon/mudbray/back.png
rename to graphics/pokemon/gen_7/mudbray/back.png
diff --git a/graphics/pokemon/mudbray/footprint.png b/graphics/pokemon/gen_7/mudbray/footprint.png
similarity index 100%
rename from graphics/pokemon/mudbray/footprint.png
rename to graphics/pokemon/gen_7/mudbray/footprint.png
diff --git a/graphics/pokemon/mudbray/front.png b/graphics/pokemon/gen_7/mudbray/front.png
similarity index 100%
rename from graphics/pokemon/mudbray/front.png
rename to graphics/pokemon/gen_7/mudbray/front.png
diff --git a/graphics/pokemon/mudbray/icon.png b/graphics/pokemon/gen_7/mudbray/icon.png
similarity index 100%
rename from graphics/pokemon/mudbray/icon.png
rename to graphics/pokemon/gen_7/mudbray/icon.png
diff --git a/graphics/pokemon/mudbray/normal.pal b/graphics/pokemon/gen_7/mudbray/normal.pal
similarity index 100%
rename from graphics/pokemon/mudbray/normal.pal
rename to graphics/pokemon/gen_7/mudbray/normal.pal
diff --git a/graphics/pokemon/mudbray/shiny.pal b/graphics/pokemon/gen_7/mudbray/shiny.pal
similarity index 100%
rename from graphics/pokemon/mudbray/shiny.pal
rename to graphics/pokemon/gen_7/mudbray/shiny.pal
diff --git a/graphics/pokemon/mudsdale/back.png b/graphics/pokemon/gen_7/mudsdale/back.png
similarity index 100%
rename from graphics/pokemon/mudsdale/back.png
rename to graphics/pokemon/gen_7/mudsdale/back.png
diff --git a/graphics/pokemon/mudsdale/footprint.png b/graphics/pokemon/gen_7/mudsdale/footprint.png
similarity index 100%
rename from graphics/pokemon/mudsdale/footprint.png
rename to graphics/pokemon/gen_7/mudsdale/footprint.png
diff --git a/graphics/pokemon/mudsdale/front.png b/graphics/pokemon/gen_7/mudsdale/front.png
similarity index 100%
rename from graphics/pokemon/mudsdale/front.png
rename to graphics/pokemon/gen_7/mudsdale/front.png
diff --git a/graphics/pokemon/mudsdale/icon.png b/graphics/pokemon/gen_7/mudsdale/icon.png
similarity index 100%
rename from graphics/pokemon/mudsdale/icon.png
rename to graphics/pokemon/gen_7/mudsdale/icon.png
diff --git a/graphics/pokemon/mudsdale/normal.pal b/graphics/pokemon/gen_7/mudsdale/normal.pal
similarity index 100%
rename from graphics/pokemon/mudsdale/normal.pal
rename to graphics/pokemon/gen_7/mudsdale/normal.pal
diff --git a/graphics/pokemon/mudsdale/shiny.pal b/graphics/pokemon/gen_7/mudsdale/shiny.pal
similarity index 100%
rename from graphics/pokemon/mudsdale/shiny.pal
rename to graphics/pokemon/gen_7/mudsdale/shiny.pal
diff --git a/graphics/pokemon/naganadel/back.png b/graphics/pokemon/gen_7/naganadel/back.png
similarity index 100%
rename from graphics/pokemon/naganadel/back.png
rename to graphics/pokemon/gen_7/naganadel/back.png
diff --git a/graphics/pokemon/tapu_lele/footprint.png b/graphics/pokemon/gen_7/naganadel/footprint.png
similarity index 100%
rename from graphics/pokemon/tapu_lele/footprint.png
rename to graphics/pokemon/gen_7/naganadel/footprint.png
diff --git a/graphics/pokemon/naganadel/front.png b/graphics/pokemon/gen_7/naganadel/front.png
similarity index 100%
rename from graphics/pokemon/naganadel/front.png
rename to graphics/pokemon/gen_7/naganadel/front.png
diff --git a/graphics/pokemon/naganadel/icon.png b/graphics/pokemon/gen_7/naganadel/icon.png
similarity index 100%
rename from graphics/pokemon/naganadel/icon.png
rename to graphics/pokemon/gen_7/naganadel/icon.png
diff --git a/graphics/pokemon/naganadel/normal.pal b/graphics/pokemon/gen_7/naganadel/normal.pal
similarity index 100%
rename from graphics/pokemon/naganadel/normal.pal
rename to graphics/pokemon/gen_7/naganadel/normal.pal
diff --git a/graphics/pokemon/naganadel/shiny.pal b/graphics/pokemon/gen_7/naganadel/shiny.pal
similarity index 100%
rename from graphics/pokemon/naganadel/shiny.pal
rename to graphics/pokemon/gen_7/naganadel/shiny.pal
diff --git a/graphics/pokemon/necrozma/back.png b/graphics/pokemon/gen_7/necrozma/back.png
similarity index 100%
rename from graphics/pokemon/necrozma/back.png
rename to graphics/pokemon/gen_7/necrozma/back.png
diff --git a/graphics/pokemon/necrozma/dawn_wings/back.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/back.png
similarity index 100%
rename from graphics/pokemon/necrozma/dawn_wings/back.png
rename to graphics/pokemon/gen_7/necrozma/dawn_wings/back.png
diff --git a/graphics/pokemon/necrozma/dawn_wings/front.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/front.png
similarity index 100%
rename from graphics/pokemon/necrozma/dawn_wings/front.png
rename to graphics/pokemon/gen_7/necrozma/dawn_wings/front.png
diff --git a/graphics/pokemon/necrozma/dawn_wings/icon.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/icon.png
similarity index 100%
rename from graphics/pokemon/necrozma/dawn_wings/icon.png
rename to graphics/pokemon/gen_7/necrozma/dawn_wings/icon.png
diff --git a/graphics/pokemon/necrozma/dawn_wings/normal.pal b/graphics/pokemon/gen_7/necrozma/dawn_wings/normal.pal
similarity index 100%
rename from graphics/pokemon/necrozma/dawn_wings/normal.pal
rename to graphics/pokemon/gen_7/necrozma/dawn_wings/normal.pal
diff --git a/graphics/pokemon/necrozma/dawn_wings/shiny.pal b/graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.pal
similarity index 100%
rename from graphics/pokemon/necrozma/dawn_wings/shiny.pal
rename to graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.pal
diff --git a/graphics/pokemon/necrozma/dusk_mane/back.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/back.png
similarity index 100%
rename from graphics/pokemon/necrozma/dusk_mane/back.png
rename to graphics/pokemon/gen_7/necrozma/dusk_mane/back.png
diff --git a/graphics/pokemon/necrozma/dusk_mane/front.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/front.png
similarity index 100%
rename from graphics/pokemon/necrozma/dusk_mane/front.png
rename to graphics/pokemon/gen_7/necrozma/dusk_mane/front.png
diff --git a/graphics/pokemon/necrozma/dusk_mane/icon.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/icon.png
similarity index 100%
rename from graphics/pokemon/necrozma/dusk_mane/icon.png
rename to graphics/pokemon/gen_7/necrozma/dusk_mane/icon.png
diff --git a/graphics/pokemon/necrozma/dusk_mane/normal.pal b/graphics/pokemon/gen_7/necrozma/dusk_mane/normal.pal
similarity index 100%
rename from graphics/pokemon/necrozma/dusk_mane/normal.pal
rename to graphics/pokemon/gen_7/necrozma/dusk_mane/normal.pal
diff --git a/graphics/pokemon/necrozma/dusk_mane/shiny.pal b/graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.pal
similarity index 100%
rename from graphics/pokemon/necrozma/dusk_mane/shiny.pal
rename to graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.pal
diff --git a/graphics/pokemon/tentacool/footprint.png b/graphics/pokemon/gen_7/necrozma/footprint.png
similarity index 100%
rename from graphics/pokemon/tentacool/footprint.png
rename to graphics/pokemon/gen_7/necrozma/footprint.png
diff --git a/graphics/pokemon/necrozma/front.png b/graphics/pokemon/gen_7/necrozma/front.png
similarity index 100%
rename from graphics/pokemon/necrozma/front.png
rename to graphics/pokemon/gen_7/necrozma/front.png
diff --git a/graphics/pokemon/necrozma/icon.png b/graphics/pokemon/gen_7/necrozma/icon.png
similarity index 100%
rename from graphics/pokemon/necrozma/icon.png
rename to graphics/pokemon/gen_7/necrozma/icon.png
diff --git a/graphics/pokemon/necrozma/normal.pal b/graphics/pokemon/gen_7/necrozma/normal.pal
similarity index 100%
rename from graphics/pokemon/necrozma/normal.pal
rename to graphics/pokemon/gen_7/necrozma/normal.pal
diff --git a/graphics/pokemon/necrozma/shiny.pal b/graphics/pokemon/gen_7/necrozma/shiny.pal
similarity index 100%
rename from graphics/pokemon/necrozma/shiny.pal
rename to graphics/pokemon/gen_7/necrozma/shiny.pal
diff --git a/graphics/pokemon/necrozma/ultra/back.png b/graphics/pokemon/gen_7/necrozma/ultra/back.png
similarity index 100%
rename from graphics/pokemon/necrozma/ultra/back.png
rename to graphics/pokemon/gen_7/necrozma/ultra/back.png
diff --git a/graphics/pokemon/necrozma/ultra/front.png b/graphics/pokemon/gen_7/necrozma/ultra/front.png
similarity index 100%
rename from graphics/pokemon/necrozma/ultra/front.png
rename to graphics/pokemon/gen_7/necrozma/ultra/front.png
diff --git a/graphics/pokemon/necrozma/ultra/icon.png b/graphics/pokemon/gen_7/necrozma/ultra/icon.png
similarity index 100%
rename from graphics/pokemon/necrozma/ultra/icon.png
rename to graphics/pokemon/gen_7/necrozma/ultra/icon.png
diff --git a/graphics/pokemon/necrozma/ultra/normal.pal b/graphics/pokemon/gen_7/necrozma/ultra/normal.pal
similarity index 100%
rename from graphics/pokemon/necrozma/ultra/normal.pal
rename to graphics/pokemon/gen_7/necrozma/ultra/normal.pal
diff --git a/graphics/pokemon/necrozma/ultra/shiny.pal b/graphics/pokemon/gen_7/necrozma/ultra/shiny.pal
similarity index 100%
rename from graphics/pokemon/necrozma/ultra/shiny.pal
rename to graphics/pokemon/gen_7/necrozma/ultra/shiny.pal
diff --git a/graphics/pokemon/nihilego/back.png b/graphics/pokemon/gen_7/nihilego/back.png
similarity index 100%
rename from graphics/pokemon/nihilego/back.png
rename to graphics/pokemon/gen_7/nihilego/back.png
diff --git a/graphics/pokemon/tentacruel/footprint.png b/graphics/pokemon/gen_7/nihilego/footprint.png
similarity index 100%
rename from graphics/pokemon/tentacruel/footprint.png
rename to graphics/pokemon/gen_7/nihilego/footprint.png
diff --git a/graphics/pokemon/nihilego/front.png b/graphics/pokemon/gen_7/nihilego/front.png
similarity index 100%
rename from graphics/pokemon/nihilego/front.png
rename to graphics/pokemon/gen_7/nihilego/front.png
diff --git a/graphics/pokemon/nihilego/icon.png b/graphics/pokemon/gen_7/nihilego/icon.png
similarity index 100%
rename from graphics/pokemon/nihilego/icon.png
rename to graphics/pokemon/gen_7/nihilego/icon.png
diff --git a/graphics/pokemon/nihilego/normal.pal b/graphics/pokemon/gen_7/nihilego/normal.pal
similarity index 100%
rename from graphics/pokemon/nihilego/normal.pal
rename to graphics/pokemon/gen_7/nihilego/normal.pal
diff --git a/graphics/pokemon/nihilego/shiny.pal b/graphics/pokemon/gen_7/nihilego/shiny.pal
similarity index 100%
rename from graphics/pokemon/nihilego/shiny.pal
rename to graphics/pokemon/gen_7/nihilego/shiny.pal
diff --git a/graphics/pokemon/oranguru/anim_front.png b/graphics/pokemon/gen_7/oranguru/anim_front.png
similarity index 100%
rename from graphics/pokemon/oranguru/anim_front.png
rename to graphics/pokemon/gen_7/oranguru/anim_front.png
diff --git a/graphics/pokemon/oranguru/back.png b/graphics/pokemon/gen_7/oranguru/back.png
similarity index 100%
rename from graphics/pokemon/oranguru/back.png
rename to graphics/pokemon/gen_7/oranguru/back.png
diff --git a/graphics/pokemon/oranguru/footprint.png b/graphics/pokemon/gen_7/oranguru/footprint.png
similarity index 100%
rename from graphics/pokemon/oranguru/footprint.png
rename to graphics/pokemon/gen_7/oranguru/footprint.png
diff --git a/graphics/pokemon/oranguru/icon.png b/graphics/pokemon/gen_7/oranguru/icon.png
similarity index 100%
rename from graphics/pokemon/oranguru/icon.png
rename to graphics/pokemon/gen_7/oranguru/icon.png
diff --git a/graphics/pokemon/oranguru/normal.pal b/graphics/pokemon/gen_7/oranguru/normal.pal
similarity index 100%
rename from graphics/pokemon/oranguru/normal.pal
rename to graphics/pokemon/gen_7/oranguru/normal.pal
diff --git a/graphics/pokemon/oranguru/shiny.pal b/graphics/pokemon/gen_7/oranguru/shiny.pal
similarity index 100%
rename from graphics/pokemon/oranguru/shiny.pal
rename to graphics/pokemon/gen_7/oranguru/shiny.pal
diff --git a/graphics/pokemon/oricorio/back.png b/graphics/pokemon/gen_7/oricorio/back.png
similarity index 100%
rename from graphics/pokemon/oricorio/back.png
rename to graphics/pokemon/gen_7/oricorio/back.png
diff --git a/graphics/pokemon/oricorio/footprint.png b/graphics/pokemon/gen_7/oricorio/footprint.png
similarity index 100%
rename from graphics/pokemon/oricorio/footprint.png
rename to graphics/pokemon/gen_7/oricorio/footprint.png
diff --git a/graphics/pokemon/oricorio/front.png b/graphics/pokemon/gen_7/oricorio/front.png
similarity index 100%
rename from graphics/pokemon/oricorio/front.png
rename to graphics/pokemon/gen_7/oricorio/front.png
diff --git a/graphics/pokemon/oricorio/icon.png b/graphics/pokemon/gen_7/oricorio/icon.png
similarity index 100%
rename from graphics/pokemon/oricorio/icon.png
rename to graphics/pokemon/gen_7/oricorio/icon.png
diff --git a/graphics/pokemon/oricorio/normal.pal b/graphics/pokemon/gen_7/oricorio/normal.pal
similarity index 100%
rename from graphics/pokemon/oricorio/normal.pal
rename to graphics/pokemon/gen_7/oricorio/normal.pal
diff --git a/graphics/pokemon/oricorio/pau/back.png b/graphics/pokemon/gen_7/oricorio/pau/back.png
similarity index 100%
rename from graphics/pokemon/oricorio/pau/back.png
rename to graphics/pokemon/gen_7/oricorio/pau/back.png
diff --git a/graphics/pokemon/oricorio/pau/front.png b/graphics/pokemon/gen_7/oricorio/pau/front.png
similarity index 100%
rename from graphics/pokemon/oricorio/pau/front.png
rename to graphics/pokemon/gen_7/oricorio/pau/front.png
diff --git a/graphics/pokemon/oricorio/pau/icon.png b/graphics/pokemon/gen_7/oricorio/pau/icon.png
similarity index 100%
rename from graphics/pokemon/oricorio/pau/icon.png
rename to graphics/pokemon/gen_7/oricorio/pau/icon.png
diff --git a/graphics/pokemon/oricorio/pau/normal.pal b/graphics/pokemon/gen_7/oricorio/pau/normal.pal
similarity index 100%
rename from graphics/pokemon/oricorio/pau/normal.pal
rename to graphics/pokemon/gen_7/oricorio/pau/normal.pal
diff --git a/graphics/pokemon/oricorio/pau/shiny.pal b/graphics/pokemon/gen_7/oricorio/pau/shiny.pal
similarity index 100%
rename from graphics/pokemon/oricorio/pau/shiny.pal
rename to graphics/pokemon/gen_7/oricorio/pau/shiny.pal
diff --git a/graphics/pokemon/oricorio/pom_pom/back.png b/graphics/pokemon/gen_7/oricorio/pom_pom/back.png
similarity index 100%
rename from graphics/pokemon/oricorio/pom_pom/back.png
rename to graphics/pokemon/gen_7/oricorio/pom_pom/back.png
diff --git a/graphics/pokemon/oricorio/pom_pom/front.png b/graphics/pokemon/gen_7/oricorio/pom_pom/front.png
similarity index 100%
rename from graphics/pokemon/oricorio/pom_pom/front.png
rename to graphics/pokemon/gen_7/oricorio/pom_pom/front.png
diff --git a/graphics/pokemon/oricorio/pom_pom/icon.png b/graphics/pokemon/gen_7/oricorio/pom_pom/icon.png
similarity index 100%
rename from graphics/pokemon/oricorio/pom_pom/icon.png
rename to graphics/pokemon/gen_7/oricorio/pom_pom/icon.png
diff --git a/graphics/pokemon/oricorio/pom_pom/normal.pal b/graphics/pokemon/gen_7/oricorio/pom_pom/normal.pal
similarity index 100%
rename from graphics/pokemon/oricorio/pom_pom/normal.pal
rename to graphics/pokemon/gen_7/oricorio/pom_pom/normal.pal
diff --git a/graphics/pokemon/oricorio/pom_pom/shiny.pal b/graphics/pokemon/gen_7/oricorio/pom_pom/shiny.pal
similarity index 100%
rename from graphics/pokemon/oricorio/pom_pom/shiny.pal
rename to graphics/pokemon/gen_7/oricorio/pom_pom/shiny.pal
diff --git a/graphics/pokemon/oricorio/sensu/back.png b/graphics/pokemon/gen_7/oricorio/sensu/back.png
similarity index 100%
rename from graphics/pokemon/oricorio/sensu/back.png
rename to graphics/pokemon/gen_7/oricorio/sensu/back.png
diff --git a/graphics/pokemon/oricorio/sensu/front.png b/graphics/pokemon/gen_7/oricorio/sensu/front.png
similarity index 100%
rename from graphics/pokemon/oricorio/sensu/front.png
rename to graphics/pokemon/gen_7/oricorio/sensu/front.png
diff --git a/graphics/pokemon/oricorio/sensu/icon.png b/graphics/pokemon/gen_7/oricorio/sensu/icon.png
similarity index 100%
rename from graphics/pokemon/oricorio/sensu/icon.png
rename to graphics/pokemon/gen_7/oricorio/sensu/icon.png
diff --git a/graphics/pokemon/oricorio/sensu/normal.pal b/graphics/pokemon/gen_7/oricorio/sensu/normal.pal
similarity index 100%
rename from graphics/pokemon/oricorio/sensu/normal.pal
rename to graphics/pokemon/gen_7/oricorio/sensu/normal.pal
diff --git a/graphics/pokemon/oricorio/sensu/shiny.pal b/graphics/pokemon/gen_7/oricorio/sensu/shiny.pal
similarity index 100%
rename from graphics/pokemon/oricorio/sensu/shiny.pal
rename to graphics/pokemon/gen_7/oricorio/sensu/shiny.pal
diff --git a/graphics/pokemon/oricorio/shiny.pal b/graphics/pokemon/gen_7/oricorio/shiny.pal
similarity index 100%
rename from graphics/pokemon/oricorio/shiny.pal
rename to graphics/pokemon/gen_7/oricorio/shiny.pal
diff --git a/graphics/pokemon/palossand/back.png b/graphics/pokemon/gen_7/palossand/back.png
similarity index 100%
rename from graphics/pokemon/palossand/back.png
rename to graphics/pokemon/gen_7/palossand/back.png
diff --git a/graphics/pokemon/thundurus/footprint.png b/graphics/pokemon/gen_7/palossand/footprint.png
similarity index 100%
rename from graphics/pokemon/thundurus/footprint.png
rename to graphics/pokemon/gen_7/palossand/footprint.png
diff --git a/graphics/pokemon/palossand/front.png b/graphics/pokemon/gen_7/palossand/front.png
similarity index 100%
rename from graphics/pokemon/palossand/front.png
rename to graphics/pokemon/gen_7/palossand/front.png
diff --git a/graphics/pokemon/palossand/icon.png b/graphics/pokemon/gen_7/palossand/icon.png
similarity index 100%
rename from graphics/pokemon/palossand/icon.png
rename to graphics/pokemon/gen_7/palossand/icon.png
diff --git a/graphics/pokemon/palossand/normal.pal b/graphics/pokemon/gen_7/palossand/normal.pal
similarity index 100%
rename from graphics/pokemon/palossand/normal.pal
rename to graphics/pokemon/gen_7/palossand/normal.pal
diff --git a/graphics/pokemon/palossand/shiny.pal b/graphics/pokemon/gen_7/palossand/shiny.pal
similarity index 100%
rename from graphics/pokemon/palossand/shiny.pal
rename to graphics/pokemon/gen_7/palossand/shiny.pal
diff --git a/graphics/pokemon/passimian/anim_front.png b/graphics/pokemon/gen_7/passimian/anim_front.png
similarity index 100%
rename from graphics/pokemon/passimian/anim_front.png
rename to graphics/pokemon/gen_7/passimian/anim_front.png
diff --git a/graphics/pokemon/passimian/back.png b/graphics/pokemon/gen_7/passimian/back.png
similarity index 100%
rename from graphics/pokemon/passimian/back.png
rename to graphics/pokemon/gen_7/passimian/back.png
diff --git a/graphics/pokemon/passimian/footprint.png b/graphics/pokemon/gen_7/passimian/footprint.png
similarity index 100%
rename from graphics/pokemon/passimian/footprint.png
rename to graphics/pokemon/gen_7/passimian/footprint.png
diff --git a/graphics/pokemon/passimian/icon.png b/graphics/pokemon/gen_7/passimian/icon.png
similarity index 100%
rename from graphics/pokemon/passimian/icon.png
rename to graphics/pokemon/gen_7/passimian/icon.png
diff --git a/graphics/pokemon/passimian/normal.pal b/graphics/pokemon/gen_7/passimian/normal.pal
similarity index 100%
rename from graphics/pokemon/passimian/normal.pal
rename to graphics/pokemon/gen_7/passimian/normal.pal
diff --git a/graphics/pokemon/passimian/shiny.pal b/graphics/pokemon/gen_7/passimian/shiny.pal
similarity index 100%
rename from graphics/pokemon/passimian/shiny.pal
rename to graphics/pokemon/gen_7/passimian/shiny.pal
diff --git a/graphics/pokemon/pheromosa/back.png b/graphics/pokemon/gen_7/pheromosa/back.png
similarity index 100%
rename from graphics/pokemon/pheromosa/back.png
rename to graphics/pokemon/gen_7/pheromosa/back.png
diff --git a/graphics/pokemon/pheromosa/footprint.png b/graphics/pokemon/gen_7/pheromosa/footprint.png
similarity index 100%
rename from graphics/pokemon/pheromosa/footprint.png
rename to graphics/pokemon/gen_7/pheromosa/footprint.png
diff --git a/graphics/pokemon/pheromosa/front.png b/graphics/pokemon/gen_7/pheromosa/front.png
similarity index 100%
rename from graphics/pokemon/pheromosa/front.png
rename to graphics/pokemon/gen_7/pheromosa/front.png
diff --git a/graphics/pokemon/pheromosa/icon.png b/graphics/pokemon/gen_7/pheromosa/icon.png
similarity index 100%
rename from graphics/pokemon/pheromosa/icon.png
rename to graphics/pokemon/gen_7/pheromosa/icon.png
diff --git a/graphics/pokemon/pheromosa/normal.pal b/graphics/pokemon/gen_7/pheromosa/normal.pal
similarity index 100%
rename from graphics/pokemon/pheromosa/normal.pal
rename to graphics/pokemon/gen_7/pheromosa/normal.pal
diff --git a/graphics/pokemon/pheromosa/shiny.pal b/graphics/pokemon/gen_7/pheromosa/shiny.pal
similarity index 100%
rename from graphics/pokemon/pheromosa/shiny.pal
rename to graphics/pokemon/gen_7/pheromosa/shiny.pal
diff --git a/graphics/pokemon/pikipek/anim_front.png b/graphics/pokemon/gen_7/pikipek/anim_front.png
similarity index 100%
rename from graphics/pokemon/pikipek/anim_front.png
rename to graphics/pokemon/gen_7/pikipek/anim_front.png
diff --git a/graphics/pokemon/pikipek/back.png b/graphics/pokemon/gen_7/pikipek/back.png
similarity index 100%
rename from graphics/pokemon/pikipek/back.png
rename to graphics/pokemon/gen_7/pikipek/back.png
diff --git a/graphics/pokemon/pikipek/footprint.png b/graphics/pokemon/gen_7/pikipek/footprint.png
similarity index 100%
rename from graphics/pokemon/pikipek/footprint.png
rename to graphics/pokemon/gen_7/pikipek/footprint.png
diff --git a/graphics/pokemon/pikipek/icon.png b/graphics/pokemon/gen_7/pikipek/icon.png
similarity index 100%
rename from graphics/pokemon/pikipek/icon.png
rename to graphics/pokemon/gen_7/pikipek/icon.png
diff --git a/graphics/pokemon/pikipek/normal.pal b/graphics/pokemon/gen_7/pikipek/normal.pal
similarity index 100%
rename from graphics/pokemon/pikipek/normal.pal
rename to graphics/pokemon/gen_7/pikipek/normal.pal
diff --git a/graphics/pokemon/pikipek/shiny.pal b/graphics/pokemon/gen_7/pikipek/shiny.pal
similarity index 100%
rename from graphics/pokemon/pikipek/shiny.pal
rename to graphics/pokemon/gen_7/pikipek/shiny.pal
diff --git a/graphics/pokemon/poipole/back.png b/graphics/pokemon/gen_7/poipole/back.png
similarity index 100%
rename from graphics/pokemon/poipole/back.png
rename to graphics/pokemon/gen_7/poipole/back.png
diff --git a/graphics/pokemon/starmie/footprint.png b/graphics/pokemon/gen_7/poipole/footprint.png
similarity index 100%
rename from graphics/pokemon/starmie/footprint.png
rename to graphics/pokemon/gen_7/poipole/footprint.png
diff --git a/graphics/pokemon/poipole/front.png b/graphics/pokemon/gen_7/poipole/front.png
similarity index 100%
rename from graphics/pokemon/poipole/front.png
rename to graphics/pokemon/gen_7/poipole/front.png
diff --git a/graphics/pokemon/poipole/icon.png b/graphics/pokemon/gen_7/poipole/icon.png
similarity index 100%
rename from graphics/pokemon/poipole/icon.png
rename to graphics/pokemon/gen_7/poipole/icon.png
diff --git a/graphics/pokemon/poipole/normal.pal b/graphics/pokemon/gen_7/poipole/normal.pal
similarity index 100%
rename from graphics/pokemon/poipole/normal.pal
rename to graphics/pokemon/gen_7/poipole/normal.pal
diff --git a/graphics/pokemon/poipole/shiny.pal b/graphics/pokemon/gen_7/poipole/shiny.pal
similarity index 100%
rename from graphics/pokemon/poipole/shiny.pal
rename to graphics/pokemon/gen_7/poipole/shiny.pal
diff --git a/graphics/pokemon/popplio/back.png b/graphics/pokemon/gen_7/popplio/back.png
similarity index 100%
rename from graphics/pokemon/popplio/back.png
rename to graphics/pokemon/gen_7/popplio/back.png
diff --git a/graphics/pokemon/tirtouga/footprint.png b/graphics/pokemon/gen_7/popplio/footprint.png
similarity index 100%
rename from graphics/pokemon/tirtouga/footprint.png
rename to graphics/pokemon/gen_7/popplio/footprint.png
diff --git a/graphics/pokemon/popplio/front.png b/graphics/pokemon/gen_7/popplio/front.png
similarity index 100%
rename from graphics/pokemon/popplio/front.png
rename to graphics/pokemon/gen_7/popplio/front.png
diff --git a/graphics/pokemon/popplio/icon.png b/graphics/pokemon/gen_7/popplio/icon.png
similarity index 100%
rename from graphics/pokemon/popplio/icon.png
rename to graphics/pokemon/gen_7/popplio/icon.png
diff --git a/graphics/pokemon/popplio/normal.pal b/graphics/pokemon/gen_7/popplio/normal.pal
similarity index 100%
rename from graphics/pokemon/popplio/normal.pal
rename to graphics/pokemon/gen_7/popplio/normal.pal
diff --git a/graphics/pokemon/popplio/shiny.pal b/graphics/pokemon/gen_7/popplio/shiny.pal
similarity index 100%
rename from graphics/pokemon/popplio/shiny.pal
rename to graphics/pokemon/gen_7/popplio/shiny.pal
diff --git a/graphics/pokemon/primarina/back.png b/graphics/pokemon/gen_7/primarina/back.png
similarity index 100%
rename from graphics/pokemon/primarina/back.png
rename to graphics/pokemon/gen_7/primarina/back.png
diff --git a/graphics/pokemon/tornadus/footprint.png b/graphics/pokemon/gen_7/primarina/footprint.png
similarity index 100%
rename from graphics/pokemon/tornadus/footprint.png
rename to graphics/pokemon/gen_7/primarina/footprint.png
diff --git a/graphics/pokemon/primarina/front.png b/graphics/pokemon/gen_7/primarina/front.png
similarity index 100%
rename from graphics/pokemon/primarina/front.png
rename to graphics/pokemon/gen_7/primarina/front.png
diff --git a/graphics/pokemon/primarina/icon.png b/graphics/pokemon/gen_7/primarina/icon.png
similarity index 100%
rename from graphics/pokemon/primarina/icon.png
rename to graphics/pokemon/gen_7/primarina/icon.png
diff --git a/graphics/pokemon/primarina/normal.pal b/graphics/pokemon/gen_7/primarina/normal.pal
similarity index 100%
rename from graphics/pokemon/primarina/normal.pal
rename to graphics/pokemon/gen_7/primarina/normal.pal
diff --git a/graphics/pokemon/primarina/shiny.pal b/graphics/pokemon/gen_7/primarina/shiny.pal
similarity index 100%
rename from graphics/pokemon/primarina/shiny.pal
rename to graphics/pokemon/gen_7/primarina/shiny.pal
diff --git a/graphics/pokemon/pyukumuku/anim_front.png b/graphics/pokemon/gen_7/pyukumuku/anim_front.png
similarity index 100%
rename from graphics/pokemon/pyukumuku/anim_front.png
rename to graphics/pokemon/gen_7/pyukumuku/anim_front.png
diff --git a/graphics/pokemon/pyukumuku/back.png b/graphics/pokemon/gen_7/pyukumuku/back.png
similarity index 100%
rename from graphics/pokemon/pyukumuku/back.png
rename to graphics/pokemon/gen_7/pyukumuku/back.png
diff --git a/graphics/pokemon/tympole/footprint.png b/graphics/pokemon/gen_7/pyukumuku/footprint.png
similarity index 100%
rename from graphics/pokemon/tympole/footprint.png
rename to graphics/pokemon/gen_7/pyukumuku/footprint.png
diff --git a/graphics/pokemon/pyukumuku/icon.png b/graphics/pokemon/gen_7/pyukumuku/icon.png
similarity index 100%
rename from graphics/pokemon/pyukumuku/icon.png
rename to graphics/pokemon/gen_7/pyukumuku/icon.png
diff --git a/graphics/pokemon/pyukumuku/normal.pal b/graphics/pokemon/gen_7/pyukumuku/normal.pal
similarity index 100%
rename from graphics/pokemon/pyukumuku/normal.pal
rename to graphics/pokemon/gen_7/pyukumuku/normal.pal
diff --git a/graphics/pokemon/pyukumuku/shiny.pal b/graphics/pokemon/gen_7/pyukumuku/shiny.pal
similarity index 100%
rename from graphics/pokemon/pyukumuku/shiny.pal
rename to graphics/pokemon/gen_7/pyukumuku/shiny.pal
diff --git a/graphics/pokemon/ribombee/anim_front.png b/graphics/pokemon/gen_7/ribombee/anim_front.png
similarity index 100%
rename from graphics/pokemon/ribombee/anim_front.png
rename to graphics/pokemon/gen_7/ribombee/anim_front.png
diff --git a/graphics/pokemon/ribombee/back.png b/graphics/pokemon/gen_7/ribombee/back.png
similarity index 100%
rename from graphics/pokemon/ribombee/back.png
rename to graphics/pokemon/gen_7/ribombee/back.png
diff --git a/graphics/pokemon/ribombee/footprint.png b/graphics/pokemon/gen_7/ribombee/footprint.png
similarity index 100%
rename from graphics/pokemon/ribombee/footprint.png
rename to graphics/pokemon/gen_7/ribombee/footprint.png
diff --git a/graphics/pokemon/ribombee/icon.png b/graphics/pokemon/gen_7/ribombee/icon.png
similarity index 100%
rename from graphics/pokemon/ribombee/icon.png
rename to graphics/pokemon/gen_7/ribombee/icon.png
diff --git a/graphics/pokemon/ribombee/normal.pal b/graphics/pokemon/gen_7/ribombee/normal.pal
similarity index 100%
rename from graphics/pokemon/ribombee/normal.pal
rename to graphics/pokemon/gen_7/ribombee/normal.pal
diff --git a/graphics/pokemon/ribombee/shiny.pal b/graphics/pokemon/gen_7/ribombee/shiny.pal
similarity index 100%
rename from graphics/pokemon/ribombee/shiny.pal
rename to graphics/pokemon/gen_7/ribombee/shiny.pal
diff --git a/graphics/pokemon/rockruff/anim_front.png b/graphics/pokemon/gen_7/rockruff/anim_front.png
similarity index 100%
rename from graphics/pokemon/rockruff/anim_front.png
rename to graphics/pokemon/gen_7/rockruff/anim_front.png
diff --git a/graphics/pokemon/rockruff/back.png b/graphics/pokemon/gen_7/rockruff/back.png
similarity index 100%
rename from graphics/pokemon/rockruff/back.png
rename to graphics/pokemon/gen_7/rockruff/back.png
diff --git a/graphics/pokemon/rockruff/footprint.png b/graphics/pokemon/gen_7/rockruff/footprint.png
similarity index 100%
rename from graphics/pokemon/rockruff/footprint.png
rename to graphics/pokemon/gen_7/rockruff/footprint.png
diff --git a/graphics/pokemon/rockruff/icon.png b/graphics/pokemon/gen_7/rockruff/icon.png
similarity index 100%
rename from graphics/pokemon/rockruff/icon.png
rename to graphics/pokemon/gen_7/rockruff/icon.png
diff --git a/graphics/pokemon/rockruff/normal.pal b/graphics/pokemon/gen_7/rockruff/normal.pal
similarity index 100%
rename from graphics/pokemon/rockruff/normal.pal
rename to graphics/pokemon/gen_7/rockruff/normal.pal
diff --git a/graphics/pokemon/rockruff/shiny.pal b/graphics/pokemon/gen_7/rockruff/shiny.pal
similarity index 100%
rename from graphics/pokemon/rockruff/shiny.pal
rename to graphics/pokemon/gen_7/rockruff/shiny.pal
diff --git a/graphics/pokemon/rowlet/anim_front.png b/graphics/pokemon/gen_7/rowlet/anim_front.png
similarity index 100%
rename from graphics/pokemon/rowlet/anim_front.png
rename to graphics/pokemon/gen_7/rowlet/anim_front.png
diff --git a/graphics/pokemon/rowlet/back.png b/graphics/pokemon/gen_7/rowlet/back.png
similarity index 100%
rename from graphics/pokemon/rowlet/back.png
rename to graphics/pokemon/gen_7/rowlet/back.png
diff --git a/graphics/pokemon/rowlet/footprint.png b/graphics/pokemon/gen_7/rowlet/footprint.png
similarity index 100%
rename from graphics/pokemon/rowlet/footprint.png
rename to graphics/pokemon/gen_7/rowlet/footprint.png
diff --git a/graphics/pokemon/rowlet/icon.png b/graphics/pokemon/gen_7/rowlet/icon.png
similarity index 100%
rename from graphics/pokemon/rowlet/icon.png
rename to graphics/pokemon/gen_7/rowlet/icon.png
diff --git a/graphics/pokemon/rowlet/normal.pal b/graphics/pokemon/gen_7/rowlet/normal.pal
similarity index 100%
rename from graphics/pokemon/rowlet/normal.pal
rename to graphics/pokemon/gen_7/rowlet/normal.pal
diff --git a/graphics/pokemon/rowlet/shiny.pal b/graphics/pokemon/gen_7/rowlet/shiny.pal
similarity index 100%
rename from graphics/pokemon/rowlet/shiny.pal
rename to graphics/pokemon/gen_7/rowlet/shiny.pal
diff --git a/graphics/pokemon/salandit/anim_front.png b/graphics/pokemon/gen_7/salandit/anim_front.png
similarity index 100%
rename from graphics/pokemon/salandit/anim_front.png
rename to graphics/pokemon/gen_7/salandit/anim_front.png
diff --git a/graphics/pokemon/salandit/back.png b/graphics/pokemon/gen_7/salandit/back.png
similarity index 100%
rename from graphics/pokemon/salandit/back.png
rename to graphics/pokemon/gen_7/salandit/back.png
diff --git a/graphics/pokemon/salandit/footprint.png b/graphics/pokemon/gen_7/salandit/footprint.png
similarity index 100%
rename from graphics/pokemon/salandit/footprint.png
rename to graphics/pokemon/gen_7/salandit/footprint.png
diff --git a/graphics/pokemon/salandit/icon.png b/graphics/pokemon/gen_7/salandit/icon.png
similarity index 100%
rename from graphics/pokemon/salandit/icon.png
rename to graphics/pokemon/gen_7/salandit/icon.png
diff --git a/graphics/pokemon/salandit/normal.pal b/graphics/pokemon/gen_7/salandit/normal.pal
similarity index 100%
rename from graphics/pokemon/salandit/normal.pal
rename to graphics/pokemon/gen_7/salandit/normal.pal
diff --git a/graphics/pokemon/salandit/shiny.pal b/graphics/pokemon/gen_7/salandit/shiny.pal
similarity index 100%
rename from graphics/pokemon/salandit/shiny.pal
rename to graphics/pokemon/gen_7/salandit/shiny.pal
diff --git a/graphics/pokemon/salazzle/anim_front.png b/graphics/pokemon/gen_7/salazzle/anim_front.png
similarity index 100%
rename from graphics/pokemon/salazzle/anim_front.png
rename to graphics/pokemon/gen_7/salazzle/anim_front.png
diff --git a/graphics/pokemon/salazzle/back.png b/graphics/pokemon/gen_7/salazzle/back.png
similarity index 100%
rename from graphics/pokemon/salazzle/back.png
rename to graphics/pokemon/gen_7/salazzle/back.png
diff --git a/graphics/pokemon/salazzle/footprint.png b/graphics/pokemon/gen_7/salazzle/footprint.png
similarity index 100%
rename from graphics/pokemon/salazzle/footprint.png
rename to graphics/pokemon/gen_7/salazzle/footprint.png
diff --git a/graphics/pokemon/salazzle/icon.png b/graphics/pokemon/gen_7/salazzle/icon.png
similarity index 100%
rename from graphics/pokemon/salazzle/icon.png
rename to graphics/pokemon/gen_7/salazzle/icon.png
diff --git a/graphics/pokemon/salazzle/normal.pal b/graphics/pokemon/gen_7/salazzle/normal.pal
similarity index 100%
rename from graphics/pokemon/salazzle/normal.pal
rename to graphics/pokemon/gen_7/salazzle/normal.pal
diff --git a/graphics/pokemon/salazzle/shiny.pal b/graphics/pokemon/gen_7/salazzle/shiny.pal
similarity index 100%
rename from graphics/pokemon/salazzle/shiny.pal
rename to graphics/pokemon/gen_7/salazzle/shiny.pal
diff --git a/graphics/pokemon/sandygast/back.png b/graphics/pokemon/gen_7/sandygast/back.png
similarity index 100%
rename from graphics/pokemon/sandygast/back.png
rename to graphics/pokemon/gen_7/sandygast/back.png
diff --git a/graphics/pokemon/tynamo/footprint.png b/graphics/pokemon/gen_7/sandygast/footprint.png
similarity index 100%
rename from graphics/pokemon/tynamo/footprint.png
rename to graphics/pokemon/gen_7/sandygast/footprint.png
diff --git a/graphics/pokemon/sandygast/front.png b/graphics/pokemon/gen_7/sandygast/front.png
similarity index 100%
rename from graphics/pokemon/sandygast/front.png
rename to graphics/pokemon/gen_7/sandygast/front.png
diff --git a/graphics/pokemon/sandygast/icon.png b/graphics/pokemon/gen_7/sandygast/icon.png
similarity index 100%
rename from graphics/pokemon/sandygast/icon.png
rename to graphics/pokemon/gen_7/sandygast/icon.png
diff --git a/graphics/pokemon/sandygast/normal.pal b/graphics/pokemon/gen_7/sandygast/normal.pal
similarity index 100%
rename from graphics/pokemon/sandygast/normal.pal
rename to graphics/pokemon/gen_7/sandygast/normal.pal
diff --git a/graphics/pokemon/sandygast/shiny.pal b/graphics/pokemon/gen_7/sandygast/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandygast/shiny.pal
rename to graphics/pokemon/gen_7/sandygast/shiny.pal
diff --git a/graphics/pokemon/shiinotic/back.png b/graphics/pokemon/gen_7/shiinotic/back.png
similarity index 100%
rename from graphics/pokemon/shiinotic/back.png
rename to graphics/pokemon/gen_7/shiinotic/back.png
diff --git a/graphics/pokemon/hatenna/footprint.png b/graphics/pokemon/gen_7/shiinotic/footprint.png
similarity index 100%
rename from graphics/pokemon/hatenna/footprint.png
rename to graphics/pokemon/gen_7/shiinotic/footprint.png
diff --git a/graphics/pokemon/shiinotic/front.png b/graphics/pokemon/gen_7/shiinotic/front.png
similarity index 100%
rename from graphics/pokemon/shiinotic/front.png
rename to graphics/pokemon/gen_7/shiinotic/front.png
diff --git a/graphics/pokemon/shiinotic/icon.png b/graphics/pokemon/gen_7/shiinotic/icon.png
similarity index 100%
rename from graphics/pokemon/shiinotic/icon.png
rename to graphics/pokemon/gen_7/shiinotic/icon.png
diff --git a/graphics/pokemon/shiinotic/normal.pal b/graphics/pokemon/gen_7/shiinotic/normal.pal
similarity index 100%
rename from graphics/pokemon/shiinotic/normal.pal
rename to graphics/pokemon/gen_7/shiinotic/normal.pal
diff --git a/graphics/pokemon/shiinotic/shiny.pal b/graphics/pokemon/gen_7/shiinotic/shiny.pal
similarity index 100%
rename from graphics/pokemon/shiinotic/shiny.pal
rename to graphics/pokemon/gen_7/shiinotic/shiny.pal
diff --git a/graphics/pokemon/silvally/back.png b/graphics/pokemon/gen_7/silvally/back.png
similarity index 100%
rename from graphics/pokemon/silvally/back.png
rename to graphics/pokemon/gen_7/silvally/back.png
diff --git a/graphics/pokemon/silvally/bug/normal.pal b/graphics/pokemon/gen_7/silvally/bug/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/bug/normal.pal
rename to graphics/pokemon/gen_7/silvally/bug/normal.pal
diff --git a/graphics/pokemon/silvally/bug/shiny.pal b/graphics/pokemon/gen_7/silvally/bug/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/bug/shiny.pal
rename to graphics/pokemon/gen_7/silvally/bug/shiny.pal
diff --git a/graphics/pokemon/silvally/dark/normal.pal b/graphics/pokemon/gen_7/silvally/dark/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/dark/normal.pal
rename to graphics/pokemon/gen_7/silvally/dark/normal.pal
diff --git a/graphics/pokemon/silvally/dark/shiny.pal b/graphics/pokemon/gen_7/silvally/dark/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/dark/shiny.pal
rename to graphics/pokemon/gen_7/silvally/dark/shiny.pal
diff --git a/graphics/pokemon/silvally/dragon/normal.pal b/graphics/pokemon/gen_7/silvally/dragon/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/dragon/normal.pal
rename to graphics/pokemon/gen_7/silvally/dragon/normal.pal
diff --git a/graphics/pokemon/silvally/dragon/shiny.pal b/graphics/pokemon/gen_7/silvally/dragon/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/dragon/shiny.pal
rename to graphics/pokemon/gen_7/silvally/dragon/shiny.pal
diff --git a/graphics/pokemon/silvally/electric/normal.pal b/graphics/pokemon/gen_7/silvally/electric/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/electric/normal.pal
rename to graphics/pokemon/gen_7/silvally/electric/normal.pal
diff --git a/graphics/pokemon/silvally/electric/shiny.pal b/graphics/pokemon/gen_7/silvally/electric/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/electric/shiny.pal
rename to graphics/pokemon/gen_7/silvally/electric/shiny.pal
diff --git a/graphics/pokemon/silvally/fairy/normal.pal b/graphics/pokemon/gen_7/silvally/fairy/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/fairy/normal.pal
rename to graphics/pokemon/gen_7/silvally/fairy/normal.pal
diff --git a/graphics/pokemon/silvally/fairy/shiny.pal b/graphics/pokemon/gen_7/silvally/fairy/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/fairy/shiny.pal
rename to graphics/pokemon/gen_7/silvally/fairy/shiny.pal
diff --git a/graphics/pokemon/silvally/fighting/normal.pal b/graphics/pokemon/gen_7/silvally/fighting/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/fighting/normal.pal
rename to graphics/pokemon/gen_7/silvally/fighting/normal.pal
diff --git a/graphics/pokemon/silvally/fighting/shiny.pal b/graphics/pokemon/gen_7/silvally/fighting/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/fighting/shiny.pal
rename to graphics/pokemon/gen_7/silvally/fighting/shiny.pal
diff --git a/graphics/pokemon/silvally/fire/normal.pal b/graphics/pokemon/gen_7/silvally/fire/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/fire/normal.pal
rename to graphics/pokemon/gen_7/silvally/fire/normal.pal
diff --git a/graphics/pokemon/silvally/fire/shiny.pal b/graphics/pokemon/gen_7/silvally/fire/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/fire/shiny.pal
rename to graphics/pokemon/gen_7/silvally/fire/shiny.pal
diff --git a/graphics/pokemon/silvally/flying/normal.pal b/graphics/pokemon/gen_7/silvally/flying/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/flying/normal.pal
rename to graphics/pokemon/gen_7/silvally/flying/normal.pal
diff --git a/graphics/pokemon/silvally/flying/shiny.pal b/graphics/pokemon/gen_7/silvally/flying/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/flying/shiny.pal
rename to graphics/pokemon/gen_7/silvally/flying/shiny.pal
diff --git a/graphics/pokemon/silvally/footprint.png b/graphics/pokemon/gen_7/silvally/footprint.png
similarity index 100%
rename from graphics/pokemon/silvally/footprint.png
rename to graphics/pokemon/gen_7/silvally/footprint.png
diff --git a/graphics/pokemon/silvally/front.png b/graphics/pokemon/gen_7/silvally/front.png
similarity index 100%
rename from graphics/pokemon/silvally/front.png
rename to graphics/pokemon/gen_7/silvally/front.png
diff --git a/graphics/pokemon/silvally/ghost/normal.pal b/graphics/pokemon/gen_7/silvally/ghost/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/ghost/normal.pal
rename to graphics/pokemon/gen_7/silvally/ghost/normal.pal
diff --git a/graphics/pokemon/silvally/ghost/shiny.pal b/graphics/pokemon/gen_7/silvally/ghost/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/ghost/shiny.pal
rename to graphics/pokemon/gen_7/silvally/ghost/shiny.pal
diff --git a/graphics/pokemon/silvally/grass/normal.pal b/graphics/pokemon/gen_7/silvally/grass/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/grass/normal.pal
rename to graphics/pokemon/gen_7/silvally/grass/normal.pal
diff --git a/graphics/pokemon/silvally/grass/shiny.pal b/graphics/pokemon/gen_7/silvally/grass/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/grass/shiny.pal
rename to graphics/pokemon/gen_7/silvally/grass/shiny.pal
diff --git a/graphics/pokemon/silvally/ground/normal.pal b/graphics/pokemon/gen_7/silvally/ground/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/ground/normal.pal
rename to graphics/pokemon/gen_7/silvally/ground/normal.pal
diff --git a/graphics/pokemon/silvally/ground/shiny.pal b/graphics/pokemon/gen_7/silvally/ground/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/ground/shiny.pal
rename to graphics/pokemon/gen_7/silvally/ground/shiny.pal
diff --git a/graphics/pokemon/silvally/ice/normal.pal b/graphics/pokemon/gen_7/silvally/ice/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/ice/normal.pal
rename to graphics/pokemon/gen_7/silvally/ice/normal.pal
diff --git a/graphics/pokemon/silvally/ice/shiny.pal b/graphics/pokemon/gen_7/silvally/ice/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/ice/shiny.pal
rename to graphics/pokemon/gen_7/silvally/ice/shiny.pal
diff --git a/graphics/pokemon/silvally/icon.png b/graphics/pokemon/gen_7/silvally/icon.png
similarity index 100%
rename from graphics/pokemon/silvally/icon.png
rename to graphics/pokemon/gen_7/silvally/icon.png
diff --git a/graphics/pokemon/silvally/normal.pal b/graphics/pokemon/gen_7/silvally/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/normal.pal
rename to graphics/pokemon/gen_7/silvally/normal.pal
diff --git a/graphics/pokemon/silvally/poison/normal.pal b/graphics/pokemon/gen_7/silvally/poison/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/poison/normal.pal
rename to graphics/pokemon/gen_7/silvally/poison/normal.pal
diff --git a/graphics/pokemon/silvally/poison/shiny.pal b/graphics/pokemon/gen_7/silvally/poison/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/poison/shiny.pal
rename to graphics/pokemon/gen_7/silvally/poison/shiny.pal
diff --git a/graphics/pokemon/silvally/psychic/normal.pal b/graphics/pokemon/gen_7/silvally/psychic/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/psychic/normal.pal
rename to graphics/pokemon/gen_7/silvally/psychic/normal.pal
diff --git a/graphics/pokemon/silvally/psychic/shiny.pal b/graphics/pokemon/gen_7/silvally/psychic/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/psychic/shiny.pal
rename to graphics/pokemon/gen_7/silvally/psychic/shiny.pal
diff --git a/graphics/pokemon/silvally/rock/normal.pal b/graphics/pokemon/gen_7/silvally/rock/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/rock/normal.pal
rename to graphics/pokemon/gen_7/silvally/rock/normal.pal
diff --git a/graphics/pokemon/silvally/rock/shiny.pal b/graphics/pokemon/gen_7/silvally/rock/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/rock/shiny.pal
rename to graphics/pokemon/gen_7/silvally/rock/shiny.pal
diff --git a/graphics/pokemon/silvally/shiny.pal b/graphics/pokemon/gen_7/silvally/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/shiny.pal
rename to graphics/pokemon/gen_7/silvally/shiny.pal
diff --git a/graphics/pokemon/silvally/steel/normal.pal b/graphics/pokemon/gen_7/silvally/steel/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/steel/normal.pal
rename to graphics/pokemon/gen_7/silvally/steel/normal.pal
diff --git a/graphics/pokemon/silvally/steel/shiny.pal b/graphics/pokemon/gen_7/silvally/steel/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/steel/shiny.pal
rename to graphics/pokemon/gen_7/silvally/steel/shiny.pal
diff --git a/graphics/pokemon/silvally/water/normal.pal b/graphics/pokemon/gen_7/silvally/water/normal.pal
similarity index 100%
rename from graphics/pokemon/silvally/water/normal.pal
rename to graphics/pokemon/gen_7/silvally/water/normal.pal
diff --git a/graphics/pokemon/silvally/water/shiny.pal b/graphics/pokemon/gen_7/silvally/water/shiny.pal
similarity index 100%
rename from graphics/pokemon/silvally/water/shiny.pal
rename to graphics/pokemon/gen_7/silvally/water/shiny.pal
diff --git a/graphics/pokemon/solgaleo/back.png b/graphics/pokemon/gen_7/solgaleo/back.png
similarity index 100%
rename from graphics/pokemon/solgaleo/back.png
rename to graphics/pokemon/gen_7/solgaleo/back.png
diff --git a/graphics/pokemon/solgaleo/footprint.png b/graphics/pokemon/gen_7/solgaleo/footprint.png
similarity index 100%
rename from graphics/pokemon/solgaleo/footprint.png
rename to graphics/pokemon/gen_7/solgaleo/footprint.png
diff --git a/graphics/pokemon/solgaleo/front.png b/graphics/pokemon/gen_7/solgaleo/front.png
similarity index 100%
rename from graphics/pokemon/solgaleo/front.png
rename to graphics/pokemon/gen_7/solgaleo/front.png
diff --git a/graphics/pokemon/solgaleo/icon.png b/graphics/pokemon/gen_7/solgaleo/icon.png
similarity index 100%
rename from graphics/pokemon/solgaleo/icon.png
rename to graphics/pokemon/gen_7/solgaleo/icon.png
diff --git a/graphics/pokemon/solgaleo/normal.pal b/graphics/pokemon/gen_7/solgaleo/normal.pal
similarity index 100%
rename from graphics/pokemon/solgaleo/normal.pal
rename to graphics/pokemon/gen_7/solgaleo/normal.pal
diff --git a/graphics/pokemon/solgaleo/shiny.pal b/graphics/pokemon/gen_7/solgaleo/shiny.pal
similarity index 100%
rename from graphics/pokemon/solgaleo/shiny.pal
rename to graphics/pokemon/gen_7/solgaleo/shiny.pal
diff --git a/graphics/pokemon/stakataka/back.png b/graphics/pokemon/gen_7/stakataka/back.png
similarity index 100%
rename from graphics/pokemon/stakataka/back.png
rename to graphics/pokemon/gen_7/stakataka/back.png
diff --git a/graphics/pokemon/unown/footprint.png b/graphics/pokemon/gen_7/stakataka/footprint.png
similarity index 100%
rename from graphics/pokemon/unown/footprint.png
rename to graphics/pokemon/gen_7/stakataka/footprint.png
diff --git a/graphics/pokemon/stakataka/front.png b/graphics/pokemon/gen_7/stakataka/front.png
similarity index 100%
rename from graphics/pokemon/stakataka/front.png
rename to graphics/pokemon/gen_7/stakataka/front.png
diff --git a/graphics/pokemon/stakataka/icon.png b/graphics/pokemon/gen_7/stakataka/icon.png
similarity index 100%
rename from graphics/pokemon/stakataka/icon.png
rename to graphics/pokemon/gen_7/stakataka/icon.png
diff --git a/graphics/pokemon/stakataka/normal.pal b/graphics/pokemon/gen_7/stakataka/normal.pal
similarity index 100%
rename from graphics/pokemon/stakataka/normal.pal
rename to graphics/pokemon/gen_7/stakataka/normal.pal
diff --git a/graphics/pokemon/stakataka/shiny.pal b/graphics/pokemon/gen_7/stakataka/shiny.pal
similarity index 100%
rename from graphics/pokemon/stakataka/shiny.pal
rename to graphics/pokemon/gen_7/stakataka/shiny.pal
diff --git a/graphics/pokemon/steenee/back.png b/graphics/pokemon/gen_7/steenee/back.png
similarity index 100%
rename from graphics/pokemon/steenee/back.png
rename to graphics/pokemon/gen_7/steenee/back.png
diff --git a/graphics/pokemon/staryu/footprint.png b/graphics/pokemon/gen_7/steenee/footprint.png
similarity index 100%
rename from graphics/pokemon/staryu/footprint.png
rename to graphics/pokemon/gen_7/steenee/footprint.png
diff --git a/graphics/pokemon/steenee/front.png b/graphics/pokemon/gen_7/steenee/front.png
similarity index 100%
rename from graphics/pokemon/steenee/front.png
rename to graphics/pokemon/gen_7/steenee/front.png
diff --git a/graphics/pokemon/steenee/icon.png b/graphics/pokemon/gen_7/steenee/icon.png
similarity index 100%
rename from graphics/pokemon/steenee/icon.png
rename to graphics/pokemon/gen_7/steenee/icon.png
diff --git a/graphics/pokemon/steenee/normal.pal b/graphics/pokemon/gen_7/steenee/normal.pal
similarity index 100%
rename from graphics/pokemon/steenee/normal.pal
rename to graphics/pokemon/gen_7/steenee/normal.pal
diff --git a/graphics/pokemon/steenee/shiny.pal b/graphics/pokemon/gen_7/steenee/shiny.pal
similarity index 100%
rename from graphics/pokemon/steenee/shiny.pal
rename to graphics/pokemon/gen_7/steenee/shiny.pal
diff --git a/graphics/pokemon/stufful/anim_front.png b/graphics/pokemon/gen_7/stufful/anim_front.png
similarity index 100%
rename from graphics/pokemon/stufful/anim_front.png
rename to graphics/pokemon/gen_7/stufful/anim_front.png
diff --git a/graphics/pokemon/stufful/back.png b/graphics/pokemon/gen_7/stufful/back.png
similarity index 100%
rename from graphics/pokemon/stufful/back.png
rename to graphics/pokemon/gen_7/stufful/back.png
diff --git a/graphics/pokemon/stufful/footprint.png b/graphics/pokemon/gen_7/stufful/footprint.png
similarity index 100%
rename from graphics/pokemon/stufful/footprint.png
rename to graphics/pokemon/gen_7/stufful/footprint.png
diff --git a/graphics/pokemon/stufful/icon.png b/graphics/pokemon/gen_7/stufful/icon.png
similarity index 100%
rename from graphics/pokemon/stufful/icon.png
rename to graphics/pokemon/gen_7/stufful/icon.png
diff --git a/graphics/pokemon/stufful/normal.pal b/graphics/pokemon/gen_7/stufful/normal.pal
similarity index 100%
rename from graphics/pokemon/stufful/normal.pal
rename to graphics/pokemon/gen_7/stufful/normal.pal
diff --git a/graphics/pokemon/stufful/shiny.pal b/graphics/pokemon/gen_7/stufful/shiny.pal
similarity index 100%
rename from graphics/pokemon/stufful/shiny.pal
rename to graphics/pokemon/gen_7/stufful/shiny.pal
diff --git a/graphics/pokemon/tapu_bulu/anim_front.png b/graphics/pokemon/gen_7/tapu_bulu/anim_front.png
similarity index 100%
rename from graphics/pokemon/tapu_bulu/anim_front.png
rename to graphics/pokemon/gen_7/tapu_bulu/anim_front.png
diff --git a/graphics/pokemon/tapu_bulu/back.png b/graphics/pokemon/gen_7/tapu_bulu/back.png
similarity index 100%
rename from graphics/pokemon/tapu_bulu/back.png
rename to graphics/pokemon/gen_7/tapu_bulu/back.png
diff --git a/graphics/pokemon/vanillish/footprint.png b/graphics/pokemon/gen_7/tapu_bulu/footprint.png
similarity index 100%
rename from graphics/pokemon/vanillish/footprint.png
rename to graphics/pokemon/gen_7/tapu_bulu/footprint.png
diff --git a/graphics/pokemon/tapu_bulu/icon.png b/graphics/pokemon/gen_7/tapu_bulu/icon.png
similarity index 100%
rename from graphics/pokemon/tapu_bulu/icon.png
rename to graphics/pokemon/gen_7/tapu_bulu/icon.png
diff --git a/graphics/pokemon/tapu_bulu/normal.pal b/graphics/pokemon/gen_7/tapu_bulu/normal.pal
similarity index 100%
rename from graphics/pokemon/tapu_bulu/normal.pal
rename to graphics/pokemon/gen_7/tapu_bulu/normal.pal
diff --git a/graphics/pokemon/tapu_bulu/shiny.pal b/graphics/pokemon/gen_7/tapu_bulu/shiny.pal
similarity index 100%
rename from graphics/pokemon/tapu_bulu/shiny.pal
rename to graphics/pokemon/gen_7/tapu_bulu/shiny.pal
diff --git a/graphics/pokemon/tapu_fini/anim_front.png b/graphics/pokemon/gen_7/tapu_fini/anim_front.png
similarity index 100%
rename from graphics/pokemon/tapu_fini/anim_front.png
rename to graphics/pokemon/gen_7/tapu_fini/anim_front.png
diff --git a/graphics/pokemon/tapu_fini/back.png b/graphics/pokemon/gen_7/tapu_fini/back.png
similarity index 100%
rename from graphics/pokemon/tapu_fini/back.png
rename to graphics/pokemon/gen_7/tapu_fini/back.png
diff --git a/graphics/pokemon/vanillite/footprint.png b/graphics/pokemon/gen_7/tapu_fini/footprint.png
similarity index 100%
rename from graphics/pokemon/vanillite/footprint.png
rename to graphics/pokemon/gen_7/tapu_fini/footprint.png
diff --git a/graphics/pokemon/tapu_fini/icon.png b/graphics/pokemon/gen_7/tapu_fini/icon.png
similarity index 100%
rename from graphics/pokemon/tapu_fini/icon.png
rename to graphics/pokemon/gen_7/tapu_fini/icon.png
diff --git a/graphics/pokemon/tapu_fini/normal.pal b/graphics/pokemon/gen_7/tapu_fini/normal.pal
similarity index 100%
rename from graphics/pokemon/tapu_fini/normal.pal
rename to graphics/pokemon/gen_7/tapu_fini/normal.pal
diff --git a/graphics/pokemon/tapu_fini/shiny.pal b/graphics/pokemon/gen_7/tapu_fini/shiny.pal
similarity index 100%
rename from graphics/pokemon/tapu_fini/shiny.pal
rename to graphics/pokemon/gen_7/tapu_fini/shiny.pal
diff --git a/graphics/pokemon/tapu_koko/anim_front.png b/graphics/pokemon/gen_7/tapu_koko/anim_front.png
similarity index 100%
rename from graphics/pokemon/tapu_koko/anim_front.png
rename to graphics/pokemon/gen_7/tapu_koko/anim_front.png
diff --git a/graphics/pokemon/tapu_koko/back.png b/graphics/pokemon/gen_7/tapu_koko/back.png
similarity index 100%
rename from graphics/pokemon/tapu_koko/back.png
rename to graphics/pokemon/gen_7/tapu_koko/back.png
diff --git a/graphics/pokemon/vanilluxe/footprint.png b/graphics/pokemon/gen_7/tapu_koko/footprint.png
similarity index 100%
rename from graphics/pokemon/vanilluxe/footprint.png
rename to graphics/pokemon/gen_7/tapu_koko/footprint.png
diff --git a/graphics/pokemon/tapu_koko/icon.png b/graphics/pokemon/gen_7/tapu_koko/icon.png
similarity index 100%
rename from graphics/pokemon/tapu_koko/icon.png
rename to graphics/pokemon/gen_7/tapu_koko/icon.png
diff --git a/graphics/pokemon/tapu_koko/normal.pal b/graphics/pokemon/gen_7/tapu_koko/normal.pal
similarity index 100%
rename from graphics/pokemon/tapu_koko/normal.pal
rename to graphics/pokemon/gen_7/tapu_koko/normal.pal
diff --git a/graphics/pokemon/tapu_koko/shiny.pal b/graphics/pokemon/gen_7/tapu_koko/shiny.pal
similarity index 100%
rename from graphics/pokemon/tapu_koko/shiny.pal
rename to graphics/pokemon/gen_7/tapu_koko/shiny.pal
diff --git a/graphics/pokemon/tapu_lele/anim_front.png b/graphics/pokemon/gen_7/tapu_lele/anim_front.png
similarity index 100%
rename from graphics/pokemon/tapu_lele/anim_front.png
rename to graphics/pokemon/gen_7/tapu_lele/anim_front.png
diff --git a/graphics/pokemon/tapu_lele/back.png b/graphics/pokemon/gen_7/tapu_lele/back.png
similarity index 100%
rename from graphics/pokemon/tapu_lele/back.png
rename to graphics/pokemon/gen_7/tapu_lele/back.png
diff --git a/graphics/pokemon/vespiquen/footprint.png b/graphics/pokemon/gen_7/tapu_lele/footprint.png
similarity index 100%
rename from graphics/pokemon/vespiquen/footprint.png
rename to graphics/pokemon/gen_7/tapu_lele/footprint.png
diff --git a/graphics/pokemon/tapu_lele/icon.png b/graphics/pokemon/gen_7/tapu_lele/icon.png
similarity index 100%
rename from graphics/pokemon/tapu_lele/icon.png
rename to graphics/pokemon/gen_7/tapu_lele/icon.png
diff --git a/graphics/pokemon/tapu_lele/normal.pal b/graphics/pokemon/gen_7/tapu_lele/normal.pal
similarity index 100%
rename from graphics/pokemon/tapu_lele/normal.pal
rename to graphics/pokemon/gen_7/tapu_lele/normal.pal
diff --git a/graphics/pokemon/tapu_lele/shiny.pal b/graphics/pokemon/gen_7/tapu_lele/shiny.pal
similarity index 100%
rename from graphics/pokemon/tapu_lele/shiny.pal
rename to graphics/pokemon/gen_7/tapu_lele/shiny.pal
diff --git a/graphics/pokemon/togedemaru/anim_front.png b/graphics/pokemon/gen_7/togedemaru/anim_front.png
similarity index 100%
rename from graphics/pokemon/togedemaru/anim_front.png
rename to graphics/pokemon/gen_7/togedemaru/anim_front.png
diff --git a/graphics/pokemon/togedemaru/back.png b/graphics/pokemon/gen_7/togedemaru/back.png
similarity index 100%
rename from graphics/pokemon/togedemaru/back.png
rename to graphics/pokemon/gen_7/togedemaru/back.png
diff --git a/graphics/pokemon/impidimp/footprint.png b/graphics/pokemon/gen_7/togedemaru/footprint.png
similarity index 100%
rename from graphics/pokemon/impidimp/footprint.png
rename to graphics/pokemon/gen_7/togedemaru/footprint.png
diff --git a/graphics/pokemon/togedemaru/icon.png b/graphics/pokemon/gen_7/togedemaru/icon.png
similarity index 100%
rename from graphics/pokemon/togedemaru/icon.png
rename to graphics/pokemon/gen_7/togedemaru/icon.png
diff --git a/graphics/pokemon/togedemaru/normal.pal b/graphics/pokemon/gen_7/togedemaru/normal.pal
similarity index 100%
rename from graphics/pokemon/togedemaru/normal.pal
rename to graphics/pokemon/gen_7/togedemaru/normal.pal
diff --git a/graphics/pokemon/togedemaru/shiny.pal b/graphics/pokemon/gen_7/togedemaru/shiny.pal
similarity index 100%
rename from graphics/pokemon/togedemaru/shiny.pal
rename to graphics/pokemon/gen_7/togedemaru/shiny.pal
diff --git a/graphics/pokemon/torracat/back.png b/graphics/pokemon/gen_7/torracat/back.png
similarity index 100%
rename from graphics/pokemon/torracat/back.png
rename to graphics/pokemon/gen_7/torracat/back.png
diff --git a/graphics/pokemon/torracat/footprint.png b/graphics/pokemon/gen_7/torracat/footprint.png
similarity index 100%
rename from graphics/pokemon/torracat/footprint.png
rename to graphics/pokemon/gen_7/torracat/footprint.png
diff --git a/graphics/pokemon/torracat/front.png b/graphics/pokemon/gen_7/torracat/front.png
similarity index 100%
rename from graphics/pokemon/torracat/front.png
rename to graphics/pokemon/gen_7/torracat/front.png
diff --git a/graphics/pokemon/torracat/icon.png b/graphics/pokemon/gen_7/torracat/icon.png
similarity index 100%
rename from graphics/pokemon/torracat/icon.png
rename to graphics/pokemon/gen_7/torracat/icon.png
diff --git a/graphics/pokemon/torracat/normal.pal b/graphics/pokemon/gen_7/torracat/normal.pal
similarity index 100%
rename from graphics/pokemon/torracat/normal.pal
rename to graphics/pokemon/gen_7/torracat/normal.pal
diff --git a/graphics/pokemon/torracat/shiny.pal b/graphics/pokemon/gen_7/torracat/shiny.pal
similarity index 100%
rename from graphics/pokemon/torracat/shiny.pal
rename to graphics/pokemon/gen_7/torracat/shiny.pal
diff --git a/graphics/pokemon/toucannon/anim_front.png b/graphics/pokemon/gen_7/toucannon/anim_front.png
similarity index 100%
rename from graphics/pokemon/toucannon/anim_front.png
rename to graphics/pokemon/gen_7/toucannon/anim_front.png
diff --git a/graphics/pokemon/toucannon/back.png b/graphics/pokemon/gen_7/toucannon/back.png
similarity index 100%
rename from graphics/pokemon/toucannon/back.png
rename to graphics/pokemon/gen_7/toucannon/back.png
diff --git a/graphics/pokemon/toucannon/footprint.png b/graphics/pokemon/gen_7/toucannon/footprint.png
similarity index 100%
rename from graphics/pokemon/toucannon/footprint.png
rename to graphics/pokemon/gen_7/toucannon/footprint.png
diff --git a/graphics/pokemon/toucannon/icon.png b/graphics/pokemon/gen_7/toucannon/icon.png
similarity index 100%
rename from graphics/pokemon/toucannon/icon.png
rename to graphics/pokemon/gen_7/toucannon/icon.png
diff --git a/graphics/pokemon/toucannon/normal.pal b/graphics/pokemon/gen_7/toucannon/normal.pal
similarity index 100%
rename from graphics/pokemon/toucannon/normal.pal
rename to graphics/pokemon/gen_7/toucannon/normal.pal
diff --git a/graphics/pokemon/toucannon/shiny.pal b/graphics/pokemon/gen_7/toucannon/shiny.pal
similarity index 100%
rename from graphics/pokemon/toucannon/shiny.pal
rename to graphics/pokemon/gen_7/toucannon/shiny.pal
diff --git a/graphics/pokemon/toxapex/back.png b/graphics/pokemon/gen_7/toxapex/back.png
similarity index 100%
rename from graphics/pokemon/toxapex/back.png
rename to graphics/pokemon/gen_7/toxapex/back.png
diff --git a/graphics/pokemon/toxapex/footprint.png b/graphics/pokemon/gen_7/toxapex/footprint.png
similarity index 100%
rename from graphics/pokemon/toxapex/footprint.png
rename to graphics/pokemon/gen_7/toxapex/footprint.png
diff --git a/graphics/pokemon/toxapex/front.png b/graphics/pokemon/gen_7/toxapex/front.png
similarity index 100%
rename from graphics/pokemon/toxapex/front.png
rename to graphics/pokemon/gen_7/toxapex/front.png
diff --git a/graphics/pokemon/toxapex/icon.png b/graphics/pokemon/gen_7/toxapex/icon.png
similarity index 100%
rename from graphics/pokemon/toxapex/icon.png
rename to graphics/pokemon/gen_7/toxapex/icon.png
diff --git a/graphics/pokemon/toxapex/normal.pal b/graphics/pokemon/gen_7/toxapex/normal.pal
similarity index 100%
rename from graphics/pokemon/toxapex/normal.pal
rename to graphics/pokemon/gen_7/toxapex/normal.pal
diff --git a/graphics/pokemon/toxapex/shiny.pal b/graphics/pokemon/gen_7/toxapex/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxapex/shiny.pal
rename to graphics/pokemon/gen_7/toxapex/shiny.pal
diff --git a/graphics/pokemon/trumbeak/anim_front.png b/graphics/pokemon/gen_7/trumbeak/anim_front.png
similarity index 100%
rename from graphics/pokemon/trumbeak/anim_front.png
rename to graphics/pokemon/gen_7/trumbeak/anim_front.png
diff --git a/graphics/pokemon/trumbeak/back.png b/graphics/pokemon/gen_7/trumbeak/back.png
similarity index 100%
rename from graphics/pokemon/trumbeak/back.png
rename to graphics/pokemon/gen_7/trumbeak/back.png
diff --git a/graphics/pokemon/trumbeak/footprint.png b/graphics/pokemon/gen_7/trumbeak/footprint.png
similarity index 100%
rename from graphics/pokemon/trumbeak/footprint.png
rename to graphics/pokemon/gen_7/trumbeak/footprint.png
diff --git a/graphics/pokemon/trumbeak/icon.png b/graphics/pokemon/gen_7/trumbeak/icon.png
similarity index 100%
rename from graphics/pokemon/trumbeak/icon.png
rename to graphics/pokemon/gen_7/trumbeak/icon.png
diff --git a/graphics/pokemon/trumbeak/normal.pal b/graphics/pokemon/gen_7/trumbeak/normal.pal
similarity index 100%
rename from graphics/pokemon/trumbeak/normal.pal
rename to graphics/pokemon/gen_7/trumbeak/normal.pal
diff --git a/graphics/pokemon/trumbeak/shiny.pal b/graphics/pokemon/gen_7/trumbeak/shiny.pal
similarity index 100%
rename from graphics/pokemon/trumbeak/shiny.pal
rename to graphics/pokemon/gen_7/trumbeak/shiny.pal
diff --git a/graphics/pokemon/tsareena/back.png b/graphics/pokemon/gen_7/tsareena/back.png
similarity index 100%
rename from graphics/pokemon/tsareena/back.png
rename to graphics/pokemon/gen_7/tsareena/back.png
diff --git a/graphics/pokemon/steenee/footprint.png b/graphics/pokemon/gen_7/tsareena/footprint.png
similarity index 100%
rename from graphics/pokemon/steenee/footprint.png
rename to graphics/pokemon/gen_7/tsareena/footprint.png
diff --git a/graphics/pokemon/tsareena/front.png b/graphics/pokemon/gen_7/tsareena/front.png
similarity index 100%
rename from graphics/pokemon/tsareena/front.png
rename to graphics/pokemon/gen_7/tsareena/front.png
diff --git a/graphics/pokemon/tsareena/icon.png b/graphics/pokemon/gen_7/tsareena/icon.png
similarity index 100%
rename from graphics/pokemon/tsareena/icon.png
rename to graphics/pokemon/gen_7/tsareena/icon.png
diff --git a/graphics/pokemon/tsareena/normal.pal b/graphics/pokemon/gen_7/tsareena/normal.pal
similarity index 100%
rename from graphics/pokemon/tsareena/normal.pal
rename to graphics/pokemon/gen_7/tsareena/normal.pal
diff --git a/graphics/pokemon/tsareena/shiny.pal b/graphics/pokemon/gen_7/tsareena/shiny.pal
similarity index 100%
rename from graphics/pokemon/tsareena/shiny.pal
rename to graphics/pokemon/gen_7/tsareena/shiny.pal
diff --git a/graphics/pokemon/turtonator/anim_front.png b/graphics/pokemon/gen_7/turtonator/anim_front.png
similarity index 100%
rename from graphics/pokemon/turtonator/anim_front.png
rename to graphics/pokemon/gen_7/turtonator/anim_front.png
diff --git a/graphics/pokemon/turtonator/back.png b/graphics/pokemon/gen_7/turtonator/back.png
similarity index 100%
rename from graphics/pokemon/turtonator/back.png
rename to graphics/pokemon/gen_7/turtonator/back.png
diff --git a/graphics/pokemon/turtonator/footprint.png b/graphics/pokemon/gen_7/turtonator/footprint.png
similarity index 100%
rename from graphics/pokemon/turtonator/footprint.png
rename to graphics/pokemon/gen_7/turtonator/footprint.png
diff --git a/graphics/pokemon/turtonator/icon.png b/graphics/pokemon/gen_7/turtonator/icon.png
similarity index 100%
rename from graphics/pokemon/turtonator/icon.png
rename to graphics/pokemon/gen_7/turtonator/icon.png
diff --git a/graphics/pokemon/turtonator/normal.pal b/graphics/pokemon/gen_7/turtonator/normal.pal
similarity index 100%
rename from graphics/pokemon/turtonator/normal.pal
rename to graphics/pokemon/gen_7/turtonator/normal.pal
diff --git a/graphics/pokemon/turtonator/shiny.pal b/graphics/pokemon/gen_7/turtonator/shiny.pal
similarity index 100%
rename from graphics/pokemon/turtonator/shiny.pal
rename to graphics/pokemon/gen_7/turtonator/shiny.pal
diff --git a/graphics/pokemon/type_null/back.png b/graphics/pokemon/gen_7/type_null/back.png
similarity index 100%
rename from graphics/pokemon/type_null/back.png
rename to graphics/pokemon/gen_7/type_null/back.png
diff --git a/graphics/pokemon/type_null/footprint.png b/graphics/pokemon/gen_7/type_null/footprint.png
similarity index 100%
rename from graphics/pokemon/type_null/footprint.png
rename to graphics/pokemon/gen_7/type_null/footprint.png
diff --git a/graphics/pokemon/type_null/front.png b/graphics/pokemon/gen_7/type_null/front.png
similarity index 100%
rename from graphics/pokemon/type_null/front.png
rename to graphics/pokemon/gen_7/type_null/front.png
diff --git a/graphics/pokemon/type_null/icon.png b/graphics/pokemon/gen_7/type_null/icon.png
similarity index 100%
rename from graphics/pokemon/type_null/icon.png
rename to graphics/pokemon/gen_7/type_null/icon.png
diff --git a/graphics/pokemon/type_null/normal.pal b/graphics/pokemon/gen_7/type_null/normal.pal
similarity index 100%
rename from graphics/pokemon/type_null/normal.pal
rename to graphics/pokemon/gen_7/type_null/normal.pal
diff --git a/graphics/pokemon/type_null/shiny.pal b/graphics/pokemon/gen_7/type_null/shiny.pal
similarity index 100%
rename from graphics/pokemon/type_null/shiny.pal
rename to graphics/pokemon/gen_7/type_null/shiny.pal
diff --git a/graphics/pokemon/vikavolt/anim_front.png b/graphics/pokemon/gen_7/vikavolt/anim_front.png
similarity index 100%
rename from graphics/pokemon/vikavolt/anim_front.png
rename to graphics/pokemon/gen_7/vikavolt/anim_front.png
diff --git a/graphics/pokemon/vikavolt/back.png b/graphics/pokemon/gen_7/vikavolt/back.png
similarity index 100%
rename from graphics/pokemon/vikavolt/back.png
rename to graphics/pokemon/gen_7/vikavolt/back.png
diff --git a/graphics/pokemon/vikavolt/footprint.png b/graphics/pokemon/gen_7/vikavolt/footprint.png
similarity index 100%
rename from graphics/pokemon/vikavolt/footprint.png
rename to graphics/pokemon/gen_7/vikavolt/footprint.png
diff --git a/graphics/pokemon/vikavolt/icon.png b/graphics/pokemon/gen_7/vikavolt/icon.png
similarity index 100%
rename from graphics/pokemon/vikavolt/icon.png
rename to graphics/pokemon/gen_7/vikavolt/icon.png
diff --git a/graphics/pokemon/vikavolt/normal.pal b/graphics/pokemon/gen_7/vikavolt/normal.pal
similarity index 100%
rename from graphics/pokemon/vikavolt/normal.pal
rename to graphics/pokemon/gen_7/vikavolt/normal.pal
diff --git a/graphics/pokemon/vikavolt/shiny.pal b/graphics/pokemon/gen_7/vikavolt/shiny.pal
similarity index 100%
rename from graphics/pokemon/vikavolt/shiny.pal
rename to graphics/pokemon/gen_7/vikavolt/shiny.pal
diff --git a/graphics/pokemon/wimpod/anim_front.png b/graphics/pokemon/gen_7/wimpod/anim_front.png
similarity index 100%
rename from graphics/pokemon/wimpod/anim_front.png
rename to graphics/pokemon/gen_7/wimpod/anim_front.png
diff --git a/graphics/pokemon/wimpod/back.png b/graphics/pokemon/gen_7/wimpod/back.png
similarity index 100%
rename from graphics/pokemon/wimpod/back.png
rename to graphics/pokemon/gen_7/wimpod/back.png
diff --git a/graphics/pokemon/trevenant/footprint.png b/graphics/pokemon/gen_7/wimpod/footprint.png
similarity index 100%
rename from graphics/pokemon/trevenant/footprint.png
rename to graphics/pokemon/gen_7/wimpod/footprint.png
diff --git a/graphics/pokemon/wimpod/icon.png b/graphics/pokemon/gen_7/wimpod/icon.png
similarity index 100%
rename from graphics/pokemon/wimpod/icon.png
rename to graphics/pokemon/gen_7/wimpod/icon.png
diff --git a/graphics/pokemon/wimpod/normal.pal b/graphics/pokemon/gen_7/wimpod/normal.pal
similarity index 100%
rename from graphics/pokemon/wimpod/normal.pal
rename to graphics/pokemon/gen_7/wimpod/normal.pal
diff --git a/graphics/pokemon/wimpod/shiny.pal b/graphics/pokemon/gen_7/wimpod/shiny.pal
similarity index 100%
rename from graphics/pokemon/wimpod/shiny.pal
rename to graphics/pokemon/gen_7/wimpod/shiny.pal
diff --git a/graphics/pokemon/wishiwashi/back.png b/graphics/pokemon/gen_7/wishiwashi/back.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/back.png
rename to graphics/pokemon/gen_7/wishiwashi/back.png
diff --git a/graphics/pokemon/victreebel/footprint.png b/graphics/pokemon/gen_7/wishiwashi/footprint.png
similarity index 100%
rename from graphics/pokemon/victreebel/footprint.png
rename to graphics/pokemon/gen_7/wishiwashi/footprint.png
diff --git a/graphics/pokemon/wishiwashi/front.png b/graphics/pokemon/gen_7/wishiwashi/front.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/front.png
rename to graphics/pokemon/gen_7/wishiwashi/front.png
diff --git a/graphics/pokemon/wishiwashi/icon.png b/graphics/pokemon/gen_7/wishiwashi/icon.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/icon.png
rename to graphics/pokemon/gen_7/wishiwashi/icon.png
diff --git a/graphics/pokemon/wishiwashi/normal.pal b/graphics/pokemon/gen_7/wishiwashi/normal.pal
similarity index 100%
rename from graphics/pokemon/wishiwashi/normal.pal
rename to graphics/pokemon/gen_7/wishiwashi/normal.pal
diff --git a/graphics/pokemon/wishiwashi/school/back.png b/graphics/pokemon/gen_7/wishiwashi/school/back.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/school/back.png
rename to graphics/pokemon/gen_7/wishiwashi/school/back.png
diff --git a/graphics/pokemon/wishiwashi/school/front.png b/graphics/pokemon/gen_7/wishiwashi/school/front.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/school/front.png
rename to graphics/pokemon/gen_7/wishiwashi/school/front.png
diff --git a/graphics/pokemon/wishiwashi/school/icon.png b/graphics/pokemon/gen_7/wishiwashi/school/icon.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/school/icon.png
rename to graphics/pokemon/gen_7/wishiwashi/school/icon.png
diff --git a/graphics/pokemon/wishiwashi/school/normal.pal b/graphics/pokemon/gen_7/wishiwashi/school/normal.pal
similarity index 100%
rename from graphics/pokemon/wishiwashi/school/normal.pal
rename to graphics/pokemon/gen_7/wishiwashi/school/normal.pal
diff --git a/graphics/pokemon/wishiwashi/school/shiny.pal b/graphics/pokemon/gen_7/wishiwashi/school/shiny.pal
similarity index 100%
rename from graphics/pokemon/wishiwashi/school/shiny.pal
rename to graphics/pokemon/gen_7/wishiwashi/school/shiny.pal
diff --git a/graphics/pokemon/wishiwashi/shiny.pal b/graphics/pokemon/gen_7/wishiwashi/shiny.pal
similarity index 100%
rename from graphics/pokemon/wishiwashi/shiny.pal
rename to graphics/pokemon/gen_7/wishiwashi/shiny.pal
diff --git a/graphics/pokemon/xurkitree/back.png b/graphics/pokemon/gen_7/xurkitree/back.png
similarity index 100%
rename from graphics/pokemon/xurkitree/back.png
rename to graphics/pokemon/gen_7/xurkitree/back.png
diff --git a/graphics/pokemon/xurkitree/footprint.png b/graphics/pokemon/gen_7/xurkitree/footprint.png
similarity index 100%
rename from graphics/pokemon/xurkitree/footprint.png
rename to graphics/pokemon/gen_7/xurkitree/footprint.png
diff --git a/graphics/pokemon/xurkitree/front.png b/graphics/pokemon/gen_7/xurkitree/front.png
similarity index 100%
rename from graphics/pokemon/xurkitree/front.png
rename to graphics/pokemon/gen_7/xurkitree/front.png
diff --git a/graphics/pokemon/xurkitree/icon.png b/graphics/pokemon/gen_7/xurkitree/icon.png
similarity index 100%
rename from graphics/pokemon/xurkitree/icon.png
rename to graphics/pokemon/gen_7/xurkitree/icon.png
diff --git a/graphics/pokemon/xurkitree/normal.pal b/graphics/pokemon/gen_7/xurkitree/normal.pal
similarity index 100%
rename from graphics/pokemon/xurkitree/normal.pal
rename to graphics/pokemon/gen_7/xurkitree/normal.pal
diff --git a/graphics/pokemon/xurkitree/shiny.pal b/graphics/pokemon/gen_7/xurkitree/shiny.pal
similarity index 100%
rename from graphics/pokemon/xurkitree/shiny.pal
rename to graphics/pokemon/gen_7/xurkitree/shiny.pal
diff --git a/graphics/pokemon/yungoos/back.png b/graphics/pokemon/gen_7/yungoos/back.png
similarity index 100%
rename from graphics/pokemon/yungoos/back.png
rename to graphics/pokemon/gen_7/yungoos/back.png
diff --git a/graphics/pokemon/yungoos/footprint.png b/graphics/pokemon/gen_7/yungoos/footprint.png
similarity index 100%
rename from graphics/pokemon/yungoos/footprint.png
rename to graphics/pokemon/gen_7/yungoos/footprint.png
diff --git a/graphics/pokemon/yungoos/front.png b/graphics/pokemon/gen_7/yungoos/front.png
similarity index 100%
rename from graphics/pokemon/yungoos/front.png
rename to graphics/pokemon/gen_7/yungoos/front.png
diff --git a/graphics/pokemon/yungoos/icon.png b/graphics/pokemon/gen_7/yungoos/icon.png
similarity index 100%
rename from graphics/pokemon/yungoos/icon.png
rename to graphics/pokemon/gen_7/yungoos/icon.png
diff --git a/graphics/pokemon/yungoos/normal.pal b/graphics/pokemon/gen_7/yungoos/normal.pal
similarity index 100%
rename from graphics/pokemon/yungoos/normal.pal
rename to graphics/pokemon/gen_7/yungoos/normal.pal
diff --git a/graphics/pokemon/yungoos/shiny.pal b/graphics/pokemon/gen_7/yungoos/shiny.pal
similarity index 100%
rename from graphics/pokemon/yungoos/shiny.pal
rename to graphics/pokemon/gen_7/yungoos/shiny.pal
diff --git a/graphics/pokemon/zeraora/back.png b/graphics/pokemon/gen_7/zeraora/back.png
similarity index 100%
rename from graphics/pokemon/zeraora/back.png
rename to graphics/pokemon/gen_7/zeraora/back.png
diff --git a/graphics/pokemon/zeraora/footprint.png b/graphics/pokemon/gen_7/zeraora/footprint.png
similarity index 100%
rename from graphics/pokemon/zeraora/footprint.png
rename to graphics/pokemon/gen_7/zeraora/footprint.png
diff --git a/graphics/pokemon/zeraora/front.png b/graphics/pokemon/gen_7/zeraora/front.png
similarity index 100%
rename from graphics/pokemon/zeraora/front.png
rename to graphics/pokemon/gen_7/zeraora/front.png
diff --git a/graphics/pokemon/zeraora/icon.png b/graphics/pokemon/gen_7/zeraora/icon.png
similarity index 100%
rename from graphics/pokemon/zeraora/icon.png
rename to graphics/pokemon/gen_7/zeraora/icon.png
diff --git a/graphics/pokemon/zeraora/normal.pal b/graphics/pokemon/gen_7/zeraora/normal.pal
similarity index 100%
rename from graphics/pokemon/zeraora/normal.pal
rename to graphics/pokemon/gen_7/zeraora/normal.pal
diff --git a/graphics/pokemon/zeraora/shiny.pal b/graphics/pokemon/gen_7/zeraora/shiny.pal
similarity index 100%
rename from graphics/pokemon/zeraora/shiny.pal
rename to graphics/pokemon/gen_7/zeraora/shiny.pal
diff --git a/graphics/pokemon/alcremie/back.png b/graphics/pokemon/gen_8/alcremie/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/back.png
rename to graphics/pokemon/gen_8/alcremie/back.png
diff --git a/graphics/pokemon/alcremie/berry/back.png b/graphics/pokemon/gen_8/alcremie/berry/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/berry/back.png
rename to graphics/pokemon/gen_8/alcremie/berry/back.png
diff --git a/graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_default.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_default.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_default.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/berry/berry_shiny.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/berry/berry_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/berry/berry_shiny.pal
diff --git a/graphics/pokemon/alcremie/berry/front.png b/graphics/pokemon/gen_8/alcremie/berry/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/berry/front.png
rename to graphics/pokemon/gen_8/alcremie/berry/front.png
diff --git a/graphics/pokemon/alcremie/caramel_swirl/back.png b/graphics/pokemon/gen_8/alcremie/caramel_swirl/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/caramel_swirl/back.png
rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/back.png
diff --git a/graphics/pokemon/alcremie/caramel_swirl/front.png b/graphics/pokemon/gen_8/alcremie/caramel_swirl/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/caramel_swirl/front.png
rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/front.png
diff --git a/graphics/pokemon/alcremie/caramel_swirl/normal.pal b/graphics/pokemon/gen_8/alcremie/caramel_swirl/normal.pal
similarity index 100%
rename from graphics/pokemon/alcremie/caramel_swirl/normal.pal
rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/normal.pal
diff --git a/graphics/pokemon/alcremie/caramel_swirl/shiny.pal b/graphics/pokemon/gen_8/alcremie/caramel_swirl/shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/caramel_swirl/shiny.pal
rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/shiny.pal
diff --git a/graphics/pokemon/alcremie/clover/back.png b/graphics/pokemon/gen_8/alcremie/clover/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/clover/back.png
rename to graphics/pokemon/gen_8/alcremie/clover/back.png
diff --git a/graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_default.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_default.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_default.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/clover/clover_shiny.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/clover/clover_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/clover/clover_shiny.pal
diff --git a/graphics/pokemon/alcremie/clover/front.png b/graphics/pokemon/gen_8/alcremie/clover/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/clover/front.png
rename to graphics/pokemon/gen_8/alcremie/clover/front.png
diff --git a/graphics/pokemon/alcremie/flower/back.png b/graphics/pokemon/gen_8/alcremie/flower/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/flower/back.png
rename to graphics/pokemon/gen_8/alcremie/flower/back.png
diff --git a/graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_default.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_default.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_default.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/flower/flower_shiny.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/flower/flower_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/flower/flower_shiny.pal
diff --git a/graphics/pokemon/alcremie/flower/front.png b/graphics/pokemon/gen_8/alcremie/flower/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/flower/front.png
rename to graphics/pokemon/gen_8/alcremie/flower/front.png
diff --git a/graphics/pokemon/vivillon/footprint.png b/graphics/pokemon/gen_8/alcremie/footprint.png
similarity index 100%
rename from graphics/pokemon/vivillon/footprint.png
rename to graphics/pokemon/gen_8/alcremie/footprint.png
diff --git a/graphics/pokemon/alcremie/front.png b/graphics/pokemon/gen_8/alcremie/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/front.png
rename to graphics/pokemon/gen_8/alcremie/front.png
diff --git a/graphics/pokemon/alcremie/gigantamax/back.png b/graphics/pokemon/gen_8/alcremie/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/gigantamax/back.png
rename to graphics/pokemon/gen_8/alcremie/gigantamax/back.png
diff --git a/graphics/pokemon/alcremie/gigantamax/front.png b/graphics/pokemon/gen_8/alcremie/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/gigantamax/front.png
rename to graphics/pokemon/gen_8/alcremie/gigantamax/front.png
diff --git a/graphics/pokemon/alcremie/gigantamax/icon.png b/graphics/pokemon/gen_8/alcremie/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/alcremie/gigantamax/icon.png
rename to graphics/pokemon/gen_8/alcremie/gigantamax/icon.png
diff --git a/graphics/pokemon/alcremie/gigantamax/normal.pal b/graphics/pokemon/gen_8/alcremie/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/alcremie/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/alcremie/gigantamax/normal.pal
diff --git a/graphics/pokemon/alcremie/gigantamax/shiny.pal b/graphics/pokemon/gen_8/alcremie/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/alcremie/gigantamax/shiny.pal
diff --git a/graphics/pokemon/alcremie/icon.png b/graphics/pokemon/gen_8/alcremie/icon.png
similarity index 100%
rename from graphics/pokemon/alcremie/icon.png
rename to graphics/pokemon/gen_8/alcremie/icon.png
diff --git a/graphics/pokemon/alcremie/love/back.png b/graphics/pokemon/gen_8/alcremie/love/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/love/back.png
rename to graphics/pokemon/gen_8/alcremie/love/back.png
diff --git a/graphics/pokemon/alcremie/love/front.png b/graphics/pokemon/gen_8/alcremie/love/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/love/front.png
rename to graphics/pokemon/gen_8/alcremie/love/front.png
diff --git a/graphics/pokemon/alcremie/love/love_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/love/love_default.pal b/graphics/pokemon/gen_8/alcremie/love/love_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_default.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_default.pal
diff --git a/graphics/pokemon/alcremie/love/love_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/love/love_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/love/love_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/love/love_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/love/love_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/love/love_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/love/love_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/love/love_shiny.pal b/graphics/pokemon/gen_8/alcremie/love/love_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/love/love_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/love/love_shiny.pal
diff --git a/graphics/pokemon/alcremie/normal.pal b/graphics/pokemon/gen_8/alcremie/normal.pal
similarity index 100%
rename from graphics/pokemon/alcremie/normal.pal
rename to graphics/pokemon/gen_8/alcremie/normal.pal
diff --git a/graphics/pokemon/alcremie/rainbow_swirl/back.png b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/rainbow_swirl/back.png
rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/back.png
diff --git a/graphics/pokemon/alcremie/rainbow_swirl/front.png b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/rainbow_swirl/front.png
rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/front.png
diff --git a/graphics/pokemon/alcremie/rainbow_swirl/normal.pal b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/normal.pal
similarity index 100%
rename from graphics/pokemon/alcremie/rainbow_swirl/normal.pal
rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/normal.pal
diff --git a/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/rainbow_swirl/shiny.pal
rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/shiny.pal
diff --git a/graphics/pokemon/alcremie/ribbon/back.png b/graphics/pokemon/gen_8/alcremie/ribbon/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/back.png
rename to graphics/pokemon/gen_8/alcremie/ribbon/back.png
diff --git a/graphics/pokemon/alcremie/ribbon/front.png b/graphics/pokemon/gen_8/alcremie/ribbon/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/front.png
rename to graphics/pokemon/gen_8/alcremie/ribbon/front.png
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_default.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_default.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_shiny.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/ribbon/ribbon_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.pal
diff --git a/graphics/pokemon/alcremie/shiny.pal b/graphics/pokemon/gen_8/alcremie/shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/shiny.pal
rename to graphics/pokemon/gen_8/alcremie/shiny.pal
diff --git a/graphics/pokemon/alcremie/star/back.png b/graphics/pokemon/gen_8/alcremie/star/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/star/back.png
rename to graphics/pokemon/gen_8/alcremie/star/back.png
diff --git a/graphics/pokemon/alcremie/star/front.png b/graphics/pokemon/gen_8/alcremie/star/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/star/front.png
rename to graphics/pokemon/gen_8/alcremie/star/front.png
diff --git a/graphics/pokemon/alcremie/star/star_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/star/star_default.pal b/graphics/pokemon/gen_8/alcremie/star/star_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_default.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_default.pal
diff --git a/graphics/pokemon/alcremie/star/star_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/star/star_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/star/star_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/star/star_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/star/star_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/star/star_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/star/star_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/star/star_shiny.pal b/graphics/pokemon/gen_8/alcremie/star/star_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/star/star_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/star/star_shiny.pal
diff --git a/graphics/pokemon/alcremie/strawberry/back.png b/graphics/pokemon/gen_8/alcremie/strawberry/back.png
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/back.png
rename to graphics/pokemon/gen_8/alcremie/strawberry/back.png
diff --git a/graphics/pokemon/alcremie/strawberry/front.png b/graphics/pokemon/gen_8/alcremie/strawberry/front.png
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/front.png
rename to graphics/pokemon/gen_8/alcremie/strawberry/front.png
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_default.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_default.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.pal
diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_shiny.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.pal
similarity index 100%
rename from graphics/pokemon/alcremie/strawberry/strawberry_shiny.pal
rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.pal
diff --git a/graphics/pokemon/appletun/anim_front.png b/graphics/pokemon/gen_8/appletun/anim_front.png
similarity index 100%
rename from graphics/pokemon/appletun/anim_front.png
rename to graphics/pokemon/gen_8/appletun/anim_front.png
diff --git a/graphics/pokemon/appletun/back.png b/graphics/pokemon/gen_8/appletun/back.png
similarity index 100%
rename from graphics/pokemon/appletun/back.png
rename to graphics/pokemon/gen_8/appletun/back.png
diff --git a/graphics/pokemon/litten/footprint.png b/graphics/pokemon/gen_8/appletun/footprint.png
similarity index 100%
rename from graphics/pokemon/litten/footprint.png
rename to graphics/pokemon/gen_8/appletun/footprint.png
diff --git a/graphics/pokemon/appletun/gigantamax/back.png b/graphics/pokemon/gen_8/appletun/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/appletun/gigantamax/back.png
rename to graphics/pokemon/gen_8/appletun/gigantamax/back.png
diff --git a/graphics/pokemon/appletun/gigantamax/front.png b/graphics/pokemon/gen_8/appletun/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/appletun/gigantamax/front.png
rename to graphics/pokemon/gen_8/appletun/gigantamax/front.png
diff --git a/graphics/pokemon/appletun/gigantamax/icon.png b/graphics/pokemon/gen_8/appletun/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/appletun/gigantamax/icon.png
rename to graphics/pokemon/gen_8/appletun/gigantamax/icon.png
diff --git a/graphics/pokemon/appletun/gigantamax/normal.pal b/graphics/pokemon/gen_8/appletun/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/appletun/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/appletun/gigantamax/normal.pal
diff --git a/graphics/pokemon/appletun/gigantamax/shiny.pal b/graphics/pokemon/gen_8/appletun/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/appletun/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/appletun/gigantamax/shiny.pal
diff --git a/graphics/pokemon/appletun/icon.png b/graphics/pokemon/gen_8/appletun/icon.png
similarity index 100%
rename from graphics/pokemon/appletun/icon.png
rename to graphics/pokemon/gen_8/appletun/icon.png
diff --git a/graphics/pokemon/appletun/normal.pal b/graphics/pokemon/gen_8/appletun/normal.pal
similarity index 100%
rename from graphics/pokemon/appletun/normal.pal
rename to graphics/pokemon/gen_8/appletun/normal.pal
diff --git a/graphics/pokemon/appletun/shiny.pal b/graphics/pokemon/gen_8/appletun/shiny.pal
similarity index 100%
rename from graphics/pokemon/appletun/shiny.pal
rename to graphics/pokemon/gen_8/appletun/shiny.pal
diff --git a/graphics/pokemon/applin/anim_front.png b/graphics/pokemon/gen_8/applin/anim_front.png
similarity index 100%
rename from graphics/pokemon/applin/anim_front.png
rename to graphics/pokemon/gen_8/applin/anim_front.png
diff --git a/graphics/pokemon/applin/back.png b/graphics/pokemon/gen_8/applin/back.png
similarity index 100%
rename from graphics/pokemon/applin/back.png
rename to graphics/pokemon/gen_8/applin/back.png
diff --git a/graphics/pokemon/volcarona/footprint.png b/graphics/pokemon/gen_8/applin/footprint.png
similarity index 100%
rename from graphics/pokemon/volcarona/footprint.png
rename to graphics/pokemon/gen_8/applin/footprint.png
diff --git a/graphics/pokemon/applin/icon.png b/graphics/pokemon/gen_8/applin/icon.png
similarity index 100%
rename from graphics/pokemon/applin/icon.png
rename to graphics/pokemon/gen_8/applin/icon.png
diff --git a/graphics/pokemon/applin/normal.pal b/graphics/pokemon/gen_8/applin/normal.pal
similarity index 100%
rename from graphics/pokemon/applin/normal.pal
rename to graphics/pokemon/gen_8/applin/normal.pal
diff --git a/graphics/pokemon/applin/shiny.pal b/graphics/pokemon/gen_8/applin/shiny.pal
similarity index 100%
rename from graphics/pokemon/applin/shiny.pal
rename to graphics/pokemon/gen_8/applin/shiny.pal
diff --git a/graphics/pokemon/arctovish/back.png b/graphics/pokemon/gen_8/arctovish/back.png
similarity index 100%
rename from graphics/pokemon/arctovish/back.png
rename to graphics/pokemon/gen_8/arctovish/back.png
diff --git a/graphics/pokemon/arctozolt/footprint.png b/graphics/pokemon/gen_8/arctovish/footprint.png
similarity index 100%
rename from graphics/pokemon/arctozolt/footprint.png
rename to graphics/pokemon/gen_8/arctovish/footprint.png
diff --git a/graphics/pokemon/arctovish/front.png b/graphics/pokemon/gen_8/arctovish/front.png
similarity index 100%
rename from graphics/pokemon/arctovish/front.png
rename to graphics/pokemon/gen_8/arctovish/front.png
diff --git a/graphics/pokemon/arctovish/icon.png b/graphics/pokemon/gen_8/arctovish/icon.png
similarity index 100%
rename from graphics/pokemon/arctovish/icon.png
rename to graphics/pokemon/gen_8/arctovish/icon.png
diff --git a/graphics/pokemon/arctovish/normal.pal b/graphics/pokemon/gen_8/arctovish/normal.pal
similarity index 100%
rename from graphics/pokemon/arctovish/normal.pal
rename to graphics/pokemon/gen_8/arctovish/normal.pal
diff --git a/graphics/pokemon/arctovish/shiny.pal b/graphics/pokemon/gen_8/arctovish/shiny.pal
similarity index 100%
rename from graphics/pokemon/arctovish/shiny.pal
rename to graphics/pokemon/gen_8/arctovish/shiny.pal
diff --git a/graphics/pokemon/arctozolt/back.png b/graphics/pokemon/gen_8/arctozolt/back.png
similarity index 100%
rename from graphics/pokemon/arctozolt/back.png
rename to graphics/pokemon/gen_8/arctozolt/back.png
diff --git a/graphics/pokemon/porygon2/footprint.png b/graphics/pokemon/gen_8/arctozolt/footprint.png
similarity index 100%
rename from graphics/pokemon/porygon2/footprint.png
rename to graphics/pokemon/gen_8/arctozolt/footprint.png
diff --git a/graphics/pokemon/arctozolt/front.png b/graphics/pokemon/gen_8/arctozolt/front.png
similarity index 100%
rename from graphics/pokemon/arctozolt/front.png
rename to graphics/pokemon/gen_8/arctozolt/front.png
diff --git a/graphics/pokemon/arctozolt/icon.png b/graphics/pokemon/gen_8/arctozolt/icon.png
similarity index 100%
rename from graphics/pokemon/arctozolt/icon.png
rename to graphics/pokemon/gen_8/arctozolt/icon.png
diff --git a/graphics/pokemon/arctozolt/normal.pal b/graphics/pokemon/gen_8/arctozolt/normal.pal
similarity index 100%
rename from graphics/pokemon/arctozolt/normal.pal
rename to graphics/pokemon/gen_8/arctozolt/normal.pal
diff --git a/graphics/pokemon/arctozolt/shiny.pal b/graphics/pokemon/gen_8/arctozolt/shiny.pal
similarity index 100%
rename from graphics/pokemon/arctozolt/shiny.pal
rename to graphics/pokemon/gen_8/arctozolt/shiny.pal
diff --git a/graphics/pokemon/arrokuda/back.png b/graphics/pokemon/gen_8/arrokuda/back.png
similarity index 100%
rename from graphics/pokemon/arrokuda/back.png
rename to graphics/pokemon/gen_8/arrokuda/back.png
diff --git a/graphics/pokemon/voltorb/footprint.png b/graphics/pokemon/gen_8/arrokuda/footprint.png
similarity index 100%
rename from graphics/pokemon/voltorb/footprint.png
rename to graphics/pokemon/gen_8/arrokuda/footprint.png
diff --git a/graphics/pokemon/arrokuda/front.png b/graphics/pokemon/gen_8/arrokuda/front.png
similarity index 100%
rename from graphics/pokemon/arrokuda/front.png
rename to graphics/pokemon/gen_8/arrokuda/front.png
diff --git a/graphics/pokemon/arrokuda/icon.png b/graphics/pokemon/gen_8/arrokuda/icon.png
similarity index 100%
rename from graphics/pokemon/arrokuda/icon.png
rename to graphics/pokemon/gen_8/arrokuda/icon.png
diff --git a/graphics/pokemon/arrokuda/normal.pal b/graphics/pokemon/gen_8/arrokuda/normal.pal
similarity index 100%
rename from graphics/pokemon/arrokuda/normal.pal
rename to graphics/pokemon/gen_8/arrokuda/normal.pal
diff --git a/graphics/pokemon/arrokuda/shiny.pal b/graphics/pokemon/gen_8/arrokuda/shiny.pal
similarity index 100%
rename from graphics/pokemon/arrokuda/shiny.pal
rename to graphics/pokemon/gen_8/arrokuda/shiny.pal
diff --git a/graphics/pokemon/barraskewda/back.png b/graphics/pokemon/gen_8/barraskewda/back.png
similarity index 100%
rename from graphics/pokemon/barraskewda/back.png
rename to graphics/pokemon/gen_8/barraskewda/back.png
diff --git a/graphics/pokemon/wailmer/footprint.png b/graphics/pokemon/gen_8/barraskewda/footprint.png
similarity index 100%
rename from graphics/pokemon/wailmer/footprint.png
rename to graphics/pokemon/gen_8/barraskewda/footprint.png
diff --git a/graphics/pokemon/barraskewda/front.png b/graphics/pokemon/gen_8/barraskewda/front.png
similarity index 100%
rename from graphics/pokemon/barraskewda/front.png
rename to graphics/pokemon/gen_8/barraskewda/front.png
diff --git a/graphics/pokemon/barraskewda/icon.png b/graphics/pokemon/gen_8/barraskewda/icon.png
similarity index 100%
rename from graphics/pokemon/barraskewda/icon.png
rename to graphics/pokemon/gen_8/barraskewda/icon.png
diff --git a/graphics/pokemon/barraskewda/normal.pal b/graphics/pokemon/gen_8/barraskewda/normal.pal
similarity index 100%
rename from graphics/pokemon/barraskewda/normal.pal
rename to graphics/pokemon/gen_8/barraskewda/normal.pal
diff --git a/graphics/pokemon/barraskewda/shiny.pal b/graphics/pokemon/gen_8/barraskewda/shiny.pal
similarity index 100%
rename from graphics/pokemon/barraskewda/shiny.pal
rename to graphics/pokemon/gen_8/barraskewda/shiny.pal
diff --git a/graphics/pokemon/basculegion/back.png b/graphics/pokemon/gen_8/basculegion/back.png
similarity index 100%
rename from graphics/pokemon/basculegion/back.png
rename to graphics/pokemon/gen_8/basculegion/back.png
diff --git a/graphics/pokemon/basculegion/female/back.png b/graphics/pokemon/gen_8/basculegion/female/back.png
similarity index 100%
rename from graphics/pokemon/basculegion/female/back.png
rename to graphics/pokemon/gen_8/basculegion/female/back.png
diff --git a/graphics/pokemon/basculegion/female/front.png b/graphics/pokemon/gen_8/basculegion/female/front.png
similarity index 100%
rename from graphics/pokemon/basculegion/female/front.png
rename to graphics/pokemon/gen_8/basculegion/female/front.png
diff --git a/graphics/pokemon/basculegion/female/icon.png b/graphics/pokemon/gen_8/basculegion/female/icon.png
similarity index 100%
rename from graphics/pokemon/basculegion/female/icon.png
rename to graphics/pokemon/gen_8/basculegion/female/icon.png
diff --git a/graphics/pokemon/basculegion/female/normal.pal b/graphics/pokemon/gen_8/basculegion/female/normal.pal
similarity index 100%
rename from graphics/pokemon/basculegion/female/normal.pal
rename to graphics/pokemon/gen_8/basculegion/female/normal.pal
diff --git a/graphics/pokemon/basculegion/female/shiny.pal b/graphics/pokemon/gen_8/basculegion/female/shiny.pal
similarity index 100%
rename from graphics/pokemon/basculegion/female/shiny.pal
rename to graphics/pokemon/gen_8/basculegion/female/shiny.pal
diff --git a/graphics/pokemon/basculegion/front.png b/graphics/pokemon/gen_8/basculegion/front.png
similarity index 100%
rename from graphics/pokemon/basculegion/front.png
rename to graphics/pokemon/gen_8/basculegion/front.png
diff --git a/graphics/pokemon/basculegion/icon.png b/graphics/pokemon/gen_8/basculegion/icon.png
similarity index 100%
rename from graphics/pokemon/basculegion/icon.png
rename to graphics/pokemon/gen_8/basculegion/icon.png
diff --git a/graphics/pokemon/basculegion/normal.pal b/graphics/pokemon/gen_8/basculegion/normal.pal
similarity index 100%
rename from graphics/pokemon/basculegion/normal.pal
rename to graphics/pokemon/gen_8/basculegion/normal.pal
diff --git a/graphics/pokemon/basculegion/shiny.pal b/graphics/pokemon/gen_8/basculegion/shiny.pal
similarity index 100%
rename from graphics/pokemon/basculegion/shiny.pal
rename to graphics/pokemon/gen_8/basculegion/shiny.pal
diff --git a/graphics/pokemon/blipbug/back.png b/graphics/pokemon/gen_8/blipbug/back.png
similarity index 100%
rename from graphics/pokemon/blipbug/back.png
rename to graphics/pokemon/gen_8/blipbug/back.png
diff --git a/graphics/pokemon/tsareena/footprint.png b/graphics/pokemon/gen_8/blipbug/footprint.png
similarity index 100%
rename from graphics/pokemon/tsareena/footprint.png
rename to graphics/pokemon/gen_8/blipbug/footprint.png
diff --git a/graphics/pokemon/blipbug/front.png b/graphics/pokemon/gen_8/blipbug/front.png
similarity index 100%
rename from graphics/pokemon/blipbug/front.png
rename to graphics/pokemon/gen_8/blipbug/front.png
diff --git a/graphics/pokemon/blipbug/icon.png b/graphics/pokemon/gen_8/blipbug/icon.png
similarity index 100%
rename from graphics/pokemon/blipbug/icon.png
rename to graphics/pokemon/gen_8/blipbug/icon.png
diff --git a/graphics/pokemon/blipbug/normal.pal b/graphics/pokemon/gen_8/blipbug/normal.pal
similarity index 100%
rename from graphics/pokemon/blipbug/normal.pal
rename to graphics/pokemon/gen_8/blipbug/normal.pal
diff --git a/graphics/pokemon/blipbug/shiny.pal b/graphics/pokemon/gen_8/blipbug/shiny.pal
similarity index 100%
rename from graphics/pokemon/blipbug/shiny.pal
rename to graphics/pokemon/gen_8/blipbug/shiny.pal
diff --git a/graphics/pokemon/boltund/back.png b/graphics/pokemon/gen_8/boltund/back.png
similarity index 100%
rename from graphics/pokemon/boltund/back.png
rename to graphics/pokemon/gen_8/boltund/back.png
diff --git a/graphics/pokemon/flareon/footprint.png b/graphics/pokemon/gen_8/boltund/footprint.png
similarity index 100%
rename from graphics/pokemon/flareon/footprint.png
rename to graphics/pokemon/gen_8/boltund/footprint.png
diff --git a/graphics/pokemon/boltund/front.png b/graphics/pokemon/gen_8/boltund/front.png
similarity index 100%
rename from graphics/pokemon/boltund/front.png
rename to graphics/pokemon/gen_8/boltund/front.png
diff --git a/graphics/pokemon/boltund/icon.png b/graphics/pokemon/gen_8/boltund/icon.png
similarity index 100%
rename from graphics/pokemon/boltund/icon.png
rename to graphics/pokemon/gen_8/boltund/icon.png
diff --git a/graphics/pokemon/boltund/normal.pal b/graphics/pokemon/gen_8/boltund/normal.pal
similarity index 100%
rename from graphics/pokemon/boltund/normal.pal
rename to graphics/pokemon/gen_8/boltund/normal.pal
diff --git a/graphics/pokemon/boltund/shiny.pal b/graphics/pokemon/gen_8/boltund/shiny.pal
similarity index 100%
rename from graphics/pokemon/boltund/shiny.pal
rename to graphics/pokemon/gen_8/boltund/shiny.pal
diff --git a/graphics/pokemon/calyrex/back.png b/graphics/pokemon/gen_8/calyrex/back.png
similarity index 100%
rename from graphics/pokemon/calyrex/back.png
rename to graphics/pokemon/gen_8/calyrex/back.png
diff --git a/graphics/pokemon/venipede/footprint.png b/graphics/pokemon/gen_8/calyrex/footprint.png
similarity index 100%
rename from graphics/pokemon/venipede/footprint.png
rename to graphics/pokemon/gen_8/calyrex/footprint.png
diff --git a/graphics/pokemon/calyrex/front.png b/graphics/pokemon/gen_8/calyrex/front.png
similarity index 100%
rename from graphics/pokemon/calyrex/front.png
rename to graphics/pokemon/gen_8/calyrex/front.png
diff --git a/graphics/pokemon/calyrex/ice_rider/back.png b/graphics/pokemon/gen_8/calyrex/ice_rider/back.png
similarity index 100%
rename from graphics/pokemon/calyrex/ice_rider/back.png
rename to graphics/pokemon/gen_8/calyrex/ice_rider/back.png
diff --git a/graphics/pokemon/calyrex/ice_rider/front.png b/graphics/pokemon/gen_8/calyrex/ice_rider/front.png
similarity index 100%
rename from graphics/pokemon/calyrex/ice_rider/front.png
rename to graphics/pokemon/gen_8/calyrex/ice_rider/front.png
diff --git a/graphics/pokemon/calyrex/ice_rider/icon.png b/graphics/pokemon/gen_8/calyrex/ice_rider/icon.png
similarity index 100%
rename from graphics/pokemon/calyrex/ice_rider/icon.png
rename to graphics/pokemon/gen_8/calyrex/ice_rider/icon.png
diff --git a/graphics/pokemon/calyrex/ice_rider/normal.pal b/graphics/pokemon/gen_8/calyrex/ice_rider/normal.pal
similarity index 100%
rename from graphics/pokemon/calyrex/ice_rider/normal.pal
rename to graphics/pokemon/gen_8/calyrex/ice_rider/normal.pal
diff --git a/graphics/pokemon/calyrex/ice_rider/shiny.pal b/graphics/pokemon/gen_8/calyrex/ice_rider/shiny.pal
similarity index 100%
rename from graphics/pokemon/calyrex/ice_rider/shiny.pal
rename to graphics/pokemon/gen_8/calyrex/ice_rider/shiny.pal
diff --git a/graphics/pokemon/calyrex/icon.png b/graphics/pokemon/gen_8/calyrex/icon.png
similarity index 100%
rename from graphics/pokemon/calyrex/icon.png
rename to graphics/pokemon/gen_8/calyrex/icon.png
diff --git a/graphics/pokemon/calyrex/normal.pal b/graphics/pokemon/gen_8/calyrex/normal.pal
similarity index 100%
rename from graphics/pokemon/calyrex/normal.pal
rename to graphics/pokemon/gen_8/calyrex/normal.pal
diff --git a/graphics/pokemon/calyrex/shadow_rider/back.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/back.png
similarity index 100%
rename from graphics/pokemon/calyrex/shadow_rider/back.png
rename to graphics/pokemon/gen_8/calyrex/shadow_rider/back.png
diff --git a/graphics/pokemon/calyrex/shadow_rider/front.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/front.png
similarity index 100%
rename from graphics/pokemon/calyrex/shadow_rider/front.png
rename to graphics/pokemon/gen_8/calyrex/shadow_rider/front.png
diff --git a/graphics/pokemon/calyrex/shadow_rider/icon.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/icon.png
similarity index 100%
rename from graphics/pokemon/calyrex/shadow_rider/icon.png
rename to graphics/pokemon/gen_8/calyrex/shadow_rider/icon.png
diff --git a/graphics/pokemon/calyrex/shadow_rider/normal.pal b/graphics/pokemon/gen_8/calyrex/shadow_rider/normal.pal
similarity index 100%
rename from graphics/pokemon/calyrex/shadow_rider/normal.pal
rename to graphics/pokemon/gen_8/calyrex/shadow_rider/normal.pal
diff --git a/graphics/pokemon/calyrex/shadow_rider/shiny.pal b/graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.pal
similarity index 100%
rename from graphics/pokemon/calyrex/shadow_rider/shiny.pal
rename to graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.pal
diff --git a/graphics/pokemon/calyrex/shiny.pal b/graphics/pokemon/gen_8/calyrex/shiny.pal
similarity index 100%
rename from graphics/pokemon/calyrex/shiny.pal
rename to graphics/pokemon/gen_8/calyrex/shiny.pal
diff --git a/graphics/pokemon/carkol/anim_front.png b/graphics/pokemon/gen_8/carkol/anim_front.png
similarity index 100%
rename from graphics/pokemon/carkol/anim_front.png
rename to graphics/pokemon/gen_8/carkol/anim_front.png
diff --git a/graphics/pokemon/carkol/back.png b/graphics/pokemon/gen_8/carkol/back.png
similarity index 100%
rename from graphics/pokemon/carkol/back.png
rename to graphics/pokemon/gen_8/carkol/back.png
diff --git a/graphics/pokemon/carkol/footprint.png b/graphics/pokemon/gen_8/carkol/footprint.png
similarity index 100%
rename from graphics/pokemon/carkol/footprint.png
rename to graphics/pokemon/gen_8/carkol/footprint.png
diff --git a/graphics/pokemon/carkol/icon.png b/graphics/pokemon/gen_8/carkol/icon.png
similarity index 100%
rename from graphics/pokemon/carkol/icon.png
rename to graphics/pokemon/gen_8/carkol/icon.png
diff --git a/graphics/pokemon/carkol/normal.pal b/graphics/pokemon/gen_8/carkol/normal.pal
similarity index 100%
rename from graphics/pokemon/carkol/normal.pal
rename to graphics/pokemon/gen_8/carkol/normal.pal
diff --git a/graphics/pokemon/carkol/shiny.pal b/graphics/pokemon/gen_8/carkol/shiny.pal
similarity index 100%
rename from graphics/pokemon/carkol/shiny.pal
rename to graphics/pokemon/gen_8/carkol/shiny.pal
diff --git a/graphics/pokemon/centiskorch/anim_front.png b/graphics/pokemon/gen_8/centiskorch/anim_front.png
similarity index 100%
rename from graphics/pokemon/centiskorch/anim_front.png
rename to graphics/pokemon/gen_8/centiskorch/anim_front.png
diff --git a/graphics/pokemon/centiskorch/back.png b/graphics/pokemon/gen_8/centiskorch/back.png
similarity index 100%
rename from graphics/pokemon/centiskorch/back.png
rename to graphics/pokemon/gen_8/centiskorch/back.png
diff --git a/graphics/pokemon/weedle/footprint.png b/graphics/pokemon/gen_8/centiskorch/footprint.png
similarity index 100%
rename from graphics/pokemon/weedle/footprint.png
rename to graphics/pokemon/gen_8/centiskorch/footprint.png
diff --git a/graphics/pokemon/centiskorch/gigantamax/back.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/centiskorch/gigantamax/back.png
rename to graphics/pokemon/gen_8/centiskorch/gigantamax/back.png
diff --git a/graphics/pokemon/centiskorch/gigantamax/front.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/centiskorch/gigantamax/front.png
rename to graphics/pokemon/gen_8/centiskorch/gigantamax/front.png
diff --git a/graphics/pokemon/centiskorch/gigantamax/icon.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/centiskorch/gigantamax/icon.png
rename to graphics/pokemon/gen_8/centiskorch/gigantamax/icon.png
diff --git a/graphics/pokemon/centiskorch/gigantamax/normal.pal b/graphics/pokemon/gen_8/centiskorch/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/centiskorch/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/centiskorch/gigantamax/normal.pal
diff --git a/graphics/pokemon/centiskorch/gigantamax/shiny.pal b/graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/centiskorch/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.pal
diff --git a/graphics/pokemon/centiskorch/icon.png b/graphics/pokemon/gen_8/centiskorch/icon.png
similarity index 100%
rename from graphics/pokemon/centiskorch/icon.png
rename to graphics/pokemon/gen_8/centiskorch/icon.png
diff --git a/graphics/pokemon/centiskorch/normal.pal b/graphics/pokemon/gen_8/centiskorch/normal.pal
similarity index 100%
rename from graphics/pokemon/centiskorch/normal.pal
rename to graphics/pokemon/gen_8/centiskorch/normal.pal
diff --git a/graphics/pokemon/centiskorch/shiny.pal b/graphics/pokemon/gen_8/centiskorch/shiny.pal
similarity index 100%
rename from graphics/pokemon/centiskorch/shiny.pal
rename to graphics/pokemon/gen_8/centiskorch/shiny.pal
diff --git a/graphics/pokemon/chewtle/anim_front.png b/graphics/pokemon/gen_8/chewtle/anim_front.png
similarity index 100%
rename from graphics/pokemon/chewtle/anim_front.png
rename to graphics/pokemon/gen_8/chewtle/anim_front.png
diff --git a/graphics/pokemon/chewtle/back.png b/graphics/pokemon/gen_8/chewtle/back.png
similarity index 100%
rename from graphics/pokemon/chewtle/back.png
rename to graphics/pokemon/gen_8/chewtle/back.png
diff --git a/graphics/pokemon/clefairy/footprint.png b/graphics/pokemon/gen_8/chewtle/footprint.png
similarity index 100%
rename from graphics/pokemon/clefairy/footprint.png
rename to graphics/pokemon/gen_8/chewtle/footprint.png
diff --git a/graphics/pokemon/chewtle/icon.png b/graphics/pokemon/gen_8/chewtle/icon.png
similarity index 100%
rename from graphics/pokemon/chewtle/icon.png
rename to graphics/pokemon/gen_8/chewtle/icon.png
diff --git a/graphics/pokemon/chewtle/normal.pal b/graphics/pokemon/gen_8/chewtle/normal.pal
similarity index 100%
rename from graphics/pokemon/chewtle/normal.pal
rename to graphics/pokemon/gen_8/chewtle/normal.pal
diff --git a/graphics/pokemon/chewtle/shiny.pal b/graphics/pokemon/gen_8/chewtle/shiny.pal
similarity index 100%
rename from graphics/pokemon/chewtle/shiny.pal
rename to graphics/pokemon/gen_8/chewtle/shiny.pal
diff --git a/graphics/pokemon/cinderace/back.png b/graphics/pokemon/gen_8/cinderace/back.png
similarity index 100%
rename from graphics/pokemon/cinderace/back.png
rename to graphics/pokemon/gen_8/cinderace/back.png
diff --git a/graphics/pokemon/cinderace/footprint.png b/graphics/pokemon/gen_8/cinderace/footprint.png
similarity index 100%
rename from graphics/pokemon/cinderace/footprint.png
rename to graphics/pokemon/gen_8/cinderace/footprint.png
diff --git a/graphics/pokemon/cinderace/front.png b/graphics/pokemon/gen_8/cinderace/front.png
similarity index 100%
rename from graphics/pokemon/cinderace/front.png
rename to graphics/pokemon/gen_8/cinderace/front.png
diff --git a/graphics/pokemon/cinderace/gigantamax/back.png b/graphics/pokemon/gen_8/cinderace/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/cinderace/gigantamax/back.png
rename to graphics/pokemon/gen_8/cinderace/gigantamax/back.png
diff --git a/graphics/pokemon/cinderace/gigantamax/front.png b/graphics/pokemon/gen_8/cinderace/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/cinderace/gigantamax/front.png
rename to graphics/pokemon/gen_8/cinderace/gigantamax/front.png
diff --git a/graphics/pokemon/cinderace/gigantamax/icon.png b/graphics/pokemon/gen_8/cinderace/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/cinderace/gigantamax/icon.png
rename to graphics/pokemon/gen_8/cinderace/gigantamax/icon.png
diff --git a/graphics/pokemon/cinderace/gigantamax/normal.pal b/graphics/pokemon/gen_8/cinderace/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/cinderace/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/cinderace/gigantamax/normal.pal
diff --git a/graphics/pokemon/cinderace/gigantamax/shiny.pal b/graphics/pokemon/gen_8/cinderace/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/cinderace/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/cinderace/gigantamax/shiny.pal
diff --git a/graphics/pokemon/cinderace/icon.png b/graphics/pokemon/gen_8/cinderace/icon.png
similarity index 100%
rename from graphics/pokemon/cinderace/icon.png
rename to graphics/pokemon/gen_8/cinderace/icon.png
diff --git a/graphics/pokemon/cinderace/normal.pal b/graphics/pokemon/gen_8/cinderace/normal.pal
similarity index 100%
rename from graphics/pokemon/cinderace/normal.pal
rename to graphics/pokemon/gen_8/cinderace/normal.pal
diff --git a/graphics/pokemon/cinderace/shiny.pal b/graphics/pokemon/gen_8/cinderace/shiny.pal
similarity index 100%
rename from graphics/pokemon/cinderace/shiny.pal
rename to graphics/pokemon/gen_8/cinderace/shiny.pal
diff --git a/graphics/pokemon/clobbopus/back.png b/graphics/pokemon/gen_8/clobbopus/back.png
similarity index 100%
rename from graphics/pokemon/clobbopus/back.png
rename to graphics/pokemon/gen_8/clobbopus/back.png
diff --git a/graphics/pokemon/poliwag/footprint.png b/graphics/pokemon/gen_8/clobbopus/footprint.png
similarity index 100%
rename from graphics/pokemon/poliwag/footprint.png
rename to graphics/pokemon/gen_8/clobbopus/footprint.png
diff --git a/graphics/pokemon/clobbopus/front.png b/graphics/pokemon/gen_8/clobbopus/front.png
similarity index 100%
rename from graphics/pokemon/clobbopus/front.png
rename to graphics/pokemon/gen_8/clobbopus/front.png
diff --git a/graphics/pokemon/clobbopus/icon.png b/graphics/pokemon/gen_8/clobbopus/icon.png
similarity index 100%
rename from graphics/pokemon/clobbopus/icon.png
rename to graphics/pokemon/gen_8/clobbopus/icon.png
diff --git a/graphics/pokemon/clobbopus/normal.pal b/graphics/pokemon/gen_8/clobbopus/normal.pal
similarity index 100%
rename from graphics/pokemon/clobbopus/normal.pal
rename to graphics/pokemon/gen_8/clobbopus/normal.pal
diff --git a/graphics/pokemon/clobbopus/shiny.pal b/graphics/pokemon/gen_8/clobbopus/shiny.pal
similarity index 100%
rename from graphics/pokemon/clobbopus/shiny.pal
rename to graphics/pokemon/gen_8/clobbopus/shiny.pal
diff --git a/graphics/pokemon/coalossal/anim_front.png b/graphics/pokemon/gen_8/coalossal/anim_front.png
similarity index 100%
rename from graphics/pokemon/coalossal/anim_front.png
rename to graphics/pokemon/gen_8/coalossal/anim_front.png
diff --git a/graphics/pokemon/coalossal/back.png b/graphics/pokemon/gen_8/coalossal/back.png
similarity index 100%
rename from graphics/pokemon/coalossal/back.png
rename to graphics/pokemon/gen_8/coalossal/back.png
diff --git a/graphics/pokemon/coalossal/footprint.png b/graphics/pokemon/gen_8/coalossal/footprint.png
similarity index 100%
rename from graphics/pokemon/coalossal/footprint.png
rename to graphics/pokemon/gen_8/coalossal/footprint.png
diff --git a/graphics/pokemon/coalossal/gigantamax/back.png b/graphics/pokemon/gen_8/coalossal/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/coalossal/gigantamax/back.png
rename to graphics/pokemon/gen_8/coalossal/gigantamax/back.png
diff --git a/graphics/pokemon/coalossal/gigantamax/front.png b/graphics/pokemon/gen_8/coalossal/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/coalossal/gigantamax/front.png
rename to graphics/pokemon/gen_8/coalossal/gigantamax/front.png
diff --git a/graphics/pokemon/coalossal/gigantamax/icon.png b/graphics/pokemon/gen_8/coalossal/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/coalossal/gigantamax/icon.png
rename to graphics/pokemon/gen_8/coalossal/gigantamax/icon.png
diff --git a/graphics/pokemon/coalossal/gigantamax/normal.pal b/graphics/pokemon/gen_8/coalossal/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/coalossal/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/coalossal/gigantamax/normal.pal
diff --git a/graphics/pokemon/coalossal/gigantamax/shiny.pal b/graphics/pokemon/gen_8/coalossal/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/coalossal/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/coalossal/gigantamax/shiny.pal
diff --git a/graphics/pokemon/coalossal/icon.png b/graphics/pokemon/gen_8/coalossal/icon.png
similarity index 100%
rename from graphics/pokemon/coalossal/icon.png
rename to graphics/pokemon/gen_8/coalossal/icon.png
diff --git a/graphics/pokemon/coalossal/normal.pal b/graphics/pokemon/gen_8/coalossal/normal.pal
similarity index 100%
rename from graphics/pokemon/coalossal/normal.pal
rename to graphics/pokemon/gen_8/coalossal/normal.pal
diff --git a/graphics/pokemon/coalossal/shiny.pal b/graphics/pokemon/gen_8/coalossal/shiny.pal
similarity index 100%
rename from graphics/pokemon/coalossal/shiny.pal
rename to graphics/pokemon/gen_8/coalossal/shiny.pal
diff --git a/graphics/pokemon/copperajah/back.png b/graphics/pokemon/gen_8/copperajah/back.png
similarity index 100%
rename from graphics/pokemon/copperajah/back.png
rename to graphics/pokemon/gen_8/copperajah/back.png
diff --git a/graphics/pokemon/copperajah/footprint.png b/graphics/pokemon/gen_8/copperajah/footprint.png
similarity index 100%
rename from graphics/pokemon/copperajah/footprint.png
rename to graphics/pokemon/gen_8/copperajah/footprint.png
diff --git a/graphics/pokemon/copperajah/front.png b/graphics/pokemon/gen_8/copperajah/front.png
similarity index 100%
rename from graphics/pokemon/copperajah/front.png
rename to graphics/pokemon/gen_8/copperajah/front.png
diff --git a/graphics/pokemon/copperajah/gigantamax/back.png b/graphics/pokemon/gen_8/copperajah/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/copperajah/gigantamax/back.png
rename to graphics/pokemon/gen_8/copperajah/gigantamax/back.png
diff --git a/graphics/pokemon/copperajah/gigantamax/front.png b/graphics/pokemon/gen_8/copperajah/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/copperajah/gigantamax/front.png
rename to graphics/pokemon/gen_8/copperajah/gigantamax/front.png
diff --git a/graphics/pokemon/copperajah/gigantamax/icon.png b/graphics/pokemon/gen_8/copperajah/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/copperajah/gigantamax/icon.png
rename to graphics/pokemon/gen_8/copperajah/gigantamax/icon.png
diff --git a/graphics/pokemon/copperajah/gigantamax/normal.pal b/graphics/pokemon/gen_8/copperajah/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/copperajah/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/copperajah/gigantamax/normal.pal
diff --git a/graphics/pokemon/copperajah/gigantamax/shiny.pal b/graphics/pokemon/gen_8/copperajah/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/copperajah/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/copperajah/gigantamax/shiny.pal
diff --git a/graphics/pokemon/copperajah/icon.png b/graphics/pokemon/gen_8/copperajah/icon.png
similarity index 100%
rename from graphics/pokemon/copperajah/icon.png
rename to graphics/pokemon/gen_8/copperajah/icon.png
diff --git a/graphics/pokemon/copperajah/normal.pal b/graphics/pokemon/gen_8/copperajah/normal.pal
similarity index 100%
rename from graphics/pokemon/copperajah/normal.pal
rename to graphics/pokemon/gen_8/copperajah/normal.pal
diff --git a/graphics/pokemon/copperajah/shiny.pal b/graphics/pokemon/gen_8/copperajah/shiny.pal
similarity index 100%
rename from graphics/pokemon/copperajah/shiny.pal
rename to graphics/pokemon/gen_8/copperajah/shiny.pal
diff --git a/graphics/pokemon/corviknight/anim_front.png b/graphics/pokemon/gen_8/corviknight/anim_front.png
similarity index 100%
rename from graphics/pokemon/corviknight/anim_front.png
rename to graphics/pokemon/gen_8/corviknight/anim_front.png
diff --git a/graphics/pokemon/corviknight/back.png b/graphics/pokemon/gen_8/corviknight/back.png
similarity index 100%
rename from graphics/pokemon/corviknight/back.png
rename to graphics/pokemon/gen_8/corviknight/back.png
diff --git a/graphics/pokemon/pidgeot/footprint.png b/graphics/pokemon/gen_8/corviknight/footprint.png
similarity index 100%
rename from graphics/pokemon/pidgeot/footprint.png
rename to graphics/pokemon/gen_8/corviknight/footprint.png
diff --git a/graphics/pokemon/corviknight/gigantamax/back.png b/graphics/pokemon/gen_8/corviknight/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/corviknight/gigantamax/back.png
rename to graphics/pokemon/gen_8/corviknight/gigantamax/back.png
diff --git a/graphics/pokemon/corviknight/gigantamax/front.png b/graphics/pokemon/gen_8/corviknight/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/corviknight/gigantamax/front.png
rename to graphics/pokemon/gen_8/corviknight/gigantamax/front.png
diff --git a/graphics/pokemon/corviknight/gigantamax/icon.png b/graphics/pokemon/gen_8/corviknight/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/corviknight/gigantamax/icon.png
rename to graphics/pokemon/gen_8/corviknight/gigantamax/icon.png
diff --git a/graphics/pokemon/corviknight/gigantamax/normal.pal b/graphics/pokemon/gen_8/corviknight/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/corviknight/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/corviknight/gigantamax/normal.pal
diff --git a/graphics/pokemon/corviknight/gigantamax/shiny.pal b/graphics/pokemon/gen_8/corviknight/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/corviknight/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/corviknight/gigantamax/shiny.pal
diff --git a/graphics/pokemon/corviknight/icon.png b/graphics/pokemon/gen_8/corviknight/icon.png
similarity index 100%
rename from graphics/pokemon/corviknight/icon.png
rename to graphics/pokemon/gen_8/corviknight/icon.png
diff --git a/graphics/pokemon/corviknight/normal.pal b/graphics/pokemon/gen_8/corviknight/normal.pal
similarity index 100%
rename from graphics/pokemon/corviknight/normal.pal
rename to graphics/pokemon/gen_8/corviknight/normal.pal
diff --git a/graphics/pokemon/corviknight/shiny.pal b/graphics/pokemon/gen_8/corviknight/shiny.pal
similarity index 100%
rename from graphics/pokemon/corviknight/shiny.pal
rename to graphics/pokemon/gen_8/corviknight/shiny.pal
diff --git a/graphics/pokemon/corvisquire/anim_front.png b/graphics/pokemon/gen_8/corvisquire/anim_front.png
similarity index 100%
rename from graphics/pokemon/corvisquire/anim_front.png
rename to graphics/pokemon/gen_8/corvisquire/anim_front.png
diff --git a/graphics/pokemon/corvisquire/back.png b/graphics/pokemon/gen_8/corvisquire/back.png
similarity index 100%
rename from graphics/pokemon/corvisquire/back.png
rename to graphics/pokemon/gen_8/corvisquire/back.png
diff --git a/graphics/pokemon/pidgeotto/footprint.png b/graphics/pokemon/gen_8/corvisquire/footprint.png
similarity index 100%
rename from graphics/pokemon/pidgeotto/footprint.png
rename to graphics/pokemon/gen_8/corvisquire/footprint.png
diff --git a/graphics/pokemon/corvisquire/icon.png b/graphics/pokemon/gen_8/corvisquire/icon.png
similarity index 100%
rename from graphics/pokemon/corvisquire/icon.png
rename to graphics/pokemon/gen_8/corvisquire/icon.png
diff --git a/graphics/pokemon/corvisquire/normal.pal b/graphics/pokemon/gen_8/corvisquire/normal.pal
similarity index 100%
rename from graphics/pokemon/corvisquire/normal.pal
rename to graphics/pokemon/gen_8/corvisquire/normal.pal
diff --git a/graphics/pokemon/corvisquire/shiny.pal b/graphics/pokemon/gen_8/corvisquire/shiny.pal
similarity index 100%
rename from graphics/pokemon/corvisquire/shiny.pal
rename to graphics/pokemon/gen_8/corvisquire/shiny.pal
diff --git a/graphics/pokemon/cramorant/back.png b/graphics/pokemon/gen_8/cramorant/back.png
similarity index 100%
rename from graphics/pokemon/cramorant/back.png
rename to graphics/pokemon/gen_8/cramorant/back.png
diff --git a/graphics/pokemon/psyduck/footprint.png b/graphics/pokemon/gen_8/cramorant/footprint.png
similarity index 100%
rename from graphics/pokemon/psyduck/footprint.png
rename to graphics/pokemon/gen_8/cramorant/footprint.png
diff --git a/graphics/pokemon/cramorant/front.png b/graphics/pokemon/gen_8/cramorant/front.png
similarity index 100%
rename from graphics/pokemon/cramorant/front.png
rename to graphics/pokemon/gen_8/cramorant/front.png
diff --git a/graphics/pokemon/cramorant/gorging/back.png b/graphics/pokemon/gen_8/cramorant/gorging/back.png
similarity index 100%
rename from graphics/pokemon/cramorant/gorging/back.png
rename to graphics/pokemon/gen_8/cramorant/gorging/back.png
diff --git a/graphics/pokemon/cramorant/gorging/front.png b/graphics/pokemon/gen_8/cramorant/gorging/front.png
similarity index 100%
rename from graphics/pokemon/cramorant/gorging/front.png
rename to graphics/pokemon/gen_8/cramorant/gorging/front.png
diff --git a/graphics/pokemon/cramorant/gorging/icon.png b/graphics/pokemon/gen_8/cramorant/gorging/icon.png
similarity index 100%
rename from graphics/pokemon/cramorant/gorging/icon.png
rename to graphics/pokemon/gen_8/cramorant/gorging/icon.png
diff --git a/graphics/pokemon/cramorant/gorging/normal.pal b/graphics/pokemon/gen_8/cramorant/gorging/normal.pal
similarity index 100%
rename from graphics/pokemon/cramorant/gorging/normal.pal
rename to graphics/pokemon/gen_8/cramorant/gorging/normal.pal
diff --git a/graphics/pokemon/cramorant/gorging/shiny.pal b/graphics/pokemon/gen_8/cramorant/gorging/shiny.pal
similarity index 100%
rename from graphics/pokemon/cramorant/gorging/shiny.pal
rename to graphics/pokemon/gen_8/cramorant/gorging/shiny.pal
diff --git a/graphics/pokemon/cramorant/gulping/back.png b/graphics/pokemon/gen_8/cramorant/gulping/back.png
similarity index 100%
rename from graphics/pokemon/cramorant/gulping/back.png
rename to graphics/pokemon/gen_8/cramorant/gulping/back.png
diff --git a/graphics/pokemon/cramorant/gulping/front.png b/graphics/pokemon/gen_8/cramorant/gulping/front.png
similarity index 100%
rename from graphics/pokemon/cramorant/gulping/front.png
rename to graphics/pokemon/gen_8/cramorant/gulping/front.png
diff --git a/graphics/pokemon/cramorant/gulping/icon.png b/graphics/pokemon/gen_8/cramorant/gulping/icon.png
similarity index 100%
rename from graphics/pokemon/cramorant/gulping/icon.png
rename to graphics/pokemon/gen_8/cramorant/gulping/icon.png
diff --git a/graphics/pokemon/cramorant/gulping/normal.pal b/graphics/pokemon/gen_8/cramorant/gulping/normal.pal
similarity index 100%
rename from graphics/pokemon/cramorant/gulping/normal.pal
rename to graphics/pokemon/gen_8/cramorant/gulping/normal.pal
diff --git a/graphics/pokemon/cramorant/gulping/shiny.pal b/graphics/pokemon/gen_8/cramorant/gulping/shiny.pal
similarity index 100%
rename from graphics/pokemon/cramorant/gulping/shiny.pal
rename to graphics/pokemon/gen_8/cramorant/gulping/shiny.pal
diff --git a/graphics/pokemon/cramorant/icon.png b/graphics/pokemon/gen_8/cramorant/icon.png
similarity index 100%
rename from graphics/pokemon/cramorant/icon.png
rename to graphics/pokemon/gen_8/cramorant/icon.png
diff --git a/graphics/pokemon/cramorant/normal.pal b/graphics/pokemon/gen_8/cramorant/normal.pal
similarity index 100%
rename from graphics/pokemon/cramorant/normal.pal
rename to graphics/pokemon/gen_8/cramorant/normal.pal
diff --git a/graphics/pokemon/cramorant/shiny.pal b/graphics/pokemon/gen_8/cramorant/shiny.pal
similarity index 100%
rename from graphics/pokemon/cramorant/shiny.pal
rename to graphics/pokemon/gen_8/cramorant/shiny.pal
diff --git a/graphics/pokemon/cufant/back.png b/graphics/pokemon/gen_8/cufant/back.png
similarity index 100%
rename from graphics/pokemon/cufant/back.png
rename to graphics/pokemon/gen_8/cufant/back.png
diff --git a/graphics/pokemon/cyndaquil/footprint.png b/graphics/pokemon/gen_8/cufant/footprint.png
similarity index 100%
rename from graphics/pokemon/cyndaquil/footprint.png
rename to graphics/pokemon/gen_8/cufant/footprint.png
diff --git a/graphics/pokemon/cufant/front.png b/graphics/pokemon/gen_8/cufant/front.png
similarity index 100%
rename from graphics/pokemon/cufant/front.png
rename to graphics/pokemon/gen_8/cufant/front.png
diff --git a/graphics/pokemon/cufant/icon.png b/graphics/pokemon/gen_8/cufant/icon.png
similarity index 100%
rename from graphics/pokemon/cufant/icon.png
rename to graphics/pokemon/gen_8/cufant/icon.png
diff --git a/graphics/pokemon/cufant/normal.pal b/graphics/pokemon/gen_8/cufant/normal.pal
similarity index 100%
rename from graphics/pokemon/cufant/normal.pal
rename to graphics/pokemon/gen_8/cufant/normal.pal
diff --git a/graphics/pokemon/cufant/shiny.pal b/graphics/pokemon/gen_8/cufant/shiny.pal
similarity index 100%
rename from graphics/pokemon/cufant/shiny.pal
rename to graphics/pokemon/gen_8/cufant/shiny.pal
diff --git a/graphics/pokemon/cursola/back.png b/graphics/pokemon/gen_8/cursola/back.png
similarity index 100%
rename from graphics/pokemon/cursola/back.png
rename to graphics/pokemon/gen_8/cursola/back.png
diff --git a/graphics/pokemon/falinks/footprint.png b/graphics/pokemon/gen_8/cursola/footprint.png
similarity index 100%
rename from graphics/pokemon/falinks/footprint.png
rename to graphics/pokemon/gen_8/cursola/footprint.png
diff --git a/graphics/pokemon/cursola/front.png b/graphics/pokemon/gen_8/cursola/front.png
similarity index 100%
rename from graphics/pokemon/cursola/front.png
rename to graphics/pokemon/gen_8/cursola/front.png
diff --git a/graphics/pokemon/cursola/icon.png b/graphics/pokemon/gen_8/cursola/icon.png
similarity index 100%
rename from graphics/pokemon/cursola/icon.png
rename to graphics/pokemon/gen_8/cursola/icon.png
diff --git a/graphics/pokemon/cursola/normal.pal b/graphics/pokemon/gen_8/cursola/normal.pal
similarity index 100%
rename from graphics/pokemon/cursola/normal.pal
rename to graphics/pokemon/gen_8/cursola/normal.pal
diff --git a/graphics/pokemon/cursola/shiny.pal b/graphics/pokemon/gen_8/cursola/shiny.pal
similarity index 100%
rename from graphics/pokemon/cursola/shiny.pal
rename to graphics/pokemon/gen_8/cursola/shiny.pal
diff --git a/graphics/pokemon/dottler/back.png b/graphics/pokemon/gen_8/dottler/back.png
similarity index 100%
rename from graphics/pokemon/dottler/back.png
rename to graphics/pokemon/gen_8/dottler/back.png
diff --git a/graphics/pokemon/jumpluff/footprint.png b/graphics/pokemon/gen_8/dottler/footprint.png
similarity index 100%
rename from graphics/pokemon/jumpluff/footprint.png
rename to graphics/pokemon/gen_8/dottler/footprint.png
diff --git a/graphics/pokemon/dottler/front.png b/graphics/pokemon/gen_8/dottler/front.png
similarity index 100%
rename from graphics/pokemon/dottler/front.png
rename to graphics/pokemon/gen_8/dottler/front.png
diff --git a/graphics/pokemon/dottler/icon.png b/graphics/pokemon/gen_8/dottler/icon.png
similarity index 100%
rename from graphics/pokemon/dottler/icon.png
rename to graphics/pokemon/gen_8/dottler/icon.png
diff --git a/graphics/pokemon/dottler/normal.pal b/graphics/pokemon/gen_8/dottler/normal.pal
similarity index 100%
rename from graphics/pokemon/dottler/normal.pal
rename to graphics/pokemon/gen_8/dottler/normal.pal
diff --git a/graphics/pokemon/dottler/shiny.pal b/graphics/pokemon/gen_8/dottler/shiny.pal
similarity index 100%
rename from graphics/pokemon/dottler/shiny.pal
rename to graphics/pokemon/gen_8/dottler/shiny.pal
diff --git a/graphics/pokemon/dracovish/back.png b/graphics/pokemon/gen_8/dracovish/back.png
similarity index 100%
rename from graphics/pokemon/dracovish/back.png
rename to graphics/pokemon/gen_8/dracovish/back.png
diff --git a/graphics/pokemon/dracozolt/footprint.png b/graphics/pokemon/gen_8/dracovish/footprint.png
similarity index 100%
rename from graphics/pokemon/dracozolt/footprint.png
rename to graphics/pokemon/gen_8/dracovish/footprint.png
diff --git a/graphics/pokemon/dracovish/front.png b/graphics/pokemon/gen_8/dracovish/front.png
similarity index 100%
rename from graphics/pokemon/dracovish/front.png
rename to graphics/pokemon/gen_8/dracovish/front.png
diff --git a/graphics/pokemon/dracovish/icon.png b/graphics/pokemon/gen_8/dracovish/icon.png
similarity index 100%
rename from graphics/pokemon/dracovish/icon.png
rename to graphics/pokemon/gen_8/dracovish/icon.png
diff --git a/graphics/pokemon/dracovish/normal.pal b/graphics/pokemon/gen_8/dracovish/normal.pal
similarity index 100%
rename from graphics/pokemon/dracovish/normal.pal
rename to graphics/pokemon/gen_8/dracovish/normal.pal
diff --git a/graphics/pokemon/dracovish/shiny.pal b/graphics/pokemon/gen_8/dracovish/shiny.pal
similarity index 100%
rename from graphics/pokemon/dracovish/shiny.pal
rename to graphics/pokemon/gen_8/dracovish/shiny.pal
diff --git a/graphics/pokemon/dracozolt/back.png b/graphics/pokemon/gen_8/dracozolt/back.png
similarity index 100%
rename from graphics/pokemon/dracozolt/back.png
rename to graphics/pokemon/gen_8/dracozolt/back.png
diff --git a/graphics/pokemon/dragonite/footprint.png b/graphics/pokemon/gen_8/dracozolt/footprint.png
similarity index 100%
rename from graphics/pokemon/dragonite/footprint.png
rename to graphics/pokemon/gen_8/dracozolt/footprint.png
diff --git a/graphics/pokemon/dracozolt/front.png b/graphics/pokemon/gen_8/dracozolt/front.png
similarity index 100%
rename from graphics/pokemon/dracozolt/front.png
rename to graphics/pokemon/gen_8/dracozolt/front.png
diff --git a/graphics/pokemon/dracozolt/icon.png b/graphics/pokemon/gen_8/dracozolt/icon.png
similarity index 100%
rename from graphics/pokemon/dracozolt/icon.png
rename to graphics/pokemon/gen_8/dracozolt/icon.png
diff --git a/graphics/pokemon/dracozolt/normal.pal b/graphics/pokemon/gen_8/dracozolt/normal.pal
similarity index 100%
rename from graphics/pokemon/dracozolt/normal.pal
rename to graphics/pokemon/gen_8/dracozolt/normal.pal
diff --git a/graphics/pokemon/dracozolt/shiny.pal b/graphics/pokemon/gen_8/dracozolt/shiny.pal
similarity index 100%
rename from graphics/pokemon/dracozolt/shiny.pal
rename to graphics/pokemon/gen_8/dracozolt/shiny.pal
diff --git a/graphics/pokemon/dragapult/back.png b/graphics/pokemon/gen_8/dragapult/back.png
similarity index 100%
rename from graphics/pokemon/dragapult/back.png
rename to graphics/pokemon/gen_8/dragapult/back.png
diff --git a/graphics/pokemon/dragapult/footprint.png b/graphics/pokemon/gen_8/dragapult/footprint.png
similarity index 100%
rename from graphics/pokemon/dragapult/footprint.png
rename to graphics/pokemon/gen_8/dragapult/footprint.png
diff --git a/graphics/pokemon/dragapult/front.png b/graphics/pokemon/gen_8/dragapult/front.png
similarity index 100%
rename from graphics/pokemon/dragapult/front.png
rename to graphics/pokemon/gen_8/dragapult/front.png
diff --git a/graphics/pokemon/dragapult/icon.png b/graphics/pokemon/gen_8/dragapult/icon.png
similarity index 100%
rename from graphics/pokemon/dragapult/icon.png
rename to graphics/pokemon/gen_8/dragapult/icon.png
diff --git a/graphics/pokemon/dragapult/normal.pal b/graphics/pokemon/gen_8/dragapult/normal.pal
similarity index 100%
rename from graphics/pokemon/dragapult/normal.pal
rename to graphics/pokemon/gen_8/dragapult/normal.pal
diff --git a/graphics/pokemon/dragapult/shiny.pal b/graphics/pokemon/gen_8/dragapult/shiny.pal
similarity index 100%
rename from graphics/pokemon/dragapult/shiny.pal
rename to graphics/pokemon/gen_8/dragapult/shiny.pal
diff --git a/graphics/pokemon/drakloak/back.png b/graphics/pokemon/gen_8/drakloak/back.png
similarity index 100%
rename from graphics/pokemon/drakloak/back.png
rename to graphics/pokemon/gen_8/drakloak/back.png
diff --git a/graphics/pokemon/whimsicott/footprint.png b/graphics/pokemon/gen_8/drakloak/footprint.png
similarity index 100%
rename from graphics/pokemon/whimsicott/footprint.png
rename to graphics/pokemon/gen_8/drakloak/footprint.png
diff --git a/graphics/pokemon/drakloak/front.png b/graphics/pokemon/gen_8/drakloak/front.png
similarity index 100%
rename from graphics/pokemon/drakloak/front.png
rename to graphics/pokemon/gen_8/drakloak/front.png
diff --git a/graphics/pokemon/drakloak/icon.png b/graphics/pokemon/gen_8/drakloak/icon.png
similarity index 100%
rename from graphics/pokemon/drakloak/icon.png
rename to graphics/pokemon/gen_8/drakloak/icon.png
diff --git a/graphics/pokemon/drakloak/normal.pal b/graphics/pokemon/gen_8/drakloak/normal.pal
similarity index 100%
rename from graphics/pokemon/drakloak/normal.pal
rename to graphics/pokemon/gen_8/drakloak/normal.pal
diff --git a/graphics/pokemon/drakloak/shiny.pal b/graphics/pokemon/gen_8/drakloak/shiny.pal
similarity index 100%
rename from graphics/pokemon/drakloak/shiny.pal
rename to graphics/pokemon/gen_8/drakloak/shiny.pal
diff --git a/graphics/pokemon/drednaw/anim_front.png b/graphics/pokemon/gen_8/drednaw/anim_front.png
similarity index 100%
rename from graphics/pokemon/drednaw/anim_front.png
rename to graphics/pokemon/gen_8/drednaw/anim_front.png
diff --git a/graphics/pokemon/drednaw/back.png b/graphics/pokemon/gen_8/drednaw/back.png
similarity index 100%
rename from graphics/pokemon/drednaw/back.png
rename to graphics/pokemon/gen_8/drednaw/back.png
diff --git a/graphics/pokemon/ivysaur/footprint.png b/graphics/pokemon/gen_8/drednaw/footprint.png
similarity index 100%
rename from graphics/pokemon/ivysaur/footprint.png
rename to graphics/pokemon/gen_8/drednaw/footprint.png
diff --git a/graphics/pokemon/drednaw/gigantamax/back.png b/graphics/pokemon/gen_8/drednaw/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/drednaw/gigantamax/back.png
rename to graphics/pokemon/gen_8/drednaw/gigantamax/back.png
diff --git a/graphics/pokemon/drednaw/gigantamax/front.png b/graphics/pokemon/gen_8/drednaw/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/drednaw/gigantamax/front.png
rename to graphics/pokemon/gen_8/drednaw/gigantamax/front.png
diff --git a/graphics/pokemon/drednaw/gigantamax/icon.png b/graphics/pokemon/gen_8/drednaw/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/drednaw/gigantamax/icon.png
rename to graphics/pokemon/gen_8/drednaw/gigantamax/icon.png
diff --git a/graphics/pokemon/drednaw/gigantamax/normal.pal b/graphics/pokemon/gen_8/drednaw/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/drednaw/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/drednaw/gigantamax/normal.pal
diff --git a/graphics/pokemon/drednaw/gigantamax/shiny.pal b/graphics/pokemon/gen_8/drednaw/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/drednaw/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/drednaw/gigantamax/shiny.pal
diff --git a/graphics/pokemon/drednaw/icon.png b/graphics/pokemon/gen_8/drednaw/icon.png
similarity index 100%
rename from graphics/pokemon/drednaw/icon.png
rename to graphics/pokemon/gen_8/drednaw/icon.png
diff --git a/graphics/pokemon/drednaw/normal.pal b/graphics/pokemon/gen_8/drednaw/normal.pal
similarity index 100%
rename from graphics/pokemon/drednaw/normal.pal
rename to graphics/pokemon/gen_8/drednaw/normal.pal
diff --git a/graphics/pokemon/drednaw/shiny.pal b/graphics/pokemon/gen_8/drednaw/shiny.pal
similarity index 100%
rename from graphics/pokemon/drednaw/shiny.pal
rename to graphics/pokemon/gen_8/drednaw/shiny.pal
diff --git a/graphics/pokemon/dreepy/back.png b/graphics/pokemon/gen_8/dreepy/back.png
similarity index 100%
rename from graphics/pokemon/dreepy/back.png
rename to graphics/pokemon/gen_8/dreepy/back.png
diff --git a/graphics/pokemon/wailord/footprint.png b/graphics/pokemon/gen_8/dreepy/footprint.png
similarity index 100%
rename from graphics/pokemon/wailord/footprint.png
rename to graphics/pokemon/gen_8/dreepy/footprint.png
diff --git a/graphics/pokemon/dreepy/front.png b/graphics/pokemon/gen_8/dreepy/front.png
similarity index 100%
rename from graphics/pokemon/dreepy/front.png
rename to graphics/pokemon/gen_8/dreepy/front.png
diff --git a/graphics/pokemon/dreepy/icon.png b/graphics/pokemon/gen_8/dreepy/icon.png
similarity index 100%
rename from graphics/pokemon/dreepy/icon.png
rename to graphics/pokemon/gen_8/dreepy/icon.png
diff --git a/graphics/pokemon/dreepy/normal.pal b/graphics/pokemon/gen_8/dreepy/normal.pal
similarity index 100%
rename from graphics/pokemon/dreepy/normal.pal
rename to graphics/pokemon/gen_8/dreepy/normal.pal
diff --git a/graphics/pokemon/dreepy/shiny.pal b/graphics/pokemon/gen_8/dreepy/shiny.pal
similarity index 100%
rename from graphics/pokemon/dreepy/shiny.pal
rename to graphics/pokemon/gen_8/dreepy/shiny.pal
diff --git a/graphics/pokemon/drizzile/back.png b/graphics/pokemon/gen_8/drizzile/back.png
similarity index 100%
rename from graphics/pokemon/drizzile/back.png
rename to graphics/pokemon/gen_8/drizzile/back.png
diff --git a/graphics/pokemon/drizzile/footprint.png b/graphics/pokemon/gen_8/drizzile/footprint.png
similarity index 100%
rename from graphics/pokemon/drizzile/footprint.png
rename to graphics/pokemon/gen_8/drizzile/footprint.png
diff --git a/graphics/pokemon/drizzile/front.png b/graphics/pokemon/gen_8/drizzile/front.png
similarity index 100%
rename from graphics/pokemon/drizzile/front.png
rename to graphics/pokemon/gen_8/drizzile/front.png
diff --git a/graphics/pokemon/drizzile/icon.png b/graphics/pokemon/gen_8/drizzile/icon.png
similarity index 100%
rename from graphics/pokemon/drizzile/icon.png
rename to graphics/pokemon/gen_8/drizzile/icon.png
diff --git a/graphics/pokemon/drizzile/normal.pal b/graphics/pokemon/gen_8/drizzile/normal.pal
similarity index 100%
rename from graphics/pokemon/drizzile/normal.pal
rename to graphics/pokemon/gen_8/drizzile/normal.pal
diff --git a/graphics/pokemon/drizzile/shiny.pal b/graphics/pokemon/gen_8/drizzile/shiny.pal
similarity index 100%
rename from graphics/pokemon/drizzile/shiny.pal
rename to graphics/pokemon/gen_8/drizzile/shiny.pal
diff --git a/graphics/pokemon/dubwool/back.png b/graphics/pokemon/gen_8/dubwool/back.png
similarity index 100%
rename from graphics/pokemon/dubwool/back.png
rename to graphics/pokemon/gen_8/dubwool/back.png
diff --git a/graphics/pokemon/dubwool/footprint.png b/graphics/pokemon/gen_8/dubwool/footprint.png
similarity index 100%
rename from graphics/pokemon/dubwool/footprint.png
rename to graphics/pokemon/gen_8/dubwool/footprint.png
diff --git a/graphics/pokemon/dubwool/front.png b/graphics/pokemon/gen_8/dubwool/front.png
similarity index 100%
rename from graphics/pokemon/dubwool/front.png
rename to graphics/pokemon/gen_8/dubwool/front.png
diff --git a/graphics/pokemon/dubwool/icon.png b/graphics/pokemon/gen_8/dubwool/icon.png
similarity index 100%
rename from graphics/pokemon/dubwool/icon.png
rename to graphics/pokemon/gen_8/dubwool/icon.png
diff --git a/graphics/pokemon/dubwool/normal.pal b/graphics/pokemon/gen_8/dubwool/normal.pal
similarity index 100%
rename from graphics/pokemon/dubwool/normal.pal
rename to graphics/pokemon/gen_8/dubwool/normal.pal
diff --git a/graphics/pokemon/dubwool/shiny.pal b/graphics/pokemon/gen_8/dubwool/shiny.pal
similarity index 100%
rename from graphics/pokemon/dubwool/shiny.pal
rename to graphics/pokemon/gen_8/dubwool/shiny.pal
diff --git a/graphics/pokemon/duraludon/back.png b/graphics/pokemon/gen_8/duraludon/back.png
similarity index 100%
rename from graphics/pokemon/duraludon/back.png
rename to graphics/pokemon/gen_8/duraludon/back.png
diff --git a/graphics/pokemon/duraludon/footprint.png b/graphics/pokemon/gen_8/duraludon/footprint.png
similarity index 100%
rename from graphics/pokemon/duraludon/footprint.png
rename to graphics/pokemon/gen_8/duraludon/footprint.png
diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/gen_8/duraludon/front.png
similarity index 100%
rename from graphics/pokemon/duraludon/front.png
rename to graphics/pokemon/gen_8/duraludon/front.png
diff --git a/graphics/pokemon/duraludon/gigantamax/back.png b/graphics/pokemon/gen_8/duraludon/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/duraludon/gigantamax/back.png
rename to graphics/pokemon/gen_8/duraludon/gigantamax/back.png
diff --git a/graphics/pokemon/duraludon/gigantamax/front.png b/graphics/pokemon/gen_8/duraludon/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/duraludon/gigantamax/front.png
rename to graphics/pokemon/gen_8/duraludon/gigantamax/front.png
diff --git a/graphics/pokemon/duraludon/gigantamax/icon.png b/graphics/pokemon/gen_8/duraludon/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/duraludon/gigantamax/icon.png
rename to graphics/pokemon/gen_8/duraludon/gigantamax/icon.png
diff --git a/graphics/pokemon/duraludon/gigantamax/normal.pal b/graphics/pokemon/gen_8/duraludon/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/duraludon/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/duraludon/gigantamax/normal.pal
diff --git a/graphics/pokemon/duraludon/gigantamax/shiny.pal b/graphics/pokemon/gen_8/duraludon/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/duraludon/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/duraludon/gigantamax/shiny.pal
diff --git a/graphics/pokemon/duraludon/icon.png b/graphics/pokemon/gen_8/duraludon/icon.png
similarity index 100%
rename from graphics/pokemon/duraludon/icon.png
rename to graphics/pokemon/gen_8/duraludon/icon.png
diff --git a/graphics/pokemon/duraludon/normal.pal b/graphics/pokemon/gen_8/duraludon/normal.pal
similarity index 100%
rename from graphics/pokemon/duraludon/normal.pal
rename to graphics/pokemon/gen_8/duraludon/normal.pal
diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/gen_8/duraludon/shiny.pal
similarity index 100%
rename from graphics/pokemon/duraludon/shiny.pal
rename to graphics/pokemon/gen_8/duraludon/shiny.pal
diff --git a/graphics/pokemon/eiscue/back.png b/graphics/pokemon/gen_8/eiscue/back.png
similarity index 100%
rename from graphics/pokemon/eiscue/back.png
rename to graphics/pokemon/gen_8/eiscue/back.png
diff --git a/graphics/pokemon/eiscue/footprint.png b/graphics/pokemon/gen_8/eiscue/footprint.png
similarity index 100%
rename from graphics/pokemon/eiscue/footprint.png
rename to graphics/pokemon/gen_8/eiscue/footprint.png
diff --git a/graphics/pokemon/eiscue/front.png b/graphics/pokemon/gen_8/eiscue/front.png
similarity index 100%
rename from graphics/pokemon/eiscue/front.png
rename to graphics/pokemon/gen_8/eiscue/front.png
diff --git a/graphics/pokemon/eiscue/icon.png b/graphics/pokemon/gen_8/eiscue/icon.png
similarity index 100%
rename from graphics/pokemon/eiscue/icon.png
rename to graphics/pokemon/gen_8/eiscue/icon.png
diff --git a/graphics/pokemon/eiscue/noice_face/back.png b/graphics/pokemon/gen_8/eiscue/noice_face/back.png
similarity index 100%
rename from graphics/pokemon/eiscue/noice_face/back.png
rename to graphics/pokemon/gen_8/eiscue/noice_face/back.png
diff --git a/graphics/pokemon/eiscue/noice_face/front.png b/graphics/pokemon/gen_8/eiscue/noice_face/front.png
similarity index 100%
rename from graphics/pokemon/eiscue/noice_face/front.png
rename to graphics/pokemon/gen_8/eiscue/noice_face/front.png
diff --git a/graphics/pokemon/eiscue/noice_face/icon.png b/graphics/pokemon/gen_8/eiscue/noice_face/icon.png
similarity index 100%
rename from graphics/pokemon/eiscue/noice_face/icon.png
rename to graphics/pokemon/gen_8/eiscue/noice_face/icon.png
diff --git a/graphics/pokemon/eiscue/noice_face/normal.pal b/graphics/pokemon/gen_8/eiscue/noice_face/normal.pal
similarity index 100%
rename from graphics/pokemon/eiscue/noice_face/normal.pal
rename to graphics/pokemon/gen_8/eiscue/noice_face/normal.pal
diff --git a/graphics/pokemon/eiscue/noice_face/shiny.pal b/graphics/pokemon/gen_8/eiscue/noice_face/shiny.pal
similarity index 100%
rename from graphics/pokemon/eiscue/noice_face/shiny.pal
rename to graphics/pokemon/gen_8/eiscue/noice_face/shiny.pal
diff --git a/graphics/pokemon/eiscue/normal.pal b/graphics/pokemon/gen_8/eiscue/normal.pal
similarity index 100%
rename from graphics/pokemon/eiscue/normal.pal
rename to graphics/pokemon/gen_8/eiscue/normal.pal
diff --git a/graphics/pokemon/eiscue/shiny.pal b/graphics/pokemon/gen_8/eiscue/shiny.pal
similarity index 100%
rename from graphics/pokemon/eiscue/shiny.pal
rename to graphics/pokemon/gen_8/eiscue/shiny.pal
diff --git a/graphics/pokemon/eldegoss/back.png b/graphics/pokemon/gen_8/eldegoss/back.png
similarity index 100%
rename from graphics/pokemon/eldegoss/back.png
rename to graphics/pokemon/gen_8/eldegoss/back.png
diff --git a/graphics/pokemon/walrein/footprint.png b/graphics/pokemon/gen_8/eldegoss/footprint.png
similarity index 100%
rename from graphics/pokemon/walrein/footprint.png
rename to graphics/pokemon/gen_8/eldegoss/footprint.png
diff --git a/graphics/pokemon/eldegoss/front.png b/graphics/pokemon/gen_8/eldegoss/front.png
similarity index 100%
rename from graphics/pokemon/eldegoss/front.png
rename to graphics/pokemon/gen_8/eldegoss/front.png
diff --git a/graphics/pokemon/eldegoss/icon.png b/graphics/pokemon/gen_8/eldegoss/icon.png
similarity index 100%
rename from graphics/pokemon/eldegoss/icon.png
rename to graphics/pokemon/gen_8/eldegoss/icon.png
diff --git a/graphics/pokemon/eldegoss/normal.pal b/graphics/pokemon/gen_8/eldegoss/normal.pal
similarity index 100%
rename from graphics/pokemon/eldegoss/normal.pal
rename to graphics/pokemon/gen_8/eldegoss/normal.pal
diff --git a/graphics/pokemon/eldegoss/shiny.pal b/graphics/pokemon/gen_8/eldegoss/shiny.pal
similarity index 100%
rename from graphics/pokemon/eldegoss/shiny.pal
rename to graphics/pokemon/gen_8/eldegoss/shiny.pal
diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/gen_8/enamorus/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/enamorus/back.png
rename to graphics/pokemon/gen_8/enamorus/back.png
diff --git a/graphics/pokemon/enamorus/front.png b/graphics/pokemon/gen_8/enamorus/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/enamorus/front.png
rename to graphics/pokemon/gen_8/enamorus/front.png
diff --git a/graphics/pokemon/enamorus/icon.png b/graphics/pokemon/gen_8/enamorus/icon.png
similarity index 100%
rename from graphics/pokemon/enamorus/icon.png
rename to graphics/pokemon/gen_8/enamorus/icon.png
diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/gen_8/enamorus/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/enamorus/normal.pal
rename to graphics/pokemon/gen_8/enamorus/normal.pal
diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/gen_8/enamorus/shiny.pal
similarity index 100%
rename from graphics/pokemon/enamorus/shiny.pal
rename to graphics/pokemon/gen_8/enamorus/shiny.pal
diff --git a/graphics/pokemon/enamorus/therian/back.png b/graphics/pokemon/gen_8/enamorus/therian/back.png
similarity index 100%
rename from graphics/pokemon/enamorus/therian/back.png
rename to graphics/pokemon/gen_8/enamorus/therian/back.png
diff --git a/graphics/pokemon/enamorus/therian/front.png b/graphics/pokemon/gen_8/enamorus/therian/front.png
similarity index 100%
rename from graphics/pokemon/enamorus/therian/front.png
rename to graphics/pokemon/gen_8/enamorus/therian/front.png
diff --git a/graphics/pokemon/enamorus/therian/icon.png b/graphics/pokemon/gen_8/enamorus/therian/icon.png
similarity index 100%
rename from graphics/pokemon/enamorus/therian/icon.png
rename to graphics/pokemon/gen_8/enamorus/therian/icon.png
diff --git a/graphics/pokemon/enamorus/therian/normal.pal b/graphics/pokemon/gen_8/enamorus/therian/normal.pal
similarity index 100%
rename from graphics/pokemon/enamorus/therian/normal.pal
rename to graphics/pokemon/gen_8/enamorus/therian/normal.pal
diff --git a/graphics/pokemon/enamorus/therian/shiny.pal b/graphics/pokemon/gen_8/enamorus/therian/shiny.pal
similarity index 100%
rename from graphics/pokemon/enamorus/therian/shiny.pal
rename to graphics/pokemon/gen_8/enamorus/therian/shiny.pal
diff --git a/graphics/pokemon/eternatus/back.png b/graphics/pokemon/gen_8/eternatus/back.png
similarity index 100%
rename from graphics/pokemon/eternatus/back.png
rename to graphics/pokemon/gen_8/eternatus/back.png
diff --git a/graphics/pokemon/eternatus/eternamax/back.png b/graphics/pokemon/gen_8/eternatus/eternamax/back.png
similarity index 100%
rename from graphics/pokemon/eternatus/eternamax/back.png
rename to graphics/pokemon/gen_8/eternatus/eternamax/back.png
diff --git a/graphics/pokemon/eternatus/eternamax/front.png b/graphics/pokemon/gen_8/eternatus/eternamax/front.png
similarity index 100%
rename from graphics/pokemon/eternatus/eternamax/front.png
rename to graphics/pokemon/gen_8/eternatus/eternamax/front.png
diff --git a/graphics/pokemon/eternatus/eternamax/icon.png b/graphics/pokemon/gen_8/eternatus/eternamax/icon.png
similarity index 100%
rename from graphics/pokemon/eternatus/eternamax/icon.png
rename to graphics/pokemon/gen_8/eternatus/eternamax/icon.png
diff --git a/graphics/pokemon/eternatus/eternamax/normal.pal b/graphics/pokemon/gen_8/eternatus/eternamax/normal.pal
similarity index 100%
rename from graphics/pokemon/eternatus/eternamax/normal.pal
rename to graphics/pokemon/gen_8/eternatus/eternamax/normal.pal
diff --git a/graphics/pokemon/eternatus/eternamax/shiny.pal b/graphics/pokemon/gen_8/eternatus/eternamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/eternatus/eternamax/shiny.pal
rename to graphics/pokemon/gen_8/eternatus/eternamax/shiny.pal
diff --git a/graphics/pokemon/eternatus/footprint.png b/graphics/pokemon/gen_8/eternatus/footprint.png
similarity index 100%
rename from graphics/pokemon/eternatus/footprint.png
rename to graphics/pokemon/gen_8/eternatus/footprint.png
diff --git a/graphics/pokemon/eternatus/front.png b/graphics/pokemon/gen_8/eternatus/front.png
similarity index 100%
rename from graphics/pokemon/eternatus/front.png
rename to graphics/pokemon/gen_8/eternatus/front.png
diff --git a/graphics/pokemon/eternatus/icon.png b/graphics/pokemon/gen_8/eternatus/icon.png
similarity index 100%
rename from graphics/pokemon/eternatus/icon.png
rename to graphics/pokemon/gen_8/eternatus/icon.png
diff --git a/graphics/pokemon/eternatus/normal.pal b/graphics/pokemon/gen_8/eternatus/normal.pal
similarity index 100%
rename from graphics/pokemon/eternatus/normal.pal
rename to graphics/pokemon/gen_8/eternatus/normal.pal
diff --git a/graphics/pokemon/eternatus/shiny.pal b/graphics/pokemon/gen_8/eternatus/shiny.pal
similarity index 100%
rename from graphics/pokemon/eternatus/shiny.pal
rename to graphics/pokemon/gen_8/eternatus/shiny.pal
diff --git a/graphics/pokemon/falinks/back.png b/graphics/pokemon/gen_8/falinks/back.png
similarity index 100%
rename from graphics/pokemon/falinks/back.png
rename to graphics/pokemon/gen_8/falinks/back.png
diff --git a/graphics/pokemon/mime_jr/footprint.png b/graphics/pokemon/gen_8/falinks/footprint.png
similarity index 100%
rename from graphics/pokemon/mime_jr/footprint.png
rename to graphics/pokemon/gen_8/falinks/footprint.png
diff --git a/graphics/pokemon/falinks/front.png b/graphics/pokemon/gen_8/falinks/front.png
similarity index 100%
rename from graphics/pokemon/falinks/front.png
rename to graphics/pokemon/gen_8/falinks/front.png
diff --git a/graphics/pokemon/falinks/icon.png b/graphics/pokemon/gen_8/falinks/icon.png
similarity index 100%
rename from graphics/pokemon/falinks/icon.png
rename to graphics/pokemon/gen_8/falinks/icon.png
diff --git a/graphics/pokemon/falinks/normal.pal b/graphics/pokemon/gen_8/falinks/normal.pal
similarity index 100%
rename from graphics/pokemon/falinks/normal.pal
rename to graphics/pokemon/gen_8/falinks/normal.pal
diff --git a/graphics/pokemon/falinks/shiny.pal b/graphics/pokemon/gen_8/falinks/shiny.pal
similarity index 100%
rename from graphics/pokemon/falinks/shiny.pal
rename to graphics/pokemon/gen_8/falinks/shiny.pal
diff --git a/graphics/pokemon/flapple/anim_front.png b/graphics/pokemon/gen_8/flapple/anim_front.png
similarity index 100%
rename from graphics/pokemon/flapple/anim_front.png
rename to graphics/pokemon/gen_8/flapple/anim_front.png
diff --git a/graphics/pokemon/flapple/back.png b/graphics/pokemon/gen_8/flapple/back.png
similarity index 100%
rename from graphics/pokemon/flapple/back.png
rename to graphics/pokemon/gen_8/flapple/back.png
diff --git a/graphics/pokemon/weepinbell/footprint.png b/graphics/pokemon/gen_8/flapple/footprint.png
similarity index 100%
rename from graphics/pokemon/weepinbell/footprint.png
rename to graphics/pokemon/gen_8/flapple/footprint.png
diff --git a/graphics/pokemon/flapple/gigantamax/back.png b/graphics/pokemon/gen_8/flapple/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/flapple/gigantamax/back.png
rename to graphics/pokemon/gen_8/flapple/gigantamax/back.png
diff --git a/graphics/pokemon/flapple/gigantamax/front.png b/graphics/pokemon/gen_8/flapple/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/flapple/gigantamax/front.png
rename to graphics/pokemon/gen_8/flapple/gigantamax/front.png
diff --git a/graphics/pokemon/flapple/gigantamax/icon.png b/graphics/pokemon/gen_8/flapple/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/flapple/gigantamax/icon.png
rename to graphics/pokemon/gen_8/flapple/gigantamax/icon.png
diff --git a/graphics/pokemon/flapple/gigantamax/normal.pal b/graphics/pokemon/gen_8/flapple/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/flapple/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/flapple/gigantamax/normal.pal
diff --git a/graphics/pokemon/flapple/gigantamax/shiny.pal b/graphics/pokemon/gen_8/flapple/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/flapple/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/flapple/gigantamax/shiny.pal
diff --git a/graphics/pokemon/flapple/icon.png b/graphics/pokemon/gen_8/flapple/icon.png
similarity index 100%
rename from graphics/pokemon/flapple/icon.png
rename to graphics/pokemon/gen_8/flapple/icon.png
diff --git a/graphics/pokemon/flapple/normal.pal b/graphics/pokemon/gen_8/flapple/normal.pal
similarity index 100%
rename from graphics/pokemon/flapple/normal.pal
rename to graphics/pokemon/gen_8/flapple/normal.pal
diff --git a/graphics/pokemon/flapple/shiny.pal b/graphics/pokemon/gen_8/flapple/shiny.pal
similarity index 100%
rename from graphics/pokemon/flapple/shiny.pal
rename to graphics/pokemon/gen_8/flapple/shiny.pal
diff --git a/graphics/pokemon/frosmoth/back.png b/graphics/pokemon/gen_8/frosmoth/back.png
similarity index 100%
rename from graphics/pokemon/frosmoth/back.png
rename to graphics/pokemon/gen_8/frosmoth/back.png
diff --git a/graphics/pokemon/weezing/footprint.png b/graphics/pokemon/gen_8/frosmoth/footprint.png
similarity index 100%
rename from graphics/pokemon/weezing/footprint.png
rename to graphics/pokemon/gen_8/frosmoth/footprint.png
diff --git a/graphics/pokemon/frosmoth/front.png b/graphics/pokemon/gen_8/frosmoth/front.png
similarity index 100%
rename from graphics/pokemon/frosmoth/front.png
rename to graphics/pokemon/gen_8/frosmoth/front.png
diff --git a/graphics/pokemon/frosmoth/icon.png b/graphics/pokemon/gen_8/frosmoth/icon.png
similarity index 100%
rename from graphics/pokemon/frosmoth/icon.png
rename to graphics/pokemon/gen_8/frosmoth/icon.png
diff --git a/graphics/pokemon/frosmoth/normal.pal b/graphics/pokemon/gen_8/frosmoth/normal.pal
similarity index 100%
rename from graphics/pokemon/frosmoth/normal.pal
rename to graphics/pokemon/gen_8/frosmoth/normal.pal
diff --git a/graphics/pokemon/frosmoth/shiny.pal b/graphics/pokemon/gen_8/frosmoth/shiny.pal
similarity index 100%
rename from graphics/pokemon/frosmoth/shiny.pal
rename to graphics/pokemon/gen_8/frosmoth/shiny.pal
diff --git a/graphics/pokemon/glastrier/back.png b/graphics/pokemon/gen_8/glastrier/back.png
similarity index 100%
rename from graphics/pokemon/glastrier/back.png
rename to graphics/pokemon/gen_8/glastrier/back.png
diff --git a/graphics/pokemon/glastrier/footprint.png b/graphics/pokemon/gen_8/glastrier/footprint.png
similarity index 100%
rename from graphics/pokemon/glastrier/footprint.png
rename to graphics/pokemon/gen_8/glastrier/footprint.png
diff --git a/graphics/pokemon/glastrier/front.png b/graphics/pokemon/gen_8/glastrier/front.png
similarity index 100%
rename from graphics/pokemon/glastrier/front.png
rename to graphics/pokemon/gen_8/glastrier/front.png
diff --git a/graphics/pokemon/glastrier/icon.png b/graphics/pokemon/gen_8/glastrier/icon.png
similarity index 100%
rename from graphics/pokemon/glastrier/icon.png
rename to graphics/pokemon/gen_8/glastrier/icon.png
diff --git a/graphics/pokemon/glastrier/normal.pal b/graphics/pokemon/gen_8/glastrier/normal.pal
similarity index 100%
rename from graphics/pokemon/glastrier/normal.pal
rename to graphics/pokemon/gen_8/glastrier/normal.pal
diff --git a/graphics/pokemon/glastrier/shiny.pal b/graphics/pokemon/gen_8/glastrier/shiny.pal
similarity index 100%
rename from graphics/pokemon/glastrier/shiny.pal
rename to graphics/pokemon/gen_8/glastrier/shiny.pal
diff --git a/graphics/pokemon/gossifleur/back.png b/graphics/pokemon/gen_8/gossifleur/back.png
similarity index 100%
rename from graphics/pokemon/gossifleur/back.png
rename to graphics/pokemon/gen_8/gossifleur/back.png
diff --git a/graphics/pokemon/paras/footprint.png b/graphics/pokemon/gen_8/gossifleur/footprint.png
similarity index 100%
rename from graphics/pokemon/paras/footprint.png
rename to graphics/pokemon/gen_8/gossifleur/footprint.png
diff --git a/graphics/pokemon/gossifleur/front.png b/graphics/pokemon/gen_8/gossifleur/front.png
similarity index 100%
rename from graphics/pokemon/gossifleur/front.png
rename to graphics/pokemon/gen_8/gossifleur/front.png
diff --git a/graphics/pokemon/gossifleur/icon.png b/graphics/pokemon/gen_8/gossifleur/icon.png
similarity index 100%
rename from graphics/pokemon/gossifleur/icon.png
rename to graphics/pokemon/gen_8/gossifleur/icon.png
diff --git a/graphics/pokemon/gossifleur/normal.pal b/graphics/pokemon/gen_8/gossifleur/normal.pal
similarity index 100%
rename from graphics/pokemon/gossifleur/normal.pal
rename to graphics/pokemon/gen_8/gossifleur/normal.pal
diff --git a/graphics/pokemon/gossifleur/shiny.pal b/graphics/pokemon/gen_8/gossifleur/shiny.pal
similarity index 100%
rename from graphics/pokemon/gossifleur/shiny.pal
rename to graphics/pokemon/gen_8/gossifleur/shiny.pal
diff --git a/graphics/pokemon/grapploct/back.png b/graphics/pokemon/gen_8/grapploct/back.png
similarity index 100%
rename from graphics/pokemon/grapploct/back.png
rename to graphics/pokemon/gen_8/grapploct/back.png
diff --git a/graphics/pokemon/octillery/footprint.png b/graphics/pokemon/gen_8/grapploct/footprint.png
similarity index 100%
rename from graphics/pokemon/octillery/footprint.png
rename to graphics/pokemon/gen_8/grapploct/footprint.png
diff --git a/graphics/pokemon/grapploct/front.png b/graphics/pokemon/gen_8/grapploct/front.png
similarity index 100%
rename from graphics/pokemon/grapploct/front.png
rename to graphics/pokemon/gen_8/grapploct/front.png
diff --git a/graphics/pokemon/grapploct/icon.png b/graphics/pokemon/gen_8/grapploct/icon.png
similarity index 100%
rename from graphics/pokemon/grapploct/icon.png
rename to graphics/pokemon/gen_8/grapploct/icon.png
diff --git a/graphics/pokemon/grapploct/normal.pal b/graphics/pokemon/gen_8/grapploct/normal.pal
similarity index 100%
rename from graphics/pokemon/grapploct/normal.pal
rename to graphics/pokemon/gen_8/grapploct/normal.pal
diff --git a/graphics/pokemon/grapploct/shiny.pal b/graphics/pokemon/gen_8/grapploct/shiny.pal
similarity index 100%
rename from graphics/pokemon/grapploct/shiny.pal
rename to graphics/pokemon/gen_8/grapploct/shiny.pal
diff --git a/graphics/pokemon/greedent/back.png b/graphics/pokemon/gen_8/greedent/back.png
similarity index 100%
rename from graphics/pokemon/greedent/back.png
rename to graphics/pokemon/gen_8/greedent/back.png
diff --git a/graphics/pokemon/greedent/footprint.png b/graphics/pokemon/gen_8/greedent/footprint.png
similarity index 100%
rename from graphics/pokemon/greedent/footprint.png
rename to graphics/pokemon/gen_8/greedent/footprint.png
diff --git a/graphics/pokemon/greedent/front.png b/graphics/pokemon/gen_8/greedent/front.png
similarity index 100%
rename from graphics/pokemon/greedent/front.png
rename to graphics/pokemon/gen_8/greedent/front.png
diff --git a/graphics/pokemon/greedent/icon.png b/graphics/pokemon/gen_8/greedent/icon.png
similarity index 100%
rename from graphics/pokemon/greedent/icon.png
rename to graphics/pokemon/gen_8/greedent/icon.png
diff --git a/graphics/pokemon/greedent/normal.pal b/graphics/pokemon/gen_8/greedent/normal.pal
similarity index 100%
rename from graphics/pokemon/greedent/normal.pal
rename to graphics/pokemon/gen_8/greedent/normal.pal
diff --git a/graphics/pokemon/greedent/shiny.pal b/graphics/pokemon/gen_8/greedent/shiny.pal
similarity index 100%
rename from graphics/pokemon/greedent/shiny.pal
rename to graphics/pokemon/gen_8/greedent/shiny.pal
diff --git a/graphics/pokemon/grimmsnarl/back.png b/graphics/pokemon/gen_8/grimmsnarl/back.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/back.png
rename to graphics/pokemon/gen_8/grimmsnarl/back.png
diff --git a/graphics/pokemon/grimmsnarl/footprint.png b/graphics/pokemon/gen_8/grimmsnarl/footprint.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/footprint.png
rename to graphics/pokemon/gen_8/grimmsnarl/footprint.png
diff --git a/graphics/pokemon/grimmsnarl/front.png b/graphics/pokemon/gen_8/grimmsnarl/front.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/front.png
rename to graphics/pokemon/gen_8/grimmsnarl/front.png
diff --git a/graphics/pokemon/grimmsnarl/gigantamax/back.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/gigantamax/back.png
rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.png
diff --git a/graphics/pokemon/grimmsnarl/gigantamax/front.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/gigantamax/front.png
rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.png
diff --git a/graphics/pokemon/grimmsnarl/gigantamax/icon.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/gigantamax/icon.png
rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.png
diff --git a/graphics/pokemon/grimmsnarl/gigantamax/normal.pal b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/grimmsnarl/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.pal
diff --git a/graphics/pokemon/grimmsnarl/gigantamax/shiny.pal b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/grimmsnarl/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.pal
diff --git a/graphics/pokemon/grimmsnarl/icon.png b/graphics/pokemon/gen_8/grimmsnarl/icon.png
similarity index 100%
rename from graphics/pokemon/grimmsnarl/icon.png
rename to graphics/pokemon/gen_8/grimmsnarl/icon.png
diff --git a/graphics/pokemon/grimmsnarl/normal.pal b/graphics/pokemon/gen_8/grimmsnarl/normal.pal
similarity index 100%
rename from graphics/pokemon/grimmsnarl/normal.pal
rename to graphics/pokemon/gen_8/grimmsnarl/normal.pal
diff --git a/graphics/pokemon/grimmsnarl/shiny.pal b/graphics/pokemon/gen_8/grimmsnarl/shiny.pal
similarity index 100%
rename from graphics/pokemon/grimmsnarl/shiny.pal
rename to graphics/pokemon/gen_8/grimmsnarl/shiny.pal
diff --git a/graphics/pokemon/grookey/back.png b/graphics/pokemon/gen_8/grookey/back.png
similarity index 100%
rename from graphics/pokemon/grookey/back.png
rename to graphics/pokemon/gen_8/grookey/back.png
diff --git a/graphics/pokemon/grookey/footprint.png b/graphics/pokemon/gen_8/grookey/footprint.png
similarity index 100%
rename from graphics/pokemon/grookey/footprint.png
rename to graphics/pokemon/gen_8/grookey/footprint.png
diff --git a/graphics/pokemon/grookey/front.png b/graphics/pokemon/gen_8/grookey/front.png
similarity index 100%
rename from graphics/pokemon/grookey/front.png
rename to graphics/pokemon/gen_8/grookey/front.png
diff --git a/graphics/pokemon/grookey/icon.png b/graphics/pokemon/gen_8/grookey/icon.png
similarity index 100%
rename from graphics/pokemon/grookey/icon.png
rename to graphics/pokemon/gen_8/grookey/icon.png
diff --git a/graphics/pokemon/grookey/normal.pal b/graphics/pokemon/gen_8/grookey/normal.pal
similarity index 100%
rename from graphics/pokemon/grookey/normal.pal
rename to graphics/pokemon/gen_8/grookey/normal.pal
diff --git a/graphics/pokemon/grookey/shiny.pal b/graphics/pokemon/gen_8/grookey/shiny.pal
similarity index 100%
rename from graphics/pokemon/grookey/shiny.pal
rename to graphics/pokemon/gen_8/grookey/shiny.pal
diff --git a/graphics/pokemon/hatenna/back.png b/graphics/pokemon/gen_8/hatenna/back.png
similarity index 100%
rename from graphics/pokemon/hatenna/back.png
rename to graphics/pokemon/gen_8/hatenna/back.png
diff --git a/graphics/pokemon/morpeko/footprint.png b/graphics/pokemon/gen_8/hatenna/footprint.png
similarity index 100%
rename from graphics/pokemon/morpeko/footprint.png
rename to graphics/pokemon/gen_8/hatenna/footprint.png
diff --git a/graphics/pokemon/hatenna/front.png b/graphics/pokemon/gen_8/hatenna/front.png
similarity index 100%
rename from graphics/pokemon/hatenna/front.png
rename to graphics/pokemon/gen_8/hatenna/front.png
diff --git a/graphics/pokemon/hatenna/icon.png b/graphics/pokemon/gen_8/hatenna/icon.png
similarity index 100%
rename from graphics/pokemon/hatenna/icon.png
rename to graphics/pokemon/gen_8/hatenna/icon.png
diff --git a/graphics/pokemon/hatenna/normal.pal b/graphics/pokemon/gen_8/hatenna/normal.pal
similarity index 100%
rename from graphics/pokemon/hatenna/normal.pal
rename to graphics/pokemon/gen_8/hatenna/normal.pal
diff --git a/graphics/pokemon/hatenna/shiny.pal b/graphics/pokemon/gen_8/hatenna/shiny.pal
similarity index 100%
rename from graphics/pokemon/hatenna/shiny.pal
rename to graphics/pokemon/gen_8/hatenna/shiny.pal
diff --git a/graphics/pokemon/hatterene/back.png b/graphics/pokemon/gen_8/hatterene/back.png
similarity index 100%
rename from graphics/pokemon/hatterene/back.png
rename to graphics/pokemon/gen_8/hatterene/back.png
diff --git a/graphics/pokemon/whirlipede/footprint.png b/graphics/pokemon/gen_8/hatterene/footprint.png
similarity index 100%
rename from graphics/pokemon/whirlipede/footprint.png
rename to graphics/pokemon/gen_8/hatterene/footprint.png
diff --git a/graphics/pokemon/hatterene/front.png b/graphics/pokemon/gen_8/hatterene/front.png
similarity index 100%
rename from graphics/pokemon/hatterene/front.png
rename to graphics/pokemon/gen_8/hatterene/front.png
diff --git a/graphics/pokemon/hatterene/gigantamax/back.png b/graphics/pokemon/gen_8/hatterene/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/hatterene/gigantamax/back.png
rename to graphics/pokemon/gen_8/hatterene/gigantamax/back.png
diff --git a/graphics/pokemon/hatterene/gigantamax/front.png b/graphics/pokemon/gen_8/hatterene/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/hatterene/gigantamax/front.png
rename to graphics/pokemon/gen_8/hatterene/gigantamax/front.png
diff --git a/graphics/pokemon/hatterene/gigantamax/icon.png b/graphics/pokemon/gen_8/hatterene/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/hatterene/gigantamax/icon.png
rename to graphics/pokemon/gen_8/hatterene/gigantamax/icon.png
diff --git a/graphics/pokemon/hatterene/gigantamax/normal.pal b/graphics/pokemon/gen_8/hatterene/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/hatterene/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/hatterene/gigantamax/normal.pal
diff --git a/graphics/pokemon/hatterene/gigantamax/shiny.pal b/graphics/pokemon/gen_8/hatterene/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/hatterene/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/hatterene/gigantamax/shiny.pal
diff --git a/graphics/pokemon/hatterene/icon.png b/graphics/pokemon/gen_8/hatterene/icon.png
similarity index 100%
rename from graphics/pokemon/hatterene/icon.png
rename to graphics/pokemon/gen_8/hatterene/icon.png
diff --git a/graphics/pokemon/hatterene/normal.pal b/graphics/pokemon/gen_8/hatterene/normal.pal
similarity index 100%
rename from graphics/pokemon/hatterene/normal.pal
rename to graphics/pokemon/gen_8/hatterene/normal.pal
diff --git a/graphics/pokemon/hatterene/shiny.pal b/graphics/pokemon/gen_8/hatterene/shiny.pal
similarity index 100%
rename from graphics/pokemon/hatterene/shiny.pal
rename to graphics/pokemon/gen_8/hatterene/shiny.pal
diff --git a/graphics/pokemon/hattrem/back.png b/graphics/pokemon/gen_8/hattrem/back.png
similarity index 100%
rename from graphics/pokemon/hattrem/back.png
rename to graphics/pokemon/gen_8/hattrem/back.png
diff --git a/graphics/pokemon/wimpod/footprint.png b/graphics/pokemon/gen_8/hattrem/footprint.png
similarity index 100%
rename from graphics/pokemon/wimpod/footprint.png
rename to graphics/pokemon/gen_8/hattrem/footprint.png
diff --git a/graphics/pokemon/hattrem/front.png b/graphics/pokemon/gen_8/hattrem/front.png
similarity index 100%
rename from graphics/pokemon/hattrem/front.png
rename to graphics/pokemon/gen_8/hattrem/front.png
diff --git a/graphics/pokemon/hattrem/icon.png b/graphics/pokemon/gen_8/hattrem/icon.png
similarity index 100%
rename from graphics/pokemon/hattrem/icon.png
rename to graphics/pokemon/gen_8/hattrem/icon.png
diff --git a/graphics/pokemon/hattrem/normal.pal b/graphics/pokemon/gen_8/hattrem/normal.pal
similarity index 100%
rename from graphics/pokemon/hattrem/normal.pal
rename to graphics/pokemon/gen_8/hattrem/normal.pal
diff --git a/graphics/pokemon/hattrem/shiny.pal b/graphics/pokemon/gen_8/hattrem/shiny.pal
similarity index 100%
rename from graphics/pokemon/hattrem/shiny.pal
rename to graphics/pokemon/gen_8/hattrem/shiny.pal
diff --git a/graphics/pokemon/impidimp/back.png b/graphics/pokemon/gen_8/impidimp/back.png
similarity index 100%
rename from graphics/pokemon/impidimp/back.png
rename to graphics/pokemon/gen_8/impidimp/back.png
diff --git a/graphics/pokemon/shiinotic/footprint.png b/graphics/pokemon/gen_8/impidimp/footprint.png
similarity index 100%
rename from graphics/pokemon/shiinotic/footprint.png
rename to graphics/pokemon/gen_8/impidimp/footprint.png
diff --git a/graphics/pokemon/impidimp/front.png b/graphics/pokemon/gen_8/impidimp/front.png
similarity index 100%
rename from graphics/pokemon/impidimp/front.png
rename to graphics/pokemon/gen_8/impidimp/front.png
diff --git a/graphics/pokemon/impidimp/icon.png b/graphics/pokemon/gen_8/impidimp/icon.png
similarity index 100%
rename from graphics/pokemon/impidimp/icon.png
rename to graphics/pokemon/gen_8/impidimp/icon.png
diff --git a/graphics/pokemon/impidimp/normal.pal b/graphics/pokemon/gen_8/impidimp/normal.pal
similarity index 100%
rename from graphics/pokemon/impidimp/normal.pal
rename to graphics/pokemon/gen_8/impidimp/normal.pal
diff --git a/graphics/pokemon/impidimp/shiny.pal b/graphics/pokemon/gen_8/impidimp/shiny.pal
similarity index 100%
rename from graphics/pokemon/impidimp/shiny.pal
rename to graphics/pokemon/gen_8/impidimp/shiny.pal
diff --git a/graphics/pokemon/indeedee/back.png b/graphics/pokemon/gen_8/indeedee/back.png
similarity index 100%
rename from graphics/pokemon/indeedee/back.png
rename to graphics/pokemon/gen_8/indeedee/back.png
diff --git a/graphics/pokemon/indeedee/female/back.png b/graphics/pokemon/gen_8/indeedee/female/back.png
similarity index 100%
rename from graphics/pokemon/indeedee/female/back.png
rename to graphics/pokemon/gen_8/indeedee/female/back.png
diff --git a/graphics/pokemon/indeedee/female/front.png b/graphics/pokemon/gen_8/indeedee/female/front.png
similarity index 100%
rename from graphics/pokemon/indeedee/female/front.png
rename to graphics/pokemon/gen_8/indeedee/female/front.png
diff --git a/graphics/pokemon/indeedee/female/icon.png b/graphics/pokemon/gen_8/indeedee/female/icon.png
similarity index 100%
rename from graphics/pokemon/indeedee/female/icon.png
rename to graphics/pokemon/gen_8/indeedee/female/icon.png
diff --git a/graphics/pokemon/indeedee/female/normal.pal b/graphics/pokemon/gen_8/indeedee/female/normal.pal
similarity index 100%
rename from graphics/pokemon/indeedee/female/normal.pal
rename to graphics/pokemon/gen_8/indeedee/female/normal.pal
diff --git a/graphics/pokemon/indeedee/female/shiny.pal b/graphics/pokemon/gen_8/indeedee/female/shiny.pal
similarity index 100%
rename from graphics/pokemon/indeedee/female/shiny.pal
rename to graphics/pokemon/gen_8/indeedee/female/shiny.pal
diff --git a/graphics/pokemon/indeedee/footprint.png b/graphics/pokemon/gen_8/indeedee/footprint.png
similarity index 100%
rename from graphics/pokemon/indeedee/footprint.png
rename to graphics/pokemon/gen_8/indeedee/footprint.png
diff --git a/graphics/pokemon/indeedee/front.png b/graphics/pokemon/gen_8/indeedee/front.png
similarity index 100%
rename from graphics/pokemon/indeedee/front.png
rename to graphics/pokemon/gen_8/indeedee/front.png
diff --git a/graphics/pokemon/indeedee/icon.png b/graphics/pokemon/gen_8/indeedee/icon.png
similarity index 100%
rename from graphics/pokemon/indeedee/icon.png
rename to graphics/pokemon/gen_8/indeedee/icon.png
diff --git a/graphics/pokemon/indeedee/normal.pal b/graphics/pokemon/gen_8/indeedee/normal.pal
similarity index 100%
rename from graphics/pokemon/indeedee/normal.pal
rename to graphics/pokemon/gen_8/indeedee/normal.pal
diff --git a/graphics/pokemon/indeedee/shiny.pal b/graphics/pokemon/gen_8/indeedee/shiny.pal
similarity index 100%
rename from graphics/pokemon/indeedee/shiny.pal
rename to graphics/pokemon/gen_8/indeedee/shiny.pal
diff --git a/graphics/pokemon/inteleon/back.png b/graphics/pokemon/gen_8/inteleon/back.png
similarity index 100%
rename from graphics/pokemon/inteleon/back.png
rename to graphics/pokemon/gen_8/inteleon/back.png
diff --git a/graphics/pokemon/inteleon/footprint.png b/graphics/pokemon/gen_8/inteleon/footprint.png
similarity index 100%
rename from graphics/pokemon/inteleon/footprint.png
rename to graphics/pokemon/gen_8/inteleon/footprint.png
diff --git a/graphics/pokemon/inteleon/front.png b/graphics/pokemon/gen_8/inteleon/front.png
similarity index 100%
rename from graphics/pokemon/inteleon/front.png
rename to graphics/pokemon/gen_8/inteleon/front.png
diff --git a/graphics/pokemon/inteleon/gigantamax/back.png b/graphics/pokemon/gen_8/inteleon/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/inteleon/gigantamax/back.png
rename to graphics/pokemon/gen_8/inteleon/gigantamax/back.png
diff --git a/graphics/pokemon/inteleon/gigantamax/front.png b/graphics/pokemon/gen_8/inteleon/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/inteleon/gigantamax/front.png
rename to graphics/pokemon/gen_8/inteleon/gigantamax/front.png
diff --git a/graphics/pokemon/inteleon/gigantamax/icon.png b/graphics/pokemon/gen_8/inteleon/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/inteleon/gigantamax/icon.png
rename to graphics/pokemon/gen_8/inteleon/gigantamax/icon.png
diff --git a/graphics/pokemon/inteleon/gigantamax/normal.pal b/graphics/pokemon/gen_8/inteleon/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/inteleon/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/inteleon/gigantamax/normal.pal
diff --git a/graphics/pokemon/inteleon/gigantamax/shiny.pal b/graphics/pokemon/gen_8/inteleon/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/inteleon/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/inteleon/gigantamax/shiny.pal
diff --git a/graphics/pokemon/inteleon/icon.png b/graphics/pokemon/gen_8/inteleon/icon.png
similarity index 100%
rename from graphics/pokemon/inteleon/icon.png
rename to graphics/pokemon/gen_8/inteleon/icon.png
diff --git a/graphics/pokemon/inteleon/normal.pal b/graphics/pokemon/gen_8/inteleon/normal.pal
similarity index 100%
rename from graphics/pokemon/inteleon/normal.pal
rename to graphics/pokemon/gen_8/inteleon/normal.pal
diff --git a/graphics/pokemon/inteleon/shiny.pal b/graphics/pokemon/gen_8/inteleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/inteleon/shiny.pal
rename to graphics/pokemon/gen_8/inteleon/shiny.pal
diff --git a/graphics/pokemon/kleavor/back.png b/graphics/pokemon/gen_8/kleavor/back.png
similarity index 100%
rename from graphics/pokemon/kleavor/back.png
rename to graphics/pokemon/gen_8/kleavor/back.png
diff --git a/graphics/pokemon/kleavor/front.png b/graphics/pokemon/gen_8/kleavor/front.png
similarity index 100%
rename from graphics/pokemon/kleavor/front.png
rename to graphics/pokemon/gen_8/kleavor/front.png
diff --git a/graphics/pokemon/kleavor/icon.png b/graphics/pokemon/gen_8/kleavor/icon.png
similarity index 100%
rename from graphics/pokemon/kleavor/icon.png
rename to graphics/pokemon/gen_8/kleavor/icon.png
diff --git a/graphics/pokemon/kleavor/normal.pal b/graphics/pokemon/gen_8/kleavor/normal.pal
similarity index 100%
rename from graphics/pokemon/kleavor/normal.pal
rename to graphics/pokemon/gen_8/kleavor/normal.pal
diff --git a/graphics/pokemon/kleavor/shiny.pal b/graphics/pokemon/gen_8/kleavor/shiny.pal
similarity index 100%
rename from graphics/pokemon/kleavor/shiny.pal
rename to graphics/pokemon/gen_8/kleavor/shiny.pal
diff --git a/graphics/pokemon/kubfu/back.png b/graphics/pokemon/gen_8/kubfu/back.png
similarity index 100%
rename from graphics/pokemon/kubfu/back.png
rename to graphics/pokemon/gen_8/kubfu/back.png
diff --git a/graphics/pokemon/kubfu/footprint.png b/graphics/pokemon/gen_8/kubfu/footprint.png
similarity index 100%
rename from graphics/pokemon/kubfu/footprint.png
rename to graphics/pokemon/gen_8/kubfu/footprint.png
diff --git a/graphics/pokemon/kubfu/front.png b/graphics/pokemon/gen_8/kubfu/front.png
similarity index 100%
rename from graphics/pokemon/kubfu/front.png
rename to graphics/pokemon/gen_8/kubfu/front.png
diff --git a/graphics/pokemon/kubfu/icon.png b/graphics/pokemon/gen_8/kubfu/icon.png
similarity index 100%
rename from graphics/pokemon/kubfu/icon.png
rename to graphics/pokemon/gen_8/kubfu/icon.png
diff --git a/graphics/pokemon/kubfu/normal.pal b/graphics/pokemon/gen_8/kubfu/normal.pal
similarity index 100%
rename from graphics/pokemon/kubfu/normal.pal
rename to graphics/pokemon/gen_8/kubfu/normal.pal
diff --git a/graphics/pokemon/kubfu/shiny.pal b/graphics/pokemon/gen_8/kubfu/shiny.pal
similarity index 100%
rename from graphics/pokemon/kubfu/shiny.pal
rename to graphics/pokemon/gen_8/kubfu/shiny.pal
diff --git a/graphics/pokemon/milcery/back.png b/graphics/pokemon/gen_8/milcery/back.png
similarity index 100%
rename from graphics/pokemon/milcery/back.png
rename to graphics/pokemon/gen_8/milcery/back.png
diff --git a/graphics/pokemon/whiscash/footprint.png b/graphics/pokemon/gen_8/milcery/footprint.png
similarity index 100%
rename from graphics/pokemon/whiscash/footprint.png
rename to graphics/pokemon/gen_8/milcery/footprint.png
diff --git a/graphics/pokemon/milcery/front.png b/graphics/pokemon/gen_8/milcery/front.png
similarity index 100%
rename from graphics/pokemon/milcery/front.png
rename to graphics/pokemon/gen_8/milcery/front.png
diff --git a/graphics/pokemon/milcery/icon.png b/graphics/pokemon/gen_8/milcery/icon.png
similarity index 100%
rename from graphics/pokemon/milcery/icon.png
rename to graphics/pokemon/gen_8/milcery/icon.png
diff --git a/graphics/pokemon/milcery/normal.pal b/graphics/pokemon/gen_8/milcery/normal.pal
similarity index 100%
rename from graphics/pokemon/milcery/normal.pal
rename to graphics/pokemon/gen_8/milcery/normal.pal
diff --git a/graphics/pokemon/milcery/shiny.pal b/graphics/pokemon/gen_8/milcery/shiny.pal
similarity index 100%
rename from graphics/pokemon/milcery/shiny.pal
rename to graphics/pokemon/gen_8/milcery/shiny.pal
diff --git a/graphics/pokemon/morgrem/back.png b/graphics/pokemon/gen_8/morgrem/back.png
similarity index 100%
rename from graphics/pokemon/morgrem/back.png
rename to graphics/pokemon/gen_8/morgrem/back.png
diff --git a/graphics/pokemon/morgrem/footprint.png b/graphics/pokemon/gen_8/morgrem/footprint.png
similarity index 100%
rename from graphics/pokemon/morgrem/footprint.png
rename to graphics/pokemon/gen_8/morgrem/footprint.png
diff --git a/graphics/pokemon/morgrem/front.png b/graphics/pokemon/gen_8/morgrem/front.png
similarity index 100%
rename from graphics/pokemon/morgrem/front.png
rename to graphics/pokemon/gen_8/morgrem/front.png
diff --git a/graphics/pokemon/morgrem/icon.png b/graphics/pokemon/gen_8/morgrem/icon.png
similarity index 100%
rename from graphics/pokemon/morgrem/icon.png
rename to graphics/pokemon/gen_8/morgrem/icon.png
diff --git a/graphics/pokemon/morgrem/normal.pal b/graphics/pokemon/gen_8/morgrem/normal.pal
similarity index 100%
rename from graphics/pokemon/morgrem/normal.pal
rename to graphics/pokemon/gen_8/morgrem/normal.pal
diff --git a/graphics/pokemon/morgrem/shiny.pal b/graphics/pokemon/gen_8/morgrem/shiny.pal
similarity index 100%
rename from graphics/pokemon/morgrem/shiny.pal
rename to graphics/pokemon/gen_8/morgrem/shiny.pal
diff --git a/graphics/pokemon/morpeko/back.png b/graphics/pokemon/gen_8/morpeko/back.png
similarity index 100%
rename from graphics/pokemon/morpeko/back.png
rename to graphics/pokemon/gen_8/morpeko/back.png
diff --git a/graphics/pokemon/togedemaru/footprint.png b/graphics/pokemon/gen_8/morpeko/footprint.png
similarity index 100%
rename from graphics/pokemon/togedemaru/footprint.png
rename to graphics/pokemon/gen_8/morpeko/footprint.png
diff --git a/graphics/pokemon/morpeko/front.png b/graphics/pokemon/gen_8/morpeko/front.png
similarity index 100%
rename from graphics/pokemon/morpeko/front.png
rename to graphics/pokemon/gen_8/morpeko/front.png
diff --git a/graphics/pokemon/morpeko/hangry/back.png b/graphics/pokemon/gen_8/morpeko/hangry/back.png
similarity index 100%
rename from graphics/pokemon/morpeko/hangry/back.png
rename to graphics/pokemon/gen_8/morpeko/hangry/back.png
diff --git a/graphics/pokemon/morpeko/hangry/front.png b/graphics/pokemon/gen_8/morpeko/hangry/front.png
similarity index 100%
rename from graphics/pokemon/morpeko/hangry/front.png
rename to graphics/pokemon/gen_8/morpeko/hangry/front.png
diff --git a/graphics/pokemon/morpeko/hangry/icon.png b/graphics/pokemon/gen_8/morpeko/hangry/icon.png
similarity index 100%
rename from graphics/pokemon/morpeko/hangry/icon.png
rename to graphics/pokemon/gen_8/morpeko/hangry/icon.png
diff --git a/graphics/pokemon/morpeko/hangry/normal.pal b/graphics/pokemon/gen_8/morpeko/hangry/normal.pal
similarity index 100%
rename from graphics/pokemon/morpeko/hangry/normal.pal
rename to graphics/pokemon/gen_8/morpeko/hangry/normal.pal
diff --git a/graphics/pokemon/morpeko/hangry/shiny.pal b/graphics/pokemon/gen_8/morpeko/hangry/shiny.pal
similarity index 100%
rename from graphics/pokemon/morpeko/hangry/shiny.pal
rename to graphics/pokemon/gen_8/morpeko/hangry/shiny.pal
diff --git a/graphics/pokemon/morpeko/icon.png b/graphics/pokemon/gen_8/morpeko/icon.png
similarity index 100%
rename from graphics/pokemon/morpeko/icon.png
rename to graphics/pokemon/gen_8/morpeko/icon.png
diff --git a/graphics/pokemon/morpeko/normal.pal b/graphics/pokemon/gen_8/morpeko/normal.pal
similarity index 100%
rename from graphics/pokemon/morpeko/normal.pal
rename to graphics/pokemon/gen_8/morpeko/normal.pal
diff --git a/graphics/pokemon/morpeko/shiny.pal b/graphics/pokemon/gen_8/morpeko/shiny.pal
similarity index 100%
rename from graphics/pokemon/morpeko/shiny.pal
rename to graphics/pokemon/gen_8/morpeko/shiny.pal
diff --git a/graphics/pokemon/mr_rime/back.png b/graphics/pokemon/gen_8/mr_rime/back.png
similarity index 100%
rename from graphics/pokemon/mr_rime/back.png
rename to graphics/pokemon/gen_8/mr_rime/back.png
diff --git a/graphics/pokemon/mr_rime/footprint.png b/graphics/pokemon/gen_8/mr_rime/footprint.png
similarity index 100%
rename from graphics/pokemon/mr_rime/footprint.png
rename to graphics/pokemon/gen_8/mr_rime/footprint.png
diff --git a/graphics/pokemon/mr_rime/front.png b/graphics/pokemon/gen_8/mr_rime/front.png
similarity index 100%
rename from graphics/pokemon/mr_rime/front.png
rename to graphics/pokemon/gen_8/mr_rime/front.png
diff --git a/graphics/pokemon/mr_rime/icon.png b/graphics/pokemon/gen_8/mr_rime/icon.png
similarity index 100%
rename from graphics/pokemon/mr_rime/icon.png
rename to graphics/pokemon/gen_8/mr_rime/icon.png
diff --git a/graphics/pokemon/mr_rime/normal.pal b/graphics/pokemon/gen_8/mr_rime/normal.pal
similarity index 100%
rename from graphics/pokemon/mr_rime/normal.pal
rename to graphics/pokemon/gen_8/mr_rime/normal.pal
diff --git a/graphics/pokemon/mr_rime/shiny.pal b/graphics/pokemon/gen_8/mr_rime/shiny.pal
similarity index 100%
rename from graphics/pokemon/mr_rime/shiny.pal
rename to graphics/pokemon/gen_8/mr_rime/shiny.pal
diff --git a/graphics/pokemon/nickit/back.png b/graphics/pokemon/gen_8/nickit/back.png
similarity index 100%
rename from graphics/pokemon/nickit/back.png
rename to graphics/pokemon/gen_8/nickit/back.png
diff --git a/graphics/pokemon/nickit/footprint.png b/graphics/pokemon/gen_8/nickit/footprint.png
similarity index 100%
rename from graphics/pokemon/nickit/footprint.png
rename to graphics/pokemon/gen_8/nickit/footprint.png
diff --git a/graphics/pokemon/nickit/front.png b/graphics/pokemon/gen_8/nickit/front.png
similarity index 100%
rename from graphics/pokemon/nickit/front.png
rename to graphics/pokemon/gen_8/nickit/front.png
diff --git a/graphics/pokemon/nickit/icon.png b/graphics/pokemon/gen_8/nickit/icon.png
similarity index 100%
rename from graphics/pokemon/nickit/icon.png
rename to graphics/pokemon/gen_8/nickit/icon.png
diff --git a/graphics/pokemon/nickit/normal.pal b/graphics/pokemon/gen_8/nickit/normal.pal
similarity index 100%
rename from graphics/pokemon/nickit/normal.pal
rename to graphics/pokemon/gen_8/nickit/normal.pal
diff --git a/graphics/pokemon/nickit/shiny.pal b/graphics/pokemon/gen_8/nickit/shiny.pal
similarity index 100%
rename from graphics/pokemon/nickit/shiny.pal
rename to graphics/pokemon/gen_8/nickit/shiny.pal
diff --git a/graphics/pokemon/obstagoon/back.png b/graphics/pokemon/gen_8/obstagoon/back.png
similarity index 100%
rename from graphics/pokemon/obstagoon/back.png
rename to graphics/pokemon/gen_8/obstagoon/back.png
diff --git a/graphics/pokemon/obstagoon/footprint.png b/graphics/pokemon/gen_8/obstagoon/footprint.png
similarity index 100%
rename from graphics/pokemon/obstagoon/footprint.png
rename to graphics/pokemon/gen_8/obstagoon/footprint.png
diff --git a/graphics/pokemon/obstagoon/front.png b/graphics/pokemon/gen_8/obstagoon/front.png
similarity index 100%
rename from graphics/pokemon/obstagoon/front.png
rename to graphics/pokemon/gen_8/obstagoon/front.png
diff --git a/graphics/pokemon/obstagoon/icon.png b/graphics/pokemon/gen_8/obstagoon/icon.png
similarity index 100%
rename from graphics/pokemon/obstagoon/icon.png
rename to graphics/pokemon/gen_8/obstagoon/icon.png
diff --git a/graphics/pokemon/obstagoon/normal.pal b/graphics/pokemon/gen_8/obstagoon/normal.pal
similarity index 100%
rename from graphics/pokemon/obstagoon/normal.pal
rename to graphics/pokemon/gen_8/obstagoon/normal.pal
diff --git a/graphics/pokemon/obstagoon/shiny.pal b/graphics/pokemon/gen_8/obstagoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/obstagoon/shiny.pal
rename to graphics/pokemon/gen_8/obstagoon/shiny.pal
diff --git a/graphics/pokemon/orbeetle/back.png b/graphics/pokemon/gen_8/orbeetle/back.png
similarity index 100%
rename from graphics/pokemon/orbeetle/back.png
rename to graphics/pokemon/gen_8/orbeetle/back.png
diff --git a/graphics/pokemon/orbeetle/footprint.png b/graphics/pokemon/gen_8/orbeetle/footprint.png
similarity index 100%
rename from graphics/pokemon/orbeetle/footprint.png
rename to graphics/pokemon/gen_8/orbeetle/footprint.png
diff --git a/graphics/pokemon/orbeetle/front.png b/graphics/pokemon/gen_8/orbeetle/front.png
similarity index 100%
rename from graphics/pokemon/orbeetle/front.png
rename to graphics/pokemon/gen_8/orbeetle/front.png
diff --git a/graphics/pokemon/orbeetle/gigantamax/back.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/orbeetle/gigantamax/back.png
rename to graphics/pokemon/gen_8/orbeetle/gigantamax/back.png
diff --git a/graphics/pokemon/orbeetle/gigantamax/front.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/orbeetle/gigantamax/front.png
rename to graphics/pokemon/gen_8/orbeetle/gigantamax/front.png
diff --git a/graphics/pokemon/orbeetle/gigantamax/icon.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/orbeetle/gigantamax/icon.png
rename to graphics/pokemon/gen_8/orbeetle/gigantamax/icon.png
diff --git a/graphics/pokemon/orbeetle/gigantamax/normal.pal b/graphics/pokemon/gen_8/orbeetle/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/orbeetle/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/orbeetle/gigantamax/normal.pal
diff --git a/graphics/pokemon/orbeetle/gigantamax/shiny.pal b/graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/orbeetle/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.pal
diff --git a/graphics/pokemon/orbeetle/icon.png b/graphics/pokemon/gen_8/orbeetle/icon.png
similarity index 100%
rename from graphics/pokemon/orbeetle/icon.png
rename to graphics/pokemon/gen_8/orbeetle/icon.png
diff --git a/graphics/pokemon/orbeetle/normal.pal b/graphics/pokemon/gen_8/orbeetle/normal.pal
similarity index 100%
rename from graphics/pokemon/orbeetle/normal.pal
rename to graphics/pokemon/gen_8/orbeetle/normal.pal
diff --git a/graphics/pokemon/orbeetle/shiny.pal b/graphics/pokemon/gen_8/orbeetle/shiny.pal
similarity index 100%
rename from graphics/pokemon/orbeetle/shiny.pal
rename to graphics/pokemon/gen_8/orbeetle/shiny.pal
diff --git a/graphics/pokemon/overqwil/back.png b/graphics/pokemon/gen_8/overqwil/back.png
similarity index 100%
rename from graphics/pokemon/overqwil/back.png
rename to graphics/pokemon/gen_8/overqwil/back.png
diff --git a/graphics/pokemon/overqwil/front.png b/graphics/pokemon/gen_8/overqwil/front.png
similarity index 100%
rename from graphics/pokemon/overqwil/front.png
rename to graphics/pokemon/gen_8/overqwil/front.png
diff --git a/graphics/pokemon/overqwil/icon.png b/graphics/pokemon/gen_8/overqwil/icon.png
similarity index 100%
rename from graphics/pokemon/overqwil/icon.png
rename to graphics/pokemon/gen_8/overqwil/icon.png
diff --git a/graphics/pokemon/overqwil/normal.pal b/graphics/pokemon/gen_8/overqwil/normal.pal
similarity index 100%
rename from graphics/pokemon/overqwil/normal.pal
rename to graphics/pokemon/gen_8/overqwil/normal.pal
diff --git a/graphics/pokemon/overqwil/shiny.pal b/graphics/pokemon/gen_8/overqwil/shiny.pal
similarity index 100%
rename from graphics/pokemon/overqwil/shiny.pal
rename to graphics/pokemon/gen_8/overqwil/shiny.pal
diff --git a/graphics/pokemon/perrserker/back.png b/graphics/pokemon/gen_8/perrserker/back.png
similarity index 100%
rename from graphics/pokemon/perrserker/back.png
rename to graphics/pokemon/gen_8/perrserker/back.png
diff --git a/graphics/pokemon/perrserker/footprint.png b/graphics/pokemon/gen_8/perrserker/footprint.png
similarity index 100%
rename from graphics/pokemon/perrserker/footprint.png
rename to graphics/pokemon/gen_8/perrserker/footprint.png
diff --git a/graphics/pokemon/perrserker/front.png b/graphics/pokemon/gen_8/perrserker/front.png
similarity index 100%
rename from graphics/pokemon/perrserker/front.png
rename to graphics/pokemon/gen_8/perrserker/front.png
diff --git a/graphics/pokemon/perrserker/icon.png b/graphics/pokemon/gen_8/perrserker/icon.png
similarity index 100%
rename from graphics/pokemon/perrserker/icon.png
rename to graphics/pokemon/gen_8/perrserker/icon.png
diff --git a/graphics/pokemon/perrserker/normal.pal b/graphics/pokemon/gen_8/perrserker/normal.pal
similarity index 100%
rename from graphics/pokemon/perrserker/normal.pal
rename to graphics/pokemon/gen_8/perrserker/normal.pal
diff --git a/graphics/pokemon/perrserker/shiny.pal b/graphics/pokemon/gen_8/perrserker/shiny.pal
similarity index 100%
rename from graphics/pokemon/perrserker/shiny.pal
rename to graphics/pokemon/gen_8/perrserker/shiny.pal
diff --git a/graphics/pokemon/pincurchin/anim_front.png b/graphics/pokemon/gen_8/pincurchin/anim_front.png
similarity index 100%
rename from graphics/pokemon/pincurchin/anim_front.png
rename to graphics/pokemon/gen_8/pincurchin/anim_front.png
diff --git a/graphics/pokemon/pincurchin/back.png b/graphics/pokemon/gen_8/pincurchin/back.png
similarity index 100%
rename from graphics/pokemon/pincurchin/back.png
rename to graphics/pokemon/gen_8/pincurchin/back.png
diff --git a/graphics/pokemon/spinarak/footprint.png b/graphics/pokemon/gen_8/pincurchin/footprint.png
similarity index 100%
rename from graphics/pokemon/spinarak/footprint.png
rename to graphics/pokemon/gen_8/pincurchin/footprint.png
diff --git a/graphics/pokemon/pincurchin/icon.png b/graphics/pokemon/gen_8/pincurchin/icon.png
similarity index 100%
rename from graphics/pokemon/pincurchin/icon.png
rename to graphics/pokemon/gen_8/pincurchin/icon.png
diff --git a/graphics/pokemon/pincurchin/normal.pal b/graphics/pokemon/gen_8/pincurchin/normal.pal
similarity index 100%
rename from graphics/pokemon/pincurchin/normal.pal
rename to graphics/pokemon/gen_8/pincurchin/normal.pal
diff --git a/graphics/pokemon/pincurchin/shiny.pal b/graphics/pokemon/gen_8/pincurchin/shiny.pal
similarity index 100%
rename from graphics/pokemon/pincurchin/shiny.pal
rename to graphics/pokemon/gen_8/pincurchin/shiny.pal
diff --git a/graphics/pokemon/polteageist/back.png b/graphics/pokemon/gen_8/polteageist/back.png
similarity index 100%
rename from graphics/pokemon/polteageist/back.png
rename to graphics/pokemon/gen_8/polteageist/back.png
diff --git a/graphics/pokemon/xerneas/footprint.png b/graphics/pokemon/gen_8/polteageist/footprint.png
similarity index 100%
rename from graphics/pokemon/xerneas/footprint.png
rename to graphics/pokemon/gen_8/polteageist/footprint.png
diff --git a/graphics/pokemon/polteageist/front.png b/graphics/pokemon/gen_8/polteageist/front.png
similarity index 100%
rename from graphics/pokemon/polteageist/front.png
rename to graphics/pokemon/gen_8/polteageist/front.png
diff --git a/graphics/pokemon/polteageist/icon.png b/graphics/pokemon/gen_8/polteageist/icon.png
similarity index 100%
rename from graphics/pokemon/polteageist/icon.png
rename to graphics/pokemon/gen_8/polteageist/icon.png
diff --git a/graphics/pokemon/polteageist/normal.pal b/graphics/pokemon/gen_8/polteageist/normal.pal
similarity index 100%
rename from graphics/pokemon/polteageist/normal.pal
rename to graphics/pokemon/gen_8/polteageist/normal.pal
diff --git a/graphics/pokemon/polteageist/shiny.pal b/graphics/pokemon/gen_8/polteageist/shiny.pal
similarity index 100%
rename from graphics/pokemon/polteageist/shiny.pal
rename to graphics/pokemon/gen_8/polteageist/shiny.pal
diff --git a/graphics/pokemon/raboot/back.png b/graphics/pokemon/gen_8/raboot/back.png
similarity index 100%
rename from graphics/pokemon/raboot/back.png
rename to graphics/pokemon/gen_8/raboot/back.png
diff --git a/graphics/pokemon/raboot/footprint.png b/graphics/pokemon/gen_8/raboot/footprint.png
similarity index 100%
rename from graphics/pokemon/raboot/footprint.png
rename to graphics/pokemon/gen_8/raboot/footprint.png
diff --git a/graphics/pokemon/raboot/front.png b/graphics/pokemon/gen_8/raboot/front.png
similarity index 100%
rename from graphics/pokemon/raboot/front.png
rename to graphics/pokemon/gen_8/raboot/front.png
diff --git a/graphics/pokemon/raboot/icon.png b/graphics/pokemon/gen_8/raboot/icon.png
similarity index 100%
rename from graphics/pokemon/raboot/icon.png
rename to graphics/pokemon/gen_8/raboot/icon.png
diff --git a/graphics/pokemon/raboot/normal.pal b/graphics/pokemon/gen_8/raboot/normal.pal
similarity index 100%
rename from graphics/pokemon/raboot/normal.pal
rename to graphics/pokemon/gen_8/raboot/normal.pal
diff --git a/graphics/pokemon/raboot/shiny.pal b/graphics/pokemon/gen_8/raboot/shiny.pal
similarity index 100%
rename from graphics/pokemon/raboot/shiny.pal
rename to graphics/pokemon/gen_8/raboot/shiny.pal
diff --git a/graphics/pokemon/regidrago/back.png b/graphics/pokemon/gen_8/regidrago/back.png
similarity index 100%
rename from graphics/pokemon/regidrago/back.png
rename to graphics/pokemon/gen_8/regidrago/back.png
diff --git a/graphics/pokemon/regidrago/footprint.png b/graphics/pokemon/gen_8/regidrago/footprint.png
similarity index 100%
rename from graphics/pokemon/regidrago/footprint.png
rename to graphics/pokemon/gen_8/regidrago/footprint.png
diff --git a/graphics/pokemon/regidrago/front.png b/graphics/pokemon/gen_8/regidrago/front.png
similarity index 100%
rename from graphics/pokemon/regidrago/front.png
rename to graphics/pokemon/gen_8/regidrago/front.png
diff --git a/graphics/pokemon/regidrago/icon.png b/graphics/pokemon/gen_8/regidrago/icon.png
similarity index 100%
rename from graphics/pokemon/regidrago/icon.png
rename to graphics/pokemon/gen_8/regidrago/icon.png
diff --git a/graphics/pokemon/regidrago/normal.pal b/graphics/pokemon/gen_8/regidrago/normal.pal
similarity index 100%
rename from graphics/pokemon/regidrago/normal.pal
rename to graphics/pokemon/gen_8/regidrago/normal.pal
diff --git a/graphics/pokemon/regidrago/shiny.pal b/graphics/pokemon/gen_8/regidrago/shiny.pal
similarity index 100%
rename from graphics/pokemon/regidrago/shiny.pal
rename to graphics/pokemon/gen_8/regidrago/shiny.pal
diff --git a/graphics/pokemon/regieleki/back.png b/graphics/pokemon/gen_8/regieleki/back.png
similarity index 100%
rename from graphics/pokemon/regieleki/back.png
rename to graphics/pokemon/gen_8/regieleki/back.png
diff --git a/graphics/pokemon/spritzee/footprint.png b/graphics/pokemon/gen_8/regieleki/footprint.png
similarity index 100%
rename from graphics/pokemon/spritzee/footprint.png
rename to graphics/pokemon/gen_8/regieleki/footprint.png
diff --git a/graphics/pokemon/regieleki/front.png b/graphics/pokemon/gen_8/regieleki/front.png
similarity index 100%
rename from graphics/pokemon/regieleki/front.png
rename to graphics/pokemon/gen_8/regieleki/front.png
diff --git a/graphics/pokemon/regieleki/icon.png b/graphics/pokemon/gen_8/regieleki/icon.png
similarity index 100%
rename from graphics/pokemon/regieleki/icon.png
rename to graphics/pokemon/gen_8/regieleki/icon.png
diff --git a/graphics/pokemon/regieleki/normal.pal b/graphics/pokemon/gen_8/regieleki/normal.pal
similarity index 100%
rename from graphics/pokemon/regieleki/normal.pal
rename to graphics/pokemon/gen_8/regieleki/normal.pal
diff --git a/graphics/pokemon/regieleki/shiny.pal b/graphics/pokemon/gen_8/regieleki/shiny.pal
similarity index 100%
rename from graphics/pokemon/regieleki/shiny.pal
rename to graphics/pokemon/gen_8/regieleki/shiny.pal
diff --git a/graphics/pokemon/rillaboom/back.png b/graphics/pokemon/gen_8/rillaboom/back.png
similarity index 100%
rename from graphics/pokemon/rillaboom/back.png
rename to graphics/pokemon/gen_8/rillaboom/back.png
diff --git a/graphics/pokemon/rillaboom/footprint.png b/graphics/pokemon/gen_8/rillaboom/footprint.png
similarity index 100%
rename from graphics/pokemon/rillaboom/footprint.png
rename to graphics/pokemon/gen_8/rillaboom/footprint.png
diff --git a/graphics/pokemon/rillaboom/front.png b/graphics/pokemon/gen_8/rillaboom/front.png
similarity index 100%
rename from graphics/pokemon/rillaboom/front.png
rename to graphics/pokemon/gen_8/rillaboom/front.png
diff --git a/graphics/pokemon/rillaboom/gigantamax/back.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/rillaboom/gigantamax/back.png
rename to graphics/pokemon/gen_8/rillaboom/gigantamax/back.png
diff --git a/graphics/pokemon/rillaboom/gigantamax/front.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/rillaboom/gigantamax/front.png
rename to graphics/pokemon/gen_8/rillaboom/gigantamax/front.png
diff --git a/graphics/pokemon/rillaboom/gigantamax/icon.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/rillaboom/gigantamax/icon.png
rename to graphics/pokemon/gen_8/rillaboom/gigantamax/icon.png
diff --git a/graphics/pokemon/rillaboom/gigantamax/normal.pal b/graphics/pokemon/gen_8/rillaboom/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/rillaboom/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/rillaboom/gigantamax/normal.pal
diff --git a/graphics/pokemon/rillaboom/gigantamax/shiny.pal b/graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/rillaboom/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.pal
diff --git a/graphics/pokemon/rillaboom/icon.png b/graphics/pokemon/gen_8/rillaboom/icon.png
similarity index 100%
rename from graphics/pokemon/rillaboom/icon.png
rename to graphics/pokemon/gen_8/rillaboom/icon.png
diff --git a/graphics/pokemon/rillaboom/normal.pal b/graphics/pokemon/gen_8/rillaboom/normal.pal
similarity index 100%
rename from graphics/pokemon/rillaboom/normal.pal
rename to graphics/pokemon/gen_8/rillaboom/normal.pal
diff --git a/graphics/pokemon/rillaboom/shiny.pal b/graphics/pokemon/gen_8/rillaboom/shiny.pal
similarity index 100%
rename from graphics/pokemon/rillaboom/shiny.pal
rename to graphics/pokemon/gen_8/rillaboom/shiny.pal
diff --git a/graphics/pokemon/rolycoly/anim_front.png b/graphics/pokemon/gen_8/rolycoly/anim_front.png
similarity index 100%
rename from graphics/pokemon/rolycoly/anim_front.png
rename to graphics/pokemon/gen_8/rolycoly/anim_front.png
diff --git a/graphics/pokemon/rolycoly/back.png b/graphics/pokemon/gen_8/rolycoly/back.png
similarity index 100%
rename from graphics/pokemon/rolycoly/back.png
rename to graphics/pokemon/gen_8/rolycoly/back.png
diff --git a/graphics/pokemon/rolycoly/footprint.png b/graphics/pokemon/gen_8/rolycoly/footprint.png
similarity index 100%
rename from graphics/pokemon/rolycoly/footprint.png
rename to graphics/pokemon/gen_8/rolycoly/footprint.png
diff --git a/graphics/pokemon/rolycoly/icon.png b/graphics/pokemon/gen_8/rolycoly/icon.png
similarity index 100%
rename from graphics/pokemon/rolycoly/icon.png
rename to graphics/pokemon/gen_8/rolycoly/icon.png
diff --git a/graphics/pokemon/rolycoly/normal.pal b/graphics/pokemon/gen_8/rolycoly/normal.pal
similarity index 100%
rename from graphics/pokemon/rolycoly/normal.pal
rename to graphics/pokemon/gen_8/rolycoly/normal.pal
diff --git a/graphics/pokemon/rolycoly/shiny.pal b/graphics/pokemon/gen_8/rolycoly/shiny.pal
similarity index 100%
rename from graphics/pokemon/rolycoly/shiny.pal
rename to graphics/pokemon/gen_8/rolycoly/shiny.pal
diff --git a/graphics/pokemon/rookidee/anim_front.png b/graphics/pokemon/gen_8/rookidee/anim_front.png
similarity index 100%
rename from graphics/pokemon/rookidee/anim_front.png
rename to graphics/pokemon/gen_8/rookidee/anim_front.png
diff --git a/graphics/pokemon/rookidee/back.png b/graphics/pokemon/gen_8/rookidee/back.png
similarity index 100%
rename from graphics/pokemon/rookidee/back.png
rename to graphics/pokemon/gen_8/rookidee/back.png
diff --git a/graphics/pokemon/spearow/footprint.png b/graphics/pokemon/gen_8/rookidee/footprint.png
similarity index 100%
rename from graphics/pokemon/spearow/footprint.png
rename to graphics/pokemon/gen_8/rookidee/footprint.png
diff --git a/graphics/pokemon/rookidee/icon.png b/graphics/pokemon/gen_8/rookidee/icon.png
similarity index 100%
rename from graphics/pokemon/rookidee/icon.png
rename to graphics/pokemon/gen_8/rookidee/icon.png
diff --git a/graphics/pokemon/rookidee/normal.pal b/graphics/pokemon/gen_8/rookidee/normal.pal
similarity index 100%
rename from graphics/pokemon/rookidee/normal.pal
rename to graphics/pokemon/gen_8/rookidee/normal.pal
diff --git a/graphics/pokemon/rookidee/shiny.pal b/graphics/pokemon/gen_8/rookidee/shiny.pal
similarity index 100%
rename from graphics/pokemon/rookidee/shiny.pal
rename to graphics/pokemon/gen_8/rookidee/shiny.pal
diff --git a/graphics/pokemon/runerigus/back.png b/graphics/pokemon/gen_8/runerigus/back.png
similarity index 100%
rename from graphics/pokemon/runerigus/back.png
rename to graphics/pokemon/gen_8/runerigus/back.png
diff --git a/graphics/pokemon/wishiwashi/footprint.png b/graphics/pokemon/gen_8/runerigus/footprint.png
similarity index 100%
rename from graphics/pokemon/wishiwashi/footprint.png
rename to graphics/pokemon/gen_8/runerigus/footprint.png
diff --git a/graphics/pokemon/runerigus/front.png b/graphics/pokemon/gen_8/runerigus/front.png
similarity index 100%
rename from graphics/pokemon/runerigus/front.png
rename to graphics/pokemon/gen_8/runerigus/front.png
diff --git a/graphics/pokemon/runerigus/icon.png b/graphics/pokemon/gen_8/runerigus/icon.png
similarity index 100%
rename from graphics/pokemon/runerigus/icon.png
rename to graphics/pokemon/gen_8/runerigus/icon.png
diff --git a/graphics/pokemon/runerigus/normal.pal b/graphics/pokemon/gen_8/runerigus/normal.pal
similarity index 100%
rename from graphics/pokemon/runerigus/normal.pal
rename to graphics/pokemon/gen_8/runerigus/normal.pal
diff --git a/graphics/pokemon/runerigus/shiny.pal b/graphics/pokemon/gen_8/runerigus/shiny.pal
similarity index 100%
rename from graphics/pokemon/runerigus/shiny.pal
rename to graphics/pokemon/gen_8/runerigus/shiny.pal
diff --git a/graphics/pokemon/sandaconda/back.png b/graphics/pokemon/gen_8/sandaconda/back.png
similarity index 100%
rename from graphics/pokemon/sandaconda/back.png
rename to graphics/pokemon/gen_8/sandaconda/back.png
diff --git a/graphics/pokemon/woobat/footprint.png b/graphics/pokemon/gen_8/sandaconda/footprint.png
similarity index 100%
rename from graphics/pokemon/woobat/footprint.png
rename to graphics/pokemon/gen_8/sandaconda/footprint.png
diff --git a/graphics/pokemon/sandaconda/front.png b/graphics/pokemon/gen_8/sandaconda/front.png
similarity index 100%
rename from graphics/pokemon/sandaconda/front.png
rename to graphics/pokemon/gen_8/sandaconda/front.png
diff --git a/graphics/pokemon/sandaconda/gigantamax/back.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/sandaconda/gigantamax/back.png
rename to graphics/pokemon/gen_8/sandaconda/gigantamax/back.png
diff --git a/graphics/pokemon/sandaconda/gigantamax/front.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/sandaconda/gigantamax/front.png
rename to graphics/pokemon/gen_8/sandaconda/gigantamax/front.png
diff --git a/graphics/pokemon/sandaconda/gigantamax/icon.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/sandaconda/gigantamax/icon.png
rename to graphics/pokemon/gen_8/sandaconda/gigantamax/icon.png
diff --git a/graphics/pokemon/sandaconda/gigantamax/normal.pal b/graphics/pokemon/gen_8/sandaconda/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/sandaconda/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/sandaconda/gigantamax/normal.pal
diff --git a/graphics/pokemon/sandaconda/gigantamax/shiny.pal b/graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandaconda/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.pal
diff --git a/graphics/pokemon/sandaconda/icon.png b/graphics/pokemon/gen_8/sandaconda/icon.png
similarity index 100%
rename from graphics/pokemon/sandaconda/icon.png
rename to graphics/pokemon/gen_8/sandaconda/icon.png
diff --git a/graphics/pokemon/sandaconda/normal.pal b/graphics/pokemon/gen_8/sandaconda/normal.pal
similarity index 100%
rename from graphics/pokemon/sandaconda/normal.pal
rename to graphics/pokemon/gen_8/sandaconda/normal.pal
diff --git a/graphics/pokemon/sandaconda/shiny.pal b/graphics/pokemon/gen_8/sandaconda/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandaconda/shiny.pal
rename to graphics/pokemon/gen_8/sandaconda/shiny.pal
diff --git a/graphics/pokemon/scorbunny/back.png b/graphics/pokemon/gen_8/scorbunny/back.png
similarity index 100%
rename from graphics/pokemon/scorbunny/back.png
rename to graphics/pokemon/gen_8/scorbunny/back.png
diff --git a/graphics/pokemon/scorbunny/footprint.png b/graphics/pokemon/gen_8/scorbunny/footprint.png
similarity index 100%
rename from graphics/pokemon/scorbunny/footprint.png
rename to graphics/pokemon/gen_8/scorbunny/footprint.png
diff --git a/graphics/pokemon/scorbunny/front.png b/graphics/pokemon/gen_8/scorbunny/front.png
similarity index 100%
rename from graphics/pokemon/scorbunny/front.png
rename to graphics/pokemon/gen_8/scorbunny/front.png
diff --git a/graphics/pokemon/scorbunny/icon.png b/graphics/pokemon/gen_8/scorbunny/icon.png
similarity index 100%
rename from graphics/pokemon/scorbunny/icon.png
rename to graphics/pokemon/gen_8/scorbunny/icon.png
diff --git a/graphics/pokemon/scorbunny/normal.pal b/graphics/pokemon/gen_8/scorbunny/normal.pal
similarity index 100%
rename from graphics/pokemon/scorbunny/normal.pal
rename to graphics/pokemon/gen_8/scorbunny/normal.pal
diff --git a/graphics/pokemon/scorbunny/shiny.pal b/graphics/pokemon/gen_8/scorbunny/shiny.pal
similarity index 100%
rename from graphics/pokemon/scorbunny/shiny.pal
rename to graphics/pokemon/gen_8/scorbunny/shiny.pal
diff --git a/graphics/pokemon/silicobra/back.png b/graphics/pokemon/gen_8/silicobra/back.png
similarity index 100%
rename from graphics/pokemon/silicobra/back.png
rename to graphics/pokemon/gen_8/silicobra/back.png
diff --git a/graphics/pokemon/wormadam/plant/footprint.png b/graphics/pokemon/gen_8/silicobra/footprint.png
similarity index 100%
rename from graphics/pokemon/wormadam/plant/footprint.png
rename to graphics/pokemon/gen_8/silicobra/footprint.png
diff --git a/graphics/pokemon/silicobra/front.png b/graphics/pokemon/gen_8/silicobra/front.png
similarity index 100%
rename from graphics/pokemon/silicobra/front.png
rename to graphics/pokemon/gen_8/silicobra/front.png
diff --git a/graphics/pokemon/silicobra/icon.png b/graphics/pokemon/gen_8/silicobra/icon.png
similarity index 100%
rename from graphics/pokemon/silicobra/icon.png
rename to graphics/pokemon/gen_8/silicobra/icon.png
diff --git a/graphics/pokemon/silicobra/normal.pal b/graphics/pokemon/gen_8/silicobra/normal.pal
similarity index 100%
rename from graphics/pokemon/silicobra/normal.pal
rename to graphics/pokemon/gen_8/silicobra/normal.pal
diff --git a/graphics/pokemon/silicobra/shiny.pal b/graphics/pokemon/gen_8/silicobra/shiny.pal
similarity index 100%
rename from graphics/pokemon/silicobra/shiny.pal
rename to graphics/pokemon/gen_8/silicobra/shiny.pal
diff --git a/graphics/pokemon/sinistea/back.png b/graphics/pokemon/gen_8/sinistea/back.png
similarity index 100%
rename from graphics/pokemon/sinistea/back.png
rename to graphics/pokemon/gen_8/sinistea/back.png
diff --git a/graphics/pokemon/yamask/footprint.png b/graphics/pokemon/gen_8/sinistea/footprint.png
similarity index 100%
rename from graphics/pokemon/yamask/footprint.png
rename to graphics/pokemon/gen_8/sinistea/footprint.png
diff --git a/graphics/pokemon/sinistea/front.png b/graphics/pokemon/gen_8/sinistea/front.png
similarity index 100%
rename from graphics/pokemon/sinistea/front.png
rename to graphics/pokemon/gen_8/sinistea/front.png
diff --git a/graphics/pokemon/sinistea/icon.png b/graphics/pokemon/gen_8/sinistea/icon.png
similarity index 100%
rename from graphics/pokemon/sinistea/icon.png
rename to graphics/pokemon/gen_8/sinistea/icon.png
diff --git a/graphics/pokemon/sinistea/normal.pal b/graphics/pokemon/gen_8/sinistea/normal.pal
similarity index 100%
rename from graphics/pokemon/sinistea/normal.pal
rename to graphics/pokemon/gen_8/sinistea/normal.pal
diff --git a/graphics/pokemon/sinistea/shiny.pal b/graphics/pokemon/gen_8/sinistea/shiny.pal
similarity index 100%
rename from graphics/pokemon/sinistea/shiny.pal
rename to graphics/pokemon/gen_8/sinistea/shiny.pal
diff --git a/graphics/pokemon/sirfetchd/back.png b/graphics/pokemon/gen_8/sirfetchd/back.png
similarity index 100%
rename from graphics/pokemon/sirfetchd/back.png
rename to graphics/pokemon/gen_8/sirfetchd/back.png
diff --git a/graphics/pokemon/sirfetchd/footprint.png b/graphics/pokemon/gen_8/sirfetchd/footprint.png
similarity index 100%
rename from graphics/pokemon/sirfetchd/footprint.png
rename to graphics/pokemon/gen_8/sirfetchd/footprint.png
diff --git a/graphics/pokemon/sirfetchd/front.png b/graphics/pokemon/gen_8/sirfetchd/front.png
similarity index 100%
rename from graphics/pokemon/sirfetchd/front.png
rename to graphics/pokemon/gen_8/sirfetchd/front.png
diff --git a/graphics/pokemon/sirfetchd/icon.png b/graphics/pokemon/gen_8/sirfetchd/icon.png
similarity index 100%
rename from graphics/pokemon/sirfetchd/icon.png
rename to graphics/pokemon/gen_8/sirfetchd/icon.png
diff --git a/graphics/pokemon/sirfetchd/normal.pal b/graphics/pokemon/gen_8/sirfetchd/normal.pal
similarity index 100%
rename from graphics/pokemon/sirfetchd/normal.pal
rename to graphics/pokemon/gen_8/sirfetchd/normal.pal
diff --git a/graphics/pokemon/sirfetchd/shiny.pal b/graphics/pokemon/gen_8/sirfetchd/shiny.pal
similarity index 100%
rename from graphics/pokemon/sirfetchd/shiny.pal
rename to graphics/pokemon/gen_8/sirfetchd/shiny.pal
diff --git a/graphics/pokemon/sizzlipede/anim_front.png b/graphics/pokemon/gen_8/sizzlipede/anim_front.png
similarity index 100%
rename from graphics/pokemon/sizzlipede/anim_front.png
rename to graphics/pokemon/gen_8/sizzlipede/anim_front.png
diff --git a/graphics/pokemon/sizzlipede/back.png b/graphics/pokemon/gen_8/sizzlipede/back.png
similarity index 100%
rename from graphics/pokemon/sizzlipede/back.png
rename to graphics/pokemon/gen_8/sizzlipede/back.png
diff --git a/graphics/pokemon/venomoth/footprint.png b/graphics/pokemon/gen_8/sizzlipede/footprint.png
similarity index 100%
rename from graphics/pokemon/venomoth/footprint.png
rename to graphics/pokemon/gen_8/sizzlipede/footprint.png
diff --git a/graphics/pokemon/sizzlipede/icon.png b/graphics/pokemon/gen_8/sizzlipede/icon.png
similarity index 100%
rename from graphics/pokemon/sizzlipede/icon.png
rename to graphics/pokemon/gen_8/sizzlipede/icon.png
diff --git a/graphics/pokemon/sizzlipede/normal.pal b/graphics/pokemon/gen_8/sizzlipede/normal.pal
similarity index 100%
rename from graphics/pokemon/sizzlipede/normal.pal
rename to graphics/pokemon/gen_8/sizzlipede/normal.pal
diff --git a/graphics/pokemon/sizzlipede/shiny.pal b/graphics/pokemon/gen_8/sizzlipede/shiny.pal
similarity index 100%
rename from graphics/pokemon/sizzlipede/shiny.pal
rename to graphics/pokemon/gen_8/sizzlipede/shiny.pal
diff --git a/graphics/pokemon/skwovet/back.png b/graphics/pokemon/gen_8/skwovet/back.png
similarity index 100%
rename from graphics/pokemon/skwovet/back.png
rename to graphics/pokemon/gen_8/skwovet/back.png
diff --git a/graphics/pokemon/skwovet/footprint.png b/graphics/pokemon/gen_8/skwovet/footprint.png
similarity index 100%
rename from graphics/pokemon/skwovet/footprint.png
rename to graphics/pokemon/gen_8/skwovet/footprint.png
diff --git a/graphics/pokemon/skwovet/front.png b/graphics/pokemon/gen_8/skwovet/front.png
similarity index 100%
rename from graphics/pokemon/skwovet/front.png
rename to graphics/pokemon/gen_8/skwovet/front.png
diff --git a/graphics/pokemon/skwovet/icon.png b/graphics/pokemon/gen_8/skwovet/icon.png
similarity index 100%
rename from graphics/pokemon/skwovet/icon.png
rename to graphics/pokemon/gen_8/skwovet/icon.png
diff --git a/graphics/pokemon/skwovet/normal.pal b/graphics/pokemon/gen_8/skwovet/normal.pal
similarity index 100%
rename from graphics/pokemon/skwovet/normal.pal
rename to graphics/pokemon/gen_8/skwovet/normal.pal
diff --git a/graphics/pokemon/skwovet/shiny.pal b/graphics/pokemon/gen_8/skwovet/shiny.pal
similarity index 100%
rename from graphics/pokemon/skwovet/shiny.pal
rename to graphics/pokemon/gen_8/skwovet/shiny.pal
diff --git a/graphics/pokemon/sneasler/back.png b/graphics/pokemon/gen_8/sneasler/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasler/back.png
rename to graphics/pokemon/gen_8/sneasler/back.png
diff --git a/graphics/pokemon/sneasler/front.png b/graphics/pokemon/gen_8/sneasler/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasler/front.png
rename to graphics/pokemon/gen_8/sneasler/front.png
diff --git a/graphics/pokemon/sneasler/icon.png b/graphics/pokemon/gen_8/sneasler/icon.png
similarity index 100%
rename from graphics/pokemon/sneasler/icon.png
rename to graphics/pokemon/gen_8/sneasler/icon.png
diff --git a/graphics/pokemon/sneasler/normal.pal b/graphics/pokemon/gen_8/sneasler/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasler/normal.pal
rename to graphics/pokemon/gen_8/sneasler/normal.pal
diff --git a/graphics/pokemon/sneasler/shiny.pal b/graphics/pokemon/gen_8/sneasler/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sneasler/shiny.pal
rename to graphics/pokemon/gen_8/sneasler/shiny.pal
diff --git a/graphics/pokemon/snom/back.png b/graphics/pokemon/gen_8/snom/back.png
similarity index 100%
rename from graphics/pokemon/snom/back.png
rename to graphics/pokemon/gen_8/snom/back.png
diff --git a/graphics/pokemon/zubat/footprint.png b/graphics/pokemon/gen_8/snom/footprint.png
similarity index 100%
rename from graphics/pokemon/zubat/footprint.png
rename to graphics/pokemon/gen_8/snom/footprint.png
diff --git a/graphics/pokemon/snom/front.png b/graphics/pokemon/gen_8/snom/front.png
similarity index 100%
rename from graphics/pokemon/snom/front.png
rename to graphics/pokemon/gen_8/snom/front.png
diff --git a/graphics/pokemon/snom/icon.png b/graphics/pokemon/gen_8/snom/icon.png
similarity index 100%
rename from graphics/pokemon/snom/icon.png
rename to graphics/pokemon/gen_8/snom/icon.png
diff --git a/graphics/pokemon/snom/normal.pal b/graphics/pokemon/gen_8/snom/normal.pal
similarity index 100%
rename from graphics/pokemon/snom/normal.pal
rename to graphics/pokemon/gen_8/snom/normal.pal
diff --git a/graphics/pokemon/snom/shiny.pal b/graphics/pokemon/gen_8/snom/shiny.pal
similarity index 100%
rename from graphics/pokemon/snom/shiny.pal
rename to graphics/pokemon/gen_8/snom/shiny.pal
diff --git a/graphics/pokemon/sobble/back.png b/graphics/pokemon/gen_8/sobble/back.png
similarity index 100%
rename from graphics/pokemon/sobble/back.png
rename to graphics/pokemon/gen_8/sobble/back.png
diff --git a/graphics/pokemon/sobble/footprint.png b/graphics/pokemon/gen_8/sobble/footprint.png
similarity index 100%
rename from graphics/pokemon/sobble/footprint.png
rename to graphics/pokemon/gen_8/sobble/footprint.png
diff --git a/graphics/pokemon/sobble/front.png b/graphics/pokemon/gen_8/sobble/front.png
similarity index 100%
rename from graphics/pokemon/sobble/front.png
rename to graphics/pokemon/gen_8/sobble/front.png
diff --git a/graphics/pokemon/sobble/icon.png b/graphics/pokemon/gen_8/sobble/icon.png
similarity index 100%
rename from graphics/pokemon/sobble/icon.png
rename to graphics/pokemon/gen_8/sobble/icon.png
diff --git a/graphics/pokemon/sobble/normal.pal b/graphics/pokemon/gen_8/sobble/normal.pal
similarity index 100%
rename from graphics/pokemon/sobble/normal.pal
rename to graphics/pokemon/gen_8/sobble/normal.pal
diff --git a/graphics/pokemon/sobble/shiny.pal b/graphics/pokemon/gen_8/sobble/shiny.pal
similarity index 100%
rename from graphics/pokemon/sobble/shiny.pal
rename to graphics/pokemon/gen_8/sobble/shiny.pal
diff --git a/graphics/pokemon/spectrier/back.png b/graphics/pokemon/gen_8/spectrier/back.png
similarity index 100%
rename from graphics/pokemon/spectrier/back.png
rename to graphics/pokemon/gen_8/spectrier/back.png
diff --git a/graphics/pokemon/spectrier/footprint.png b/graphics/pokemon/gen_8/spectrier/footprint.png
similarity index 100%
rename from graphics/pokemon/spectrier/footprint.png
rename to graphics/pokemon/gen_8/spectrier/footprint.png
diff --git a/graphics/pokemon/spectrier/front.png b/graphics/pokemon/gen_8/spectrier/front.png
similarity index 100%
rename from graphics/pokemon/spectrier/front.png
rename to graphics/pokemon/gen_8/spectrier/front.png
diff --git a/graphics/pokemon/spectrier/icon.png b/graphics/pokemon/gen_8/spectrier/icon.png
similarity index 100%
rename from graphics/pokemon/spectrier/icon.png
rename to graphics/pokemon/gen_8/spectrier/icon.png
diff --git a/graphics/pokemon/spectrier/normal.pal b/graphics/pokemon/gen_8/spectrier/normal.pal
similarity index 100%
rename from graphics/pokemon/spectrier/normal.pal
rename to graphics/pokemon/gen_8/spectrier/normal.pal
diff --git a/graphics/pokemon/spectrier/shiny.pal b/graphics/pokemon/gen_8/spectrier/shiny.pal
similarity index 100%
rename from graphics/pokemon/spectrier/shiny.pal
rename to graphics/pokemon/gen_8/spectrier/shiny.pal
diff --git a/graphics/pokemon/stonjourner/back.png b/graphics/pokemon/gen_8/stonjourner/back.png
similarity index 100%
rename from graphics/pokemon/stonjourner/back.png
rename to graphics/pokemon/gen_8/stonjourner/back.png
diff --git a/graphics/pokemon/stonjourner/footprint.png b/graphics/pokemon/gen_8/stonjourner/footprint.png
similarity index 100%
rename from graphics/pokemon/stonjourner/footprint.png
rename to graphics/pokemon/gen_8/stonjourner/footprint.png
diff --git a/graphics/pokemon/stonjourner/front.png b/graphics/pokemon/gen_8/stonjourner/front.png
similarity index 100%
rename from graphics/pokemon/stonjourner/front.png
rename to graphics/pokemon/gen_8/stonjourner/front.png
diff --git a/graphics/pokemon/stonjourner/icon.png b/graphics/pokemon/gen_8/stonjourner/icon.png
similarity index 100%
rename from graphics/pokemon/stonjourner/icon.png
rename to graphics/pokemon/gen_8/stonjourner/icon.png
diff --git a/graphics/pokemon/stonjourner/normal.pal b/graphics/pokemon/gen_8/stonjourner/normal.pal
similarity index 100%
rename from graphics/pokemon/stonjourner/normal.pal
rename to graphics/pokemon/gen_8/stonjourner/normal.pal
diff --git a/graphics/pokemon/stonjourner/shiny.pal b/graphics/pokemon/gen_8/stonjourner/shiny.pal
similarity index 100%
rename from graphics/pokemon/stonjourner/shiny.pal
rename to graphics/pokemon/gen_8/stonjourner/shiny.pal
diff --git a/graphics/pokemon/thievul/back.png b/graphics/pokemon/gen_8/thievul/back.png
similarity index 100%
rename from graphics/pokemon/thievul/back.png
rename to graphics/pokemon/gen_8/thievul/back.png
diff --git a/graphics/pokemon/thievul/footprint.png b/graphics/pokemon/gen_8/thievul/footprint.png
similarity index 100%
rename from graphics/pokemon/thievul/footprint.png
rename to graphics/pokemon/gen_8/thievul/footprint.png
diff --git a/graphics/pokemon/thievul/front.png b/graphics/pokemon/gen_8/thievul/front.png
similarity index 100%
rename from graphics/pokemon/thievul/front.png
rename to graphics/pokemon/gen_8/thievul/front.png
diff --git a/graphics/pokemon/thievul/icon.png b/graphics/pokemon/gen_8/thievul/icon.png
similarity index 100%
rename from graphics/pokemon/thievul/icon.png
rename to graphics/pokemon/gen_8/thievul/icon.png
diff --git a/graphics/pokemon/thievul/normal.pal b/graphics/pokemon/gen_8/thievul/normal.pal
similarity index 100%
rename from graphics/pokemon/thievul/normal.pal
rename to graphics/pokemon/gen_8/thievul/normal.pal
diff --git a/graphics/pokemon/thievul/shiny.pal b/graphics/pokemon/gen_8/thievul/shiny.pal
similarity index 100%
rename from graphics/pokemon/thievul/shiny.pal
rename to graphics/pokemon/gen_8/thievul/shiny.pal
diff --git a/graphics/pokemon/thwackey/back.png b/graphics/pokemon/gen_8/thwackey/back.png
similarity index 100%
rename from graphics/pokemon/thwackey/back.png
rename to graphics/pokemon/gen_8/thwackey/back.png
diff --git a/graphics/pokemon/thwackey/footprint.png b/graphics/pokemon/gen_8/thwackey/footprint.png
similarity index 100%
rename from graphics/pokemon/thwackey/footprint.png
rename to graphics/pokemon/gen_8/thwackey/footprint.png
diff --git a/graphics/pokemon/thwackey/front.png b/graphics/pokemon/gen_8/thwackey/front.png
similarity index 100%
rename from graphics/pokemon/thwackey/front.png
rename to graphics/pokemon/gen_8/thwackey/front.png
diff --git a/graphics/pokemon/thwackey/icon.png b/graphics/pokemon/gen_8/thwackey/icon.png
similarity index 100%
rename from graphics/pokemon/thwackey/icon.png
rename to graphics/pokemon/gen_8/thwackey/icon.png
diff --git a/graphics/pokemon/thwackey/normal.pal b/graphics/pokemon/gen_8/thwackey/normal.pal
similarity index 100%
rename from graphics/pokemon/thwackey/normal.pal
rename to graphics/pokemon/gen_8/thwackey/normal.pal
diff --git a/graphics/pokemon/thwackey/shiny.pal b/graphics/pokemon/gen_8/thwackey/shiny.pal
similarity index 100%
rename from graphics/pokemon/thwackey/shiny.pal
rename to graphics/pokemon/gen_8/thwackey/shiny.pal
diff --git a/graphics/pokemon/toxel/back.png b/graphics/pokemon/gen_8/toxel/back.png
similarity index 100%
rename from graphics/pokemon/toxel/back.png
rename to graphics/pokemon/gen_8/toxel/back.png
diff --git a/graphics/pokemon/toxel/footprint.png b/graphics/pokemon/gen_8/toxel/footprint.png
similarity index 100%
rename from graphics/pokemon/toxel/footprint.png
rename to graphics/pokemon/gen_8/toxel/footprint.png
diff --git a/graphics/pokemon/toxel/front.png b/graphics/pokemon/gen_8/toxel/front.png
similarity index 100%
rename from graphics/pokemon/toxel/front.png
rename to graphics/pokemon/gen_8/toxel/front.png
diff --git a/graphics/pokemon/toxel/icon.png b/graphics/pokemon/gen_8/toxel/icon.png
similarity index 100%
rename from graphics/pokemon/toxel/icon.png
rename to graphics/pokemon/gen_8/toxel/icon.png
diff --git a/graphics/pokemon/toxel/normal.pal b/graphics/pokemon/gen_8/toxel/normal.pal
similarity index 100%
rename from graphics/pokemon/toxel/normal.pal
rename to graphics/pokemon/gen_8/toxel/normal.pal
diff --git a/graphics/pokemon/toxel/shiny.pal b/graphics/pokemon/gen_8/toxel/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxel/shiny.pal
rename to graphics/pokemon/gen_8/toxel/shiny.pal
diff --git a/graphics/pokemon/toxtricity/back.png b/graphics/pokemon/gen_8/toxtricity/back.png
similarity index 100%
rename from graphics/pokemon/toxtricity/back.png
rename to graphics/pokemon/gen_8/toxtricity/back.png
diff --git a/graphics/pokemon/toxtricity/footprint.png b/graphics/pokemon/gen_8/toxtricity/footprint.png
similarity index 100%
rename from graphics/pokemon/toxtricity/footprint.png
rename to graphics/pokemon/gen_8/toxtricity/footprint.png
diff --git a/graphics/pokemon/toxtricity/front.png b/graphics/pokemon/gen_8/toxtricity/front.png
similarity index 100%
rename from graphics/pokemon/toxtricity/front.png
rename to graphics/pokemon/gen_8/toxtricity/front.png
diff --git a/graphics/pokemon/toxtricity/gigantamax/back.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/toxtricity/gigantamax/back.png
rename to graphics/pokemon/gen_8/toxtricity/gigantamax/back.png
diff --git a/graphics/pokemon/toxtricity/gigantamax/front.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/toxtricity/gigantamax/front.png
rename to graphics/pokemon/gen_8/toxtricity/gigantamax/front.png
diff --git a/graphics/pokemon/toxtricity/gigantamax/icon.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/toxtricity/gigantamax/icon.png
rename to graphics/pokemon/gen_8/toxtricity/gigantamax/icon.png
diff --git a/graphics/pokemon/toxtricity/gigantamax/normal.pal b/graphics/pokemon/gen_8/toxtricity/gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/gigantamax/normal.pal
rename to graphics/pokemon/gen_8/toxtricity/gigantamax/normal.pal
diff --git a/graphics/pokemon/toxtricity/gigantamax/shiny.pal b/graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.pal
diff --git a/graphics/pokemon/toxtricity/icon.png b/graphics/pokemon/gen_8/toxtricity/icon.png
similarity index 100%
rename from graphics/pokemon/toxtricity/icon.png
rename to graphics/pokemon/gen_8/toxtricity/icon.png
diff --git a/graphics/pokemon/toxtricity/low_key/back.png b/graphics/pokemon/gen_8/toxtricity/low_key/back.png
similarity index 100%
rename from graphics/pokemon/toxtricity/low_key/back.png
rename to graphics/pokemon/gen_8/toxtricity/low_key/back.png
diff --git a/graphics/pokemon/toxtricity/low_key/front.png b/graphics/pokemon/gen_8/toxtricity/low_key/front.png
similarity index 100%
rename from graphics/pokemon/toxtricity/low_key/front.png
rename to graphics/pokemon/gen_8/toxtricity/low_key/front.png
diff --git a/graphics/pokemon/toxtricity/low_key/icon.png b/graphics/pokemon/gen_8/toxtricity/low_key/icon.png
similarity index 100%
rename from graphics/pokemon/toxtricity/low_key/icon.png
rename to graphics/pokemon/gen_8/toxtricity/low_key/icon.png
diff --git a/graphics/pokemon/toxtricity/low_key/normal.pal b/graphics/pokemon/gen_8/toxtricity/low_key/normal.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/low_key/normal.pal
rename to graphics/pokemon/gen_8/toxtricity/low_key/normal.pal
diff --git a/graphics/pokemon/toxtricity/low_key/shiny.pal b/graphics/pokemon/gen_8/toxtricity/low_key/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/low_key/shiny.pal
rename to graphics/pokemon/gen_8/toxtricity/low_key/shiny.pal
diff --git a/graphics/pokemon/toxtricity/normal.pal b/graphics/pokemon/gen_8/toxtricity/normal.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/normal.pal
rename to graphics/pokemon/gen_8/toxtricity/normal.pal
diff --git a/graphics/pokemon/toxtricity/shiny.pal b/graphics/pokemon/gen_8/toxtricity/shiny.pal
similarity index 100%
rename from graphics/pokemon/toxtricity/shiny.pal
rename to graphics/pokemon/gen_8/toxtricity/shiny.pal
diff --git a/graphics/pokemon/ursaluna/back.png b/graphics/pokemon/gen_8/ursaluna/back.png
similarity index 100%
rename from graphics/pokemon/ursaluna/back.png
rename to graphics/pokemon/gen_8/ursaluna/back.png
diff --git a/graphics/pokemon/ursaluna/bloodmoon/back.png b/graphics/pokemon/gen_8/ursaluna/bloodmoon/back.png
similarity index 100%
rename from graphics/pokemon/ursaluna/bloodmoon/back.png
rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/back.png
diff --git a/graphics/pokemon/ursaluna/bloodmoon/front.png b/graphics/pokemon/gen_8/ursaluna/bloodmoon/front.png
similarity index 100%
rename from graphics/pokemon/ursaluna/bloodmoon/front.png
rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/front.png
diff --git a/graphics/pokemon/ursaluna/bloodmoon/normal.pal b/graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.pal
similarity index 100%
rename from graphics/pokemon/ursaluna/bloodmoon/normal.pal
rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.pal
diff --git a/graphics/pokemon/ursaluna/bloodmoon/shiny.pal b/graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/ursaluna/bloodmoon/shiny.pal
rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.pal
diff --git a/graphics/pokemon/ursaluna/front.png b/graphics/pokemon/gen_8/ursaluna/front.png
similarity index 100%
rename from graphics/pokemon/ursaluna/front.png
rename to graphics/pokemon/gen_8/ursaluna/front.png
diff --git a/graphics/pokemon/ursaluna/icon.png b/graphics/pokemon/gen_8/ursaluna/icon.png
similarity index 100%
rename from graphics/pokemon/ursaluna/icon.png
rename to graphics/pokemon/gen_8/ursaluna/icon.png
diff --git a/graphics/pokemon/ursaluna/normal.pal b/graphics/pokemon/gen_8/ursaluna/normal.pal
similarity index 100%
rename from graphics/pokemon/ursaluna/normal.pal
rename to graphics/pokemon/gen_8/ursaluna/normal.pal
diff --git a/graphics/pokemon/ursaluna/shiny.pal b/graphics/pokemon/gen_8/ursaluna/shiny.pal
similarity index 100%
rename from graphics/pokemon/ursaluna/shiny.pal
rename to graphics/pokemon/gen_8/ursaluna/shiny.pal
diff --git a/graphics/pokemon/urshifu/back.png b/graphics/pokemon/gen_8/urshifu/back.png
similarity index 100%
rename from graphics/pokemon/urshifu/back.png
rename to graphics/pokemon/gen_8/urshifu/back.png
diff --git a/graphics/pokemon/urshifu/footprint.png b/graphics/pokemon/gen_8/urshifu/footprint.png
similarity index 100%
rename from graphics/pokemon/urshifu/footprint.png
rename to graphics/pokemon/gen_8/urshifu/footprint.png
diff --git a/graphics/pokemon/urshifu/front.png b/graphics/pokemon/gen_8/urshifu/front.png
similarity index 100%
rename from graphics/pokemon/urshifu/front.png
rename to graphics/pokemon/gen_8/urshifu/front.png
diff --git a/graphics/pokemon/urshifu/icon.png b/graphics/pokemon/gen_8/urshifu/icon.png
similarity index 100%
rename from graphics/pokemon/urshifu/icon.png
rename to graphics/pokemon/gen_8/urshifu/icon.png
diff --git a/graphics/pokemon/urshifu/normal.pal b/graphics/pokemon/gen_8/urshifu/normal.pal
similarity index 100%
rename from graphics/pokemon/urshifu/normal.pal
rename to graphics/pokemon/gen_8/urshifu/normal.pal
diff --git a/graphics/pokemon/urshifu/rapid_strike_style/back.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.png
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style/back.png
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.png
diff --git a/graphics/pokemon/urshifu/rapid_strike_style/front.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.png
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style/front.png
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.png
diff --git a/graphics/pokemon/urshifu/rapid_strike_style/normal.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.pal
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style/normal.pal
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.pal
diff --git a/graphics/pokemon/urshifu/rapid_strike_style/shiny.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.pal
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style/shiny.pal
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.pal
diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.png
diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.png
diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.png
diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.pal
diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.pal
diff --git a/graphics/pokemon/urshifu/shiny.pal b/graphics/pokemon/gen_8/urshifu/shiny.pal
similarity index 100%
rename from graphics/pokemon/urshifu/shiny.pal
rename to graphics/pokemon/gen_8/urshifu/shiny.pal
diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.png
similarity index 100%
rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png
rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.png
diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.png
similarity index 100%
rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png
rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.png
diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.png
similarity index 100%
rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png
rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.png
diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.pal
similarity index 100%
rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal
rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.pal
diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.pal
similarity index 100%
rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal
rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.pal
diff --git a/graphics/pokemon/wooloo/back.png b/graphics/pokemon/gen_8/wooloo/back.png
similarity index 100%
rename from graphics/pokemon/wooloo/back.png
rename to graphics/pokemon/gen_8/wooloo/back.png
diff --git a/graphics/pokemon/wooloo/footprint.png b/graphics/pokemon/gen_8/wooloo/footprint.png
similarity index 100%
rename from graphics/pokemon/wooloo/footprint.png
rename to graphics/pokemon/gen_8/wooloo/footprint.png
diff --git a/graphics/pokemon/wooloo/front.png b/graphics/pokemon/gen_8/wooloo/front.png
similarity index 100%
rename from graphics/pokemon/wooloo/front.png
rename to graphics/pokemon/gen_8/wooloo/front.png
diff --git a/graphics/pokemon/wooloo/icon.png b/graphics/pokemon/gen_8/wooloo/icon.png
similarity index 100%
rename from graphics/pokemon/wooloo/icon.png
rename to graphics/pokemon/gen_8/wooloo/icon.png
diff --git a/graphics/pokemon/wooloo/normal.pal b/graphics/pokemon/gen_8/wooloo/normal.pal
similarity index 100%
rename from graphics/pokemon/wooloo/normal.pal
rename to graphics/pokemon/gen_8/wooloo/normal.pal
diff --git a/graphics/pokemon/wooloo/shiny.pal b/graphics/pokemon/gen_8/wooloo/shiny.pal
similarity index 100%
rename from graphics/pokemon/wooloo/shiny.pal
rename to graphics/pokemon/gen_8/wooloo/shiny.pal
diff --git a/graphics/pokemon/wyrdeer/back.png b/graphics/pokemon/gen_8/wyrdeer/back.png
similarity index 100%
rename from graphics/pokemon/wyrdeer/back.png
rename to graphics/pokemon/gen_8/wyrdeer/back.png
diff --git a/graphics/pokemon/wyrdeer/front.png b/graphics/pokemon/gen_8/wyrdeer/front.png
similarity index 100%
rename from graphics/pokemon/wyrdeer/front.png
rename to graphics/pokemon/gen_8/wyrdeer/front.png
diff --git a/graphics/pokemon/wyrdeer/icon.png b/graphics/pokemon/gen_8/wyrdeer/icon.png
similarity index 100%
rename from graphics/pokemon/wyrdeer/icon.png
rename to graphics/pokemon/gen_8/wyrdeer/icon.png
diff --git a/graphics/pokemon/wyrdeer/normal.pal b/graphics/pokemon/gen_8/wyrdeer/normal.pal
similarity index 100%
rename from graphics/pokemon/wyrdeer/normal.pal
rename to graphics/pokemon/gen_8/wyrdeer/normal.pal
diff --git a/graphics/pokemon/wyrdeer/shiny.pal b/graphics/pokemon/gen_8/wyrdeer/shiny.pal
similarity index 100%
rename from graphics/pokemon/wyrdeer/shiny.pal
rename to graphics/pokemon/gen_8/wyrdeer/shiny.pal
diff --git a/graphics/pokemon/yamper/back.png b/graphics/pokemon/gen_8/yamper/back.png
similarity index 100%
rename from graphics/pokemon/yamper/back.png
rename to graphics/pokemon/gen_8/yamper/back.png
diff --git a/graphics/pokemon/yamper/footprint.png b/graphics/pokemon/gen_8/yamper/footprint.png
similarity index 100%
rename from graphics/pokemon/yamper/footprint.png
rename to graphics/pokemon/gen_8/yamper/footprint.png
diff --git a/graphics/pokemon/yamper/front.png b/graphics/pokemon/gen_8/yamper/front.png
similarity index 100%
rename from graphics/pokemon/yamper/front.png
rename to graphics/pokemon/gen_8/yamper/front.png
diff --git a/graphics/pokemon/yamper/icon.png b/graphics/pokemon/gen_8/yamper/icon.png
similarity index 100%
rename from graphics/pokemon/yamper/icon.png
rename to graphics/pokemon/gen_8/yamper/icon.png
diff --git a/graphics/pokemon/yamper/normal.pal b/graphics/pokemon/gen_8/yamper/normal.pal
similarity index 100%
rename from graphics/pokemon/yamper/normal.pal
rename to graphics/pokemon/gen_8/yamper/normal.pal
diff --git a/graphics/pokemon/yamper/shiny.pal b/graphics/pokemon/gen_8/yamper/shiny.pal
similarity index 100%
rename from graphics/pokemon/yamper/shiny.pal
rename to graphics/pokemon/gen_8/yamper/shiny.pal
diff --git a/graphics/pokemon/zacian/back.png b/graphics/pokemon/gen_8/zacian/back.png
similarity index 100%
rename from graphics/pokemon/zacian/back.png
rename to graphics/pokemon/gen_8/zacian/back.png
diff --git a/graphics/pokemon/zacian/crowned_sword/back.png b/graphics/pokemon/gen_8/zacian/crowned_sword/back.png
similarity index 100%
rename from graphics/pokemon/zacian/crowned_sword/back.png
rename to graphics/pokemon/gen_8/zacian/crowned_sword/back.png
diff --git a/graphics/pokemon/zacian/crowned_sword/front.png b/graphics/pokemon/gen_8/zacian/crowned_sword/front.png
similarity index 100%
rename from graphics/pokemon/zacian/crowned_sword/front.png
rename to graphics/pokemon/gen_8/zacian/crowned_sword/front.png
diff --git a/graphics/pokemon/zacian/crowned_sword/icon.png b/graphics/pokemon/gen_8/zacian/crowned_sword/icon.png
similarity index 100%
rename from graphics/pokemon/zacian/crowned_sword/icon.png
rename to graphics/pokemon/gen_8/zacian/crowned_sword/icon.png
diff --git a/graphics/pokemon/zacian/crowned_sword/normal.pal b/graphics/pokemon/gen_8/zacian/crowned_sword/normal.pal
similarity index 100%
rename from graphics/pokemon/zacian/crowned_sword/normal.pal
rename to graphics/pokemon/gen_8/zacian/crowned_sword/normal.pal
diff --git a/graphics/pokemon/zacian/crowned_sword/shiny.pal b/graphics/pokemon/gen_8/zacian/crowned_sword/shiny.pal
similarity index 100%
rename from graphics/pokemon/zacian/crowned_sword/shiny.pal
rename to graphics/pokemon/gen_8/zacian/crowned_sword/shiny.pal
diff --git a/graphics/pokemon/zacian/footprint.png b/graphics/pokemon/gen_8/zacian/footprint.png
similarity index 100%
rename from graphics/pokemon/zacian/footprint.png
rename to graphics/pokemon/gen_8/zacian/footprint.png
diff --git a/graphics/pokemon/zacian/front.png b/graphics/pokemon/gen_8/zacian/front.png
similarity index 100%
rename from graphics/pokemon/zacian/front.png
rename to graphics/pokemon/gen_8/zacian/front.png
diff --git a/graphics/pokemon/zacian/icon.png b/graphics/pokemon/gen_8/zacian/icon.png
similarity index 100%
rename from graphics/pokemon/zacian/icon.png
rename to graphics/pokemon/gen_8/zacian/icon.png
diff --git a/graphics/pokemon/zacian/normal.pal b/graphics/pokemon/gen_8/zacian/normal.pal
similarity index 100%
rename from graphics/pokemon/zacian/normal.pal
rename to graphics/pokemon/gen_8/zacian/normal.pal
diff --git a/graphics/pokemon/zacian/shiny.pal b/graphics/pokemon/gen_8/zacian/shiny.pal
similarity index 100%
rename from graphics/pokemon/zacian/shiny.pal
rename to graphics/pokemon/gen_8/zacian/shiny.pal
diff --git a/graphics/pokemon/zamazenta/back.png b/graphics/pokemon/gen_8/zamazenta/back.png
similarity index 100%
rename from graphics/pokemon/zamazenta/back.png
rename to graphics/pokemon/gen_8/zamazenta/back.png
diff --git a/graphics/pokemon/zamazenta/crowned_shield/back.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/back.png
similarity index 100%
rename from graphics/pokemon/zamazenta/crowned_shield/back.png
rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/back.png
diff --git a/graphics/pokemon/zamazenta/crowned_shield/front.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/front.png
similarity index 100%
rename from graphics/pokemon/zamazenta/crowned_shield/front.png
rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/front.png
diff --git a/graphics/pokemon/zamazenta/crowned_shield/icon.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.png
similarity index 100%
rename from graphics/pokemon/zamazenta/crowned_shield/icon.png
rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.png
diff --git a/graphics/pokemon/zamazenta/crowned_shield/normal.pal b/graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.pal
similarity index 100%
rename from graphics/pokemon/zamazenta/crowned_shield/normal.pal
rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.pal
diff --git a/graphics/pokemon/zamazenta/crowned_shield/shiny.pal b/graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.pal
similarity index 100%
rename from graphics/pokemon/zamazenta/crowned_shield/shiny.pal
rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.pal
diff --git a/graphics/pokemon/zamazenta/footprint.png b/graphics/pokemon/gen_8/zamazenta/footprint.png
similarity index 100%
rename from graphics/pokemon/zamazenta/footprint.png
rename to graphics/pokemon/gen_8/zamazenta/footprint.png
diff --git a/graphics/pokemon/zamazenta/front.png b/graphics/pokemon/gen_8/zamazenta/front.png
similarity index 100%
rename from graphics/pokemon/zamazenta/front.png
rename to graphics/pokemon/gen_8/zamazenta/front.png
diff --git a/graphics/pokemon/zamazenta/icon.png b/graphics/pokemon/gen_8/zamazenta/icon.png
similarity index 100%
rename from graphics/pokemon/zamazenta/icon.png
rename to graphics/pokemon/gen_8/zamazenta/icon.png
diff --git a/graphics/pokemon/zamazenta/normal.pal b/graphics/pokemon/gen_8/zamazenta/normal.pal
similarity index 100%
rename from graphics/pokemon/zamazenta/normal.pal
rename to graphics/pokemon/gen_8/zamazenta/normal.pal
diff --git a/graphics/pokemon/zamazenta/shiny.pal b/graphics/pokemon/gen_8/zamazenta/shiny.pal
similarity index 100%
rename from graphics/pokemon/zamazenta/shiny.pal
rename to graphics/pokemon/gen_8/zamazenta/shiny.pal
diff --git a/graphics/pokemon/zarude/back.png b/graphics/pokemon/gen_8/zarude/back.png
similarity index 100%
rename from graphics/pokemon/zarude/back.png
rename to graphics/pokemon/gen_8/zarude/back.png
diff --git a/graphics/pokemon/zarude/dada/back.png b/graphics/pokemon/gen_8/zarude/dada/back.png
similarity index 100%
rename from graphics/pokemon/zarude/dada/back.png
rename to graphics/pokemon/gen_8/zarude/dada/back.png
diff --git a/graphics/pokemon/zarude/dada/front.png b/graphics/pokemon/gen_8/zarude/dada/front.png
similarity index 100%
rename from graphics/pokemon/zarude/dada/front.png
rename to graphics/pokemon/gen_8/zarude/dada/front.png
diff --git a/graphics/pokemon/zarude/dada/icon.png b/graphics/pokemon/gen_8/zarude/dada/icon.png
similarity index 100%
rename from graphics/pokemon/zarude/dada/icon.png
rename to graphics/pokemon/gen_8/zarude/dada/icon.png
diff --git a/graphics/pokemon/zarude/dada/normal.pal b/graphics/pokemon/gen_8/zarude/dada/normal.pal
similarity index 100%
rename from graphics/pokemon/zarude/dada/normal.pal
rename to graphics/pokemon/gen_8/zarude/dada/normal.pal
diff --git a/graphics/pokemon/zarude/dada/shiny.pal b/graphics/pokemon/gen_8/zarude/dada/shiny.pal
similarity index 100%
rename from graphics/pokemon/zarude/dada/shiny.pal
rename to graphics/pokemon/gen_8/zarude/dada/shiny.pal
diff --git a/graphics/pokemon/zarude/footprint.png b/graphics/pokemon/gen_8/zarude/footprint.png
similarity index 100%
rename from graphics/pokemon/zarude/footprint.png
rename to graphics/pokemon/gen_8/zarude/footprint.png
diff --git a/graphics/pokemon/zarude/front.png b/graphics/pokemon/gen_8/zarude/front.png
similarity index 100%
rename from graphics/pokemon/zarude/front.png
rename to graphics/pokemon/gen_8/zarude/front.png
diff --git a/graphics/pokemon/zarude/icon.png b/graphics/pokemon/gen_8/zarude/icon.png
similarity index 100%
rename from graphics/pokemon/zarude/icon.png
rename to graphics/pokemon/gen_8/zarude/icon.png
diff --git a/graphics/pokemon/zarude/normal.pal b/graphics/pokemon/gen_8/zarude/normal.pal
similarity index 100%
rename from graphics/pokemon/zarude/normal.pal
rename to graphics/pokemon/gen_8/zarude/normal.pal
diff --git a/graphics/pokemon/zarude/shiny.pal b/graphics/pokemon/gen_8/zarude/shiny.pal
similarity index 100%
rename from graphics/pokemon/zarude/shiny.pal
rename to graphics/pokemon/gen_8/zarude/shiny.pal
diff --git a/graphics/pokemon/annihilape/back.png b/graphics/pokemon/gen_9/annihilape/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/annihilape/back.png
rename to graphics/pokemon/gen_9/annihilape/back.png
diff --git a/graphics/pokemon/annihilape/front.png b/graphics/pokemon/gen_9/annihilape/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/annihilape/front.png
rename to graphics/pokemon/gen_9/annihilape/front.png
diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/gen_9/annihilape/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/annihilape/icon.png
rename to graphics/pokemon/gen_9/annihilape/icon.png
diff --git a/graphics/pokemon/annihilape/normal.pal b/graphics/pokemon/gen_9/annihilape/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/annihilape/normal.pal
rename to graphics/pokemon/gen_9/annihilape/normal.pal
diff --git a/graphics/pokemon/annihilape/shiny.pal b/graphics/pokemon/gen_9/annihilape/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/annihilape/shiny.pal
rename to graphics/pokemon/gen_9/annihilape/shiny.pal
diff --git a/graphics/pokemon/arboliva/back.png b/graphics/pokemon/gen_9/arboliva/back.png
similarity index 100%
rename from graphics/pokemon/arboliva/back.png
rename to graphics/pokemon/gen_9/arboliva/back.png
diff --git a/graphics/pokemon/arboliva/front.png b/graphics/pokemon/gen_9/arboliva/front.png
similarity index 100%
rename from graphics/pokemon/arboliva/front.png
rename to graphics/pokemon/gen_9/arboliva/front.png
diff --git a/graphics/pokemon/arboliva/icon.png b/graphics/pokemon/gen_9/arboliva/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arboliva/icon.png
rename to graphics/pokemon/gen_9/arboliva/icon.png
diff --git a/graphics/pokemon/arboliva/normal.pal b/graphics/pokemon/gen_9/arboliva/normal.pal
similarity index 100%
rename from graphics/pokemon/arboliva/normal.pal
rename to graphics/pokemon/gen_9/arboliva/normal.pal
diff --git a/graphics/pokemon/arboliva/shiny.pal b/graphics/pokemon/gen_9/arboliva/shiny.pal
similarity index 100%
rename from graphics/pokemon/arboliva/shiny.pal
rename to graphics/pokemon/gen_9/arboliva/shiny.pal
diff --git a/graphics/pokemon/arctibax/back.png b/graphics/pokemon/gen_9/arctibax/back.png
similarity index 100%
rename from graphics/pokemon/arctibax/back.png
rename to graphics/pokemon/gen_9/arctibax/back.png
diff --git a/graphics/pokemon/arctibax/front.png b/graphics/pokemon/gen_9/arctibax/front.png
similarity index 100%
rename from graphics/pokemon/arctibax/front.png
rename to graphics/pokemon/gen_9/arctibax/front.png
diff --git a/graphics/pokemon/arctibax/icon.png b/graphics/pokemon/gen_9/arctibax/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/arctibax/icon.png
rename to graphics/pokemon/gen_9/arctibax/icon.png
diff --git a/graphics/pokemon/arctibax/normal.pal b/graphics/pokemon/gen_9/arctibax/normal.pal
similarity index 100%
rename from graphics/pokemon/arctibax/normal.pal
rename to graphics/pokemon/gen_9/arctibax/normal.pal
diff --git a/graphics/pokemon/arctibax/shiny.pal b/graphics/pokemon/gen_9/arctibax/shiny.pal
similarity index 100%
rename from graphics/pokemon/arctibax/shiny.pal
rename to graphics/pokemon/gen_9/arctibax/shiny.pal
diff --git a/graphics/pokemon/armarouge/back.png b/graphics/pokemon/gen_9/armarouge/back.png
similarity index 100%
rename from graphics/pokemon/armarouge/back.png
rename to graphics/pokemon/gen_9/armarouge/back.png
diff --git a/graphics/pokemon/armarouge/front.png b/graphics/pokemon/gen_9/armarouge/front.png
similarity index 100%
rename from graphics/pokemon/armarouge/front.png
rename to graphics/pokemon/gen_9/armarouge/front.png
diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/gen_9/armarouge/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/armarouge/icon.png
rename to graphics/pokemon/gen_9/armarouge/icon.png
diff --git a/graphics/pokemon/armarouge/normal.pal b/graphics/pokemon/gen_9/armarouge/normal.pal
similarity index 100%
rename from graphics/pokemon/armarouge/normal.pal
rename to graphics/pokemon/gen_9/armarouge/normal.pal
diff --git a/graphics/pokemon/armarouge/shiny.pal b/graphics/pokemon/gen_9/armarouge/shiny.pal
similarity index 100%
rename from graphics/pokemon/armarouge/shiny.pal
rename to graphics/pokemon/gen_9/armarouge/shiny.pal
diff --git a/graphics/pokemon/baxcalibur/back.png b/graphics/pokemon/gen_9/baxcalibur/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/baxcalibur/back.png
rename to graphics/pokemon/gen_9/baxcalibur/back.png
diff --git a/graphics/pokemon/baxcalibur/front.png b/graphics/pokemon/gen_9/baxcalibur/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/baxcalibur/front.png
rename to graphics/pokemon/gen_9/baxcalibur/front.png
diff --git a/graphics/pokemon/baxcalibur/icon.png b/graphics/pokemon/gen_9/baxcalibur/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/baxcalibur/icon.png
rename to graphics/pokemon/gen_9/baxcalibur/icon.png
diff --git a/graphics/pokemon/baxcalibur/normal.pal b/graphics/pokemon/gen_9/baxcalibur/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/baxcalibur/normal.pal
rename to graphics/pokemon/gen_9/baxcalibur/normal.pal
diff --git a/graphics/pokemon/baxcalibur/shiny.pal b/graphics/pokemon/gen_9/baxcalibur/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/baxcalibur/shiny.pal
rename to graphics/pokemon/gen_9/baxcalibur/shiny.pal
diff --git a/graphics/pokemon/bellibolt/back.png b/graphics/pokemon/gen_9/bellibolt/back.png
similarity index 100%
rename from graphics/pokemon/bellibolt/back.png
rename to graphics/pokemon/gen_9/bellibolt/back.png
diff --git a/graphics/pokemon/bellibolt/front.png b/graphics/pokemon/gen_9/bellibolt/front.png
similarity index 100%
rename from graphics/pokemon/bellibolt/front.png
rename to graphics/pokemon/gen_9/bellibolt/front.png
diff --git a/graphics/pokemon/bellibolt/icon.png b/graphics/pokemon/gen_9/bellibolt/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/bellibolt/icon.png
rename to graphics/pokemon/gen_9/bellibolt/icon.png
diff --git a/graphics/pokemon/bellibolt/normal.pal b/graphics/pokemon/gen_9/bellibolt/normal.pal
similarity index 100%
rename from graphics/pokemon/bellibolt/normal.pal
rename to graphics/pokemon/gen_9/bellibolt/normal.pal
diff --git a/graphics/pokemon/bellibolt/shiny.pal b/graphics/pokemon/gen_9/bellibolt/shiny.pal
similarity index 100%
rename from graphics/pokemon/bellibolt/shiny.pal
rename to graphics/pokemon/gen_9/bellibolt/shiny.pal
diff --git a/graphics/pokemon/bombirdier/back.png b/graphics/pokemon/gen_9/bombirdier/back.png
similarity index 100%
rename from graphics/pokemon/bombirdier/back.png
rename to graphics/pokemon/gen_9/bombirdier/back.png
diff --git a/graphics/pokemon/bombirdier/front.png b/graphics/pokemon/gen_9/bombirdier/front.png
similarity index 100%
rename from graphics/pokemon/bombirdier/front.png
rename to graphics/pokemon/gen_9/bombirdier/front.png
diff --git a/graphics/pokemon/bombirdier/icon.png b/graphics/pokemon/gen_9/bombirdier/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/bombirdier/icon.png
rename to graphics/pokemon/gen_9/bombirdier/icon.png
diff --git a/graphics/pokemon/bombirdier/normal.pal b/graphics/pokemon/gen_9/bombirdier/normal.pal
similarity index 100%
rename from graphics/pokemon/bombirdier/normal.pal
rename to graphics/pokemon/gen_9/bombirdier/normal.pal
diff --git a/graphics/pokemon/bombirdier/shiny.pal b/graphics/pokemon/gen_9/bombirdier/shiny.pal
similarity index 100%
rename from graphics/pokemon/bombirdier/shiny.pal
rename to graphics/pokemon/gen_9/bombirdier/shiny.pal
diff --git a/graphics/pokemon/brambleghast/back.png b/graphics/pokemon/gen_9/brambleghast/back.png
similarity index 100%
rename from graphics/pokemon/brambleghast/back.png
rename to graphics/pokemon/gen_9/brambleghast/back.png
diff --git a/graphics/pokemon/brambleghast/front.png b/graphics/pokemon/gen_9/brambleghast/front.png
similarity index 100%
rename from graphics/pokemon/brambleghast/front.png
rename to graphics/pokemon/gen_9/brambleghast/front.png
diff --git a/graphics/pokemon/brambleghast/icon.png b/graphics/pokemon/gen_9/brambleghast/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/brambleghast/icon.png
rename to graphics/pokemon/gen_9/brambleghast/icon.png
diff --git a/graphics/pokemon/brambleghast/normal.pal b/graphics/pokemon/gen_9/brambleghast/normal.pal
similarity index 100%
rename from graphics/pokemon/brambleghast/normal.pal
rename to graphics/pokemon/gen_9/brambleghast/normal.pal
diff --git a/graphics/pokemon/brambleghast/shiny.pal b/graphics/pokemon/gen_9/brambleghast/shiny.pal
similarity index 100%
rename from graphics/pokemon/brambleghast/shiny.pal
rename to graphics/pokemon/gen_9/brambleghast/shiny.pal
diff --git a/graphics/pokemon/bramblin/back.png b/graphics/pokemon/gen_9/bramblin/back.png
similarity index 100%
rename from graphics/pokemon/bramblin/back.png
rename to graphics/pokemon/gen_9/bramblin/back.png
diff --git a/graphics/pokemon/bramblin/front.png b/graphics/pokemon/gen_9/bramblin/front.png
similarity index 100%
rename from graphics/pokemon/bramblin/front.png
rename to graphics/pokemon/gen_9/bramblin/front.png
diff --git a/graphics/pokemon/bramblin/icon.png b/graphics/pokemon/gen_9/bramblin/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/bramblin/icon.png
rename to graphics/pokemon/gen_9/bramblin/icon.png
diff --git a/graphics/pokemon/bramblin/normal.pal b/graphics/pokemon/gen_9/bramblin/normal.pal
similarity index 100%
rename from graphics/pokemon/bramblin/normal.pal
rename to graphics/pokemon/gen_9/bramblin/normal.pal
diff --git a/graphics/pokemon/bramblin/shiny.pal b/graphics/pokemon/gen_9/bramblin/shiny.pal
similarity index 100%
rename from graphics/pokemon/bramblin/shiny.pal
rename to graphics/pokemon/gen_9/bramblin/shiny.pal
diff --git a/graphics/pokemon/brute_bonnet/back.png b/graphics/pokemon/gen_9/brute_bonnet/back.png
similarity index 100%
rename from graphics/pokemon/brute_bonnet/back.png
rename to graphics/pokemon/gen_9/brute_bonnet/back.png
diff --git a/graphics/pokemon/brute_bonnet/front.png b/graphics/pokemon/gen_9/brute_bonnet/front.png
similarity index 100%
rename from graphics/pokemon/brute_bonnet/front.png
rename to graphics/pokemon/gen_9/brute_bonnet/front.png
diff --git a/graphics/pokemon/brute_bonnet/icon.png b/graphics/pokemon/gen_9/brute_bonnet/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/brute_bonnet/icon.png
rename to graphics/pokemon/gen_9/brute_bonnet/icon.png
diff --git a/graphics/pokemon/brute_bonnet/normal.pal b/graphics/pokemon/gen_9/brute_bonnet/normal.pal
similarity index 100%
rename from graphics/pokemon/brute_bonnet/normal.pal
rename to graphics/pokemon/gen_9/brute_bonnet/normal.pal
diff --git a/graphics/pokemon/brute_bonnet/shiny.pal b/graphics/pokemon/gen_9/brute_bonnet/shiny.pal
similarity index 100%
rename from graphics/pokemon/brute_bonnet/shiny.pal
rename to graphics/pokemon/gen_9/brute_bonnet/shiny.pal
diff --git a/graphics/pokemon/capsakid/back.png b/graphics/pokemon/gen_9/capsakid/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/capsakid/back.png
rename to graphics/pokemon/gen_9/capsakid/back.png
diff --git a/graphics/pokemon/capsakid/front.png b/graphics/pokemon/gen_9/capsakid/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/capsakid/front.png
rename to graphics/pokemon/gen_9/capsakid/front.png
diff --git a/graphics/pokemon/capsakid/icon.png b/graphics/pokemon/gen_9/capsakid/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/capsakid/icon.png
rename to graphics/pokemon/gen_9/capsakid/icon.png
diff --git a/graphics/pokemon/capsakid/normal.pal b/graphics/pokemon/gen_9/capsakid/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/capsakid/normal.pal
rename to graphics/pokemon/gen_9/capsakid/normal.pal
diff --git a/graphics/pokemon/capsakid/shiny.pal b/graphics/pokemon/gen_9/capsakid/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/capsakid/shiny.pal
rename to graphics/pokemon/gen_9/capsakid/shiny.pal
diff --git a/graphics/pokemon/ceruledge/back.png b/graphics/pokemon/gen_9/ceruledge/back.png
similarity index 100%
rename from graphics/pokemon/ceruledge/back.png
rename to graphics/pokemon/gen_9/ceruledge/back.png
diff --git a/graphics/pokemon/ceruledge/front.png b/graphics/pokemon/gen_9/ceruledge/front.png
similarity index 100%
rename from graphics/pokemon/ceruledge/front.png
rename to graphics/pokemon/gen_9/ceruledge/front.png
diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/gen_9/ceruledge/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/ceruledge/icon.png
rename to graphics/pokemon/gen_9/ceruledge/icon.png
diff --git a/graphics/pokemon/ceruledge/normal.pal b/graphics/pokemon/gen_9/ceruledge/normal.pal
similarity index 100%
rename from graphics/pokemon/ceruledge/normal.pal
rename to graphics/pokemon/gen_9/ceruledge/normal.pal
diff --git a/graphics/pokemon/ceruledge/shiny.pal b/graphics/pokemon/gen_9/ceruledge/shiny.pal
similarity index 100%
rename from graphics/pokemon/ceruledge/shiny.pal
rename to graphics/pokemon/gen_9/ceruledge/shiny.pal
diff --git a/graphics/pokemon/cetitan/back.png b/graphics/pokemon/gen_9/cetitan/back.png
similarity index 100%
rename from graphics/pokemon/cetitan/back.png
rename to graphics/pokemon/gen_9/cetitan/back.png
diff --git a/graphics/pokemon/cetitan/front.png b/graphics/pokemon/gen_9/cetitan/front.png
similarity index 100%
rename from graphics/pokemon/cetitan/front.png
rename to graphics/pokemon/gen_9/cetitan/front.png
diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/gen_9/cetitan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/cetitan/icon.png
rename to graphics/pokemon/gen_9/cetitan/icon.png
diff --git a/graphics/pokemon/cetitan/normal.pal b/graphics/pokemon/gen_9/cetitan/normal.pal
similarity index 100%
rename from graphics/pokemon/cetitan/normal.pal
rename to graphics/pokemon/gen_9/cetitan/normal.pal
diff --git a/graphics/pokemon/cetitan/shiny.pal b/graphics/pokemon/gen_9/cetitan/shiny.pal
similarity index 100%
rename from graphics/pokemon/cetitan/shiny.pal
rename to graphics/pokemon/gen_9/cetitan/shiny.pal
diff --git a/graphics/pokemon/cetoddle/back.png b/graphics/pokemon/gen_9/cetoddle/back.png
similarity index 100%
rename from graphics/pokemon/cetoddle/back.png
rename to graphics/pokemon/gen_9/cetoddle/back.png
diff --git a/graphics/pokemon/cetoddle/front.png b/graphics/pokemon/gen_9/cetoddle/front.png
similarity index 100%
rename from graphics/pokemon/cetoddle/front.png
rename to graphics/pokemon/gen_9/cetoddle/front.png
diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/gen_9/cetoddle/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/cetoddle/icon.png
rename to graphics/pokemon/gen_9/cetoddle/icon.png
diff --git a/graphics/pokemon/cetoddle/normal.pal b/graphics/pokemon/gen_9/cetoddle/normal.pal
similarity index 100%
rename from graphics/pokemon/cetoddle/normal.pal
rename to graphics/pokemon/gen_9/cetoddle/normal.pal
diff --git a/graphics/pokemon/cetoddle/shiny.pal b/graphics/pokemon/gen_9/cetoddle/shiny.pal
similarity index 100%
rename from graphics/pokemon/cetoddle/shiny.pal
rename to graphics/pokemon/gen_9/cetoddle/shiny.pal
diff --git a/graphics/pokemon/charcadet/back.png b/graphics/pokemon/gen_9/charcadet/back.png
similarity index 100%
rename from graphics/pokemon/charcadet/back.png
rename to graphics/pokemon/gen_9/charcadet/back.png
diff --git a/graphics/pokemon/charcadet/front.png b/graphics/pokemon/gen_9/charcadet/front.png
similarity index 100%
rename from graphics/pokemon/charcadet/front.png
rename to graphics/pokemon/gen_9/charcadet/front.png
diff --git a/graphics/pokemon/charcadet/icon.png b/graphics/pokemon/gen_9/charcadet/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/charcadet/icon.png
rename to graphics/pokemon/gen_9/charcadet/icon.png
diff --git a/graphics/pokemon/charcadet/normal.pal b/graphics/pokemon/gen_9/charcadet/normal.pal
similarity index 100%
rename from graphics/pokemon/charcadet/normal.pal
rename to graphics/pokemon/gen_9/charcadet/normal.pal
diff --git a/graphics/pokemon/charcadet/shiny.pal b/graphics/pokemon/gen_9/charcadet/shiny.pal
similarity index 100%
rename from graphics/pokemon/charcadet/shiny.pal
rename to graphics/pokemon/gen_9/charcadet/shiny.pal
diff --git a/graphics/pokemon/chi_yu/back.png b/graphics/pokemon/gen_9/chi_yu/back.png
similarity index 100%
rename from graphics/pokemon/chi_yu/back.png
rename to graphics/pokemon/gen_9/chi_yu/back.png
diff --git a/graphics/pokemon/chi_yu/front.png b/graphics/pokemon/gen_9/chi_yu/front.png
similarity index 100%
rename from graphics/pokemon/chi_yu/front.png
rename to graphics/pokemon/gen_9/chi_yu/front.png
diff --git a/graphics/pokemon/chi_yu/icon.png b/graphics/pokemon/gen_9/chi_yu/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/chi_yu/icon.png
rename to graphics/pokemon/gen_9/chi_yu/icon.png
diff --git a/graphics/pokemon/chi_yu/normal.pal b/graphics/pokemon/gen_9/chi_yu/normal.pal
similarity index 100%
rename from graphics/pokemon/chi_yu/normal.pal
rename to graphics/pokemon/gen_9/chi_yu/normal.pal
diff --git a/graphics/pokemon/chi_yu/shiny.pal b/graphics/pokemon/gen_9/chi_yu/shiny.pal
similarity index 100%
rename from graphics/pokemon/chi_yu/shiny.pal
rename to graphics/pokemon/gen_9/chi_yu/shiny.pal
diff --git a/graphics/pokemon/chien_pao/back.png b/graphics/pokemon/gen_9/chien_pao/back.png
similarity index 100%
rename from graphics/pokemon/chien_pao/back.png
rename to graphics/pokemon/gen_9/chien_pao/back.png
diff --git a/graphics/pokemon/chien_pao/front.png b/graphics/pokemon/gen_9/chien_pao/front.png
similarity index 100%
rename from graphics/pokemon/chien_pao/front.png
rename to graphics/pokemon/gen_9/chien_pao/front.png
diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/gen_9/chien_pao/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/chien_pao/icon.png
rename to graphics/pokemon/gen_9/chien_pao/icon.png
diff --git a/graphics/pokemon/chien_pao/normal.pal b/graphics/pokemon/gen_9/chien_pao/normal.pal
similarity index 100%
rename from graphics/pokemon/chien_pao/normal.pal
rename to graphics/pokemon/gen_9/chien_pao/normal.pal
diff --git a/graphics/pokemon/chien_pao/shiny.pal b/graphics/pokemon/gen_9/chien_pao/shiny.pal
similarity index 100%
rename from graphics/pokemon/chien_pao/shiny.pal
rename to graphics/pokemon/gen_9/chien_pao/shiny.pal
diff --git a/graphics/pokemon/clodsire/back.png b/graphics/pokemon/gen_9/clodsire/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/clodsire/back.png
rename to graphics/pokemon/gen_9/clodsire/back.png
diff --git a/graphics/pokemon/clodsire/front.png b/graphics/pokemon/gen_9/clodsire/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/clodsire/front.png
rename to graphics/pokemon/gen_9/clodsire/front.png
diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/gen_9/clodsire/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/clodsire/icon.png
rename to graphics/pokemon/gen_9/clodsire/icon.png
diff --git a/graphics/pokemon/clodsire/normal.pal b/graphics/pokemon/gen_9/clodsire/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/clodsire/normal.pal
rename to graphics/pokemon/gen_9/clodsire/normal.pal
diff --git a/graphics/pokemon/clodsire/shiny.pal b/graphics/pokemon/gen_9/clodsire/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/clodsire/shiny.pal
rename to graphics/pokemon/gen_9/clodsire/shiny.pal
diff --git a/graphics/pokemon/crocalor/back.png b/graphics/pokemon/gen_9/crocalor/back.png
similarity index 100%
rename from graphics/pokemon/crocalor/back.png
rename to graphics/pokemon/gen_9/crocalor/back.png
diff --git a/graphics/pokemon/crocalor/front.png b/graphics/pokemon/gen_9/crocalor/front.png
similarity index 100%
rename from graphics/pokemon/crocalor/front.png
rename to graphics/pokemon/gen_9/crocalor/front.png
diff --git a/graphics/pokemon/crocalor/icon.png b/graphics/pokemon/gen_9/crocalor/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/crocalor/icon.png
rename to graphics/pokemon/gen_9/crocalor/icon.png
diff --git a/graphics/pokemon/crocalor/normal.pal b/graphics/pokemon/gen_9/crocalor/normal.pal
similarity index 100%
rename from graphics/pokemon/crocalor/normal.pal
rename to graphics/pokemon/gen_9/crocalor/normal.pal
diff --git a/graphics/pokemon/crocalor/shiny.pal b/graphics/pokemon/gen_9/crocalor/shiny.pal
similarity index 100%
rename from graphics/pokemon/crocalor/shiny.pal
rename to graphics/pokemon/gen_9/crocalor/shiny.pal
diff --git a/graphics/pokemon/cyclizar/back.png b/graphics/pokemon/gen_9/cyclizar/back.png
similarity index 100%
rename from graphics/pokemon/cyclizar/back.png
rename to graphics/pokemon/gen_9/cyclizar/back.png
diff --git a/graphics/pokemon/cyclizar/front.png b/graphics/pokemon/gen_9/cyclizar/front.png
similarity index 100%
rename from graphics/pokemon/cyclizar/front.png
rename to graphics/pokemon/gen_9/cyclizar/front.png
diff --git a/graphics/pokemon/cyclizar/icon.png b/graphics/pokemon/gen_9/cyclizar/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/cyclizar/icon.png
rename to graphics/pokemon/gen_9/cyclizar/icon.png
diff --git a/graphics/pokemon/cyclizar/normal.pal b/graphics/pokemon/gen_9/cyclizar/normal.pal
similarity index 100%
rename from graphics/pokemon/cyclizar/normal.pal
rename to graphics/pokemon/gen_9/cyclizar/normal.pal
diff --git a/graphics/pokemon/cyclizar/shiny.pal b/graphics/pokemon/gen_9/cyclizar/shiny.pal
similarity index 100%
rename from graphics/pokemon/cyclizar/shiny.pal
rename to graphics/pokemon/gen_9/cyclizar/shiny.pal
diff --git a/graphics/pokemon/dachsbun/back.png b/graphics/pokemon/gen_9/dachsbun/back.png
similarity index 100%
rename from graphics/pokemon/dachsbun/back.png
rename to graphics/pokemon/gen_9/dachsbun/back.png
diff --git a/graphics/pokemon/dachsbun/front.png b/graphics/pokemon/gen_9/dachsbun/front.png
similarity index 100%
rename from graphics/pokemon/dachsbun/front.png
rename to graphics/pokemon/gen_9/dachsbun/front.png
diff --git a/graphics/pokemon/dachsbun/icon.png b/graphics/pokemon/gen_9/dachsbun/icon.png
similarity index 100%
rename from graphics/pokemon/dachsbun/icon.png
rename to graphics/pokemon/gen_9/dachsbun/icon.png
diff --git a/graphics/pokemon/dachsbun/normal.pal b/graphics/pokemon/gen_9/dachsbun/normal.pal
similarity index 100%
rename from graphics/pokemon/dachsbun/normal.pal
rename to graphics/pokemon/gen_9/dachsbun/normal.pal
diff --git a/graphics/pokemon/dachsbun/shiny.pal b/graphics/pokemon/gen_9/dachsbun/shiny.pal
similarity index 100%
rename from graphics/pokemon/dachsbun/shiny.pal
rename to graphics/pokemon/gen_9/dachsbun/shiny.pal
diff --git a/graphics/pokemon/dipplin/back.png b/graphics/pokemon/gen_9/dipplin/back.png
similarity index 100%
rename from graphics/pokemon/dipplin/back.png
rename to graphics/pokemon/gen_9/dipplin/back.png
diff --git a/graphics/pokemon/dipplin/front.png b/graphics/pokemon/gen_9/dipplin/front.png
similarity index 100%
rename from graphics/pokemon/dipplin/front.png
rename to graphics/pokemon/gen_9/dipplin/front.png
diff --git a/graphics/pokemon/dipplin/icon.png b/graphics/pokemon/gen_9/dipplin/icon.png
similarity index 100%
rename from graphics/pokemon/dipplin/icon.png
rename to graphics/pokemon/gen_9/dipplin/icon.png
diff --git a/graphics/pokemon/dipplin/normal.pal b/graphics/pokemon/gen_9/dipplin/normal.pal
similarity index 100%
rename from graphics/pokemon/dipplin/normal.pal
rename to graphics/pokemon/gen_9/dipplin/normal.pal
diff --git a/graphics/pokemon/dipplin/shiny.pal b/graphics/pokemon/gen_9/dipplin/shiny.pal
similarity index 100%
rename from graphics/pokemon/dipplin/shiny.pal
rename to graphics/pokemon/gen_9/dipplin/shiny.pal
diff --git a/graphics/pokemon/dolliv/back.png b/graphics/pokemon/gen_9/dolliv/back.png
similarity index 100%
rename from graphics/pokemon/dolliv/back.png
rename to graphics/pokemon/gen_9/dolliv/back.png
diff --git a/graphics/pokemon/dolliv/front.png b/graphics/pokemon/gen_9/dolliv/front.png
similarity index 100%
rename from graphics/pokemon/dolliv/front.png
rename to graphics/pokemon/gen_9/dolliv/front.png
diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/gen_9/dolliv/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dolliv/icon.png
rename to graphics/pokemon/gen_9/dolliv/icon.png
diff --git a/graphics/pokemon/dolliv/normal.pal b/graphics/pokemon/gen_9/dolliv/normal.pal
similarity index 100%
rename from graphics/pokemon/dolliv/normal.pal
rename to graphics/pokemon/gen_9/dolliv/normal.pal
diff --git a/graphics/pokemon/dolliv/shiny.pal b/graphics/pokemon/gen_9/dolliv/shiny.pal
similarity index 100%
rename from graphics/pokemon/dolliv/shiny.pal
rename to graphics/pokemon/gen_9/dolliv/shiny.pal
diff --git a/graphics/pokemon/dondozo/back.png b/graphics/pokemon/gen_9/dondozo/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dondozo/back.png
rename to graphics/pokemon/gen_9/dondozo/back.png
diff --git a/graphics/pokemon/dondozo/front.png b/graphics/pokemon/gen_9/dondozo/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dondozo/front.png
rename to graphics/pokemon/gen_9/dondozo/front.png
diff --git a/graphics/pokemon/dondozo/icon.png b/graphics/pokemon/gen_9/dondozo/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dondozo/icon.png
rename to graphics/pokemon/gen_9/dondozo/icon.png
diff --git a/graphics/pokemon/dondozo/normal.pal b/graphics/pokemon/gen_9/dondozo/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dondozo/normal.pal
rename to graphics/pokemon/gen_9/dondozo/normal.pal
diff --git a/graphics/pokemon/dondozo/shiny.pal b/graphics/pokemon/gen_9/dondozo/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dondozo/shiny.pal
rename to graphics/pokemon/gen_9/dondozo/shiny.pal
diff --git a/graphics/pokemon/dudunsparce/back.png b/graphics/pokemon/gen_9/dudunsparce/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dudunsparce/back.png
rename to graphics/pokemon/gen_9/dudunsparce/back.png
diff --git a/graphics/pokemon/dudunsparce/front.png b/graphics/pokemon/gen_9/dudunsparce/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dudunsparce/front.png
rename to graphics/pokemon/gen_9/dudunsparce/front.png
diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/gen_9/dudunsparce/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dudunsparce/icon.png
rename to graphics/pokemon/gen_9/dudunsparce/icon.png
diff --git a/graphics/pokemon/dudunsparce/normal.pal b/graphics/pokemon/gen_9/dudunsparce/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dudunsparce/normal.pal
rename to graphics/pokemon/gen_9/dudunsparce/normal.pal
diff --git a/graphics/pokemon/dudunsparce/shiny.pal b/graphics/pokemon/gen_9/dudunsparce/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/dudunsparce/shiny.pal
rename to graphics/pokemon/gen_9/dudunsparce/shiny.pal
diff --git a/graphics/pokemon/dudunsparce/three_segment/back.png b/graphics/pokemon/gen_9/dudunsparce/three_segment/back.png
similarity index 100%
rename from graphics/pokemon/dudunsparce/three_segment/back.png
rename to graphics/pokemon/gen_9/dudunsparce/three_segment/back.png
diff --git a/graphics/pokemon/dudunsparce/three_segment/front.png b/graphics/pokemon/gen_9/dudunsparce/three_segment/front.png
similarity index 100%
rename from graphics/pokemon/dudunsparce/three_segment/front.png
rename to graphics/pokemon/gen_9/dudunsparce/three_segment/front.png
diff --git a/graphics/pokemon/espathra/back.png b/graphics/pokemon/gen_9/espathra/back.png
similarity index 100%
rename from graphics/pokemon/espathra/back.png
rename to graphics/pokemon/gen_9/espathra/back.png
diff --git a/graphics/pokemon/espathra/front.png b/graphics/pokemon/gen_9/espathra/front.png
similarity index 100%
rename from graphics/pokemon/espathra/front.png
rename to graphics/pokemon/gen_9/espathra/front.png
diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/gen_9/espathra/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/espathra/icon.png
rename to graphics/pokemon/gen_9/espathra/icon.png
diff --git a/graphics/pokemon/espathra/normal.pal b/graphics/pokemon/gen_9/espathra/normal.pal
similarity index 100%
rename from graphics/pokemon/espathra/normal.pal
rename to graphics/pokemon/gen_9/espathra/normal.pal
diff --git a/graphics/pokemon/espathra/shiny.pal b/graphics/pokemon/gen_9/espathra/shiny.pal
similarity index 100%
rename from graphics/pokemon/espathra/shiny.pal
rename to graphics/pokemon/gen_9/espathra/shiny.pal
diff --git a/graphics/pokemon/farigiraf/back.png b/graphics/pokemon/gen_9/farigiraf/back.png
similarity index 100%
rename from graphics/pokemon/farigiraf/back.png
rename to graphics/pokemon/gen_9/farigiraf/back.png
diff --git a/graphics/pokemon/farigiraf/front.png b/graphics/pokemon/gen_9/farigiraf/front.png
similarity index 100%
rename from graphics/pokemon/farigiraf/front.png
rename to graphics/pokemon/gen_9/farigiraf/front.png
diff --git a/graphics/pokemon/farigiraf/icon.png b/graphics/pokemon/gen_9/farigiraf/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/farigiraf/icon.png
rename to graphics/pokemon/gen_9/farigiraf/icon.png
diff --git a/graphics/pokemon/farigiraf/normal.pal b/graphics/pokemon/gen_9/farigiraf/normal.pal
similarity index 100%
rename from graphics/pokemon/farigiraf/normal.pal
rename to graphics/pokemon/gen_9/farigiraf/normal.pal
diff --git a/graphics/pokemon/farigiraf/shiny.pal b/graphics/pokemon/gen_9/farigiraf/shiny.pal
similarity index 100%
rename from graphics/pokemon/farigiraf/shiny.pal
rename to graphics/pokemon/gen_9/farigiraf/shiny.pal
diff --git a/graphics/pokemon/fezandipiti/back.png b/graphics/pokemon/gen_9/fezandipiti/back.png
similarity index 100%
rename from graphics/pokemon/fezandipiti/back.png
rename to graphics/pokemon/gen_9/fezandipiti/back.png
diff --git a/graphics/pokemon/fezandipiti/front.png b/graphics/pokemon/gen_9/fezandipiti/front.png
similarity index 100%
rename from graphics/pokemon/fezandipiti/front.png
rename to graphics/pokemon/gen_9/fezandipiti/front.png
diff --git a/graphics/pokemon/fezandipiti/icon.png b/graphics/pokemon/gen_9/fezandipiti/icon.png
similarity index 100%
rename from graphics/pokemon/fezandipiti/icon.png
rename to graphics/pokemon/gen_9/fezandipiti/icon.png
diff --git a/graphics/pokemon/fezandipiti/normal.pal b/graphics/pokemon/gen_9/fezandipiti/normal.pal
similarity index 100%
rename from graphics/pokemon/fezandipiti/normal.pal
rename to graphics/pokemon/gen_9/fezandipiti/normal.pal
diff --git a/graphics/pokemon/fezandipiti/shiny.pal b/graphics/pokemon/gen_9/fezandipiti/shiny.pal
similarity index 100%
rename from graphics/pokemon/fezandipiti/shiny.pal
rename to graphics/pokemon/gen_9/fezandipiti/shiny.pal
diff --git a/graphics/pokemon/fidough/back.png b/graphics/pokemon/gen_9/fidough/back.png
similarity index 100%
rename from graphics/pokemon/fidough/back.png
rename to graphics/pokemon/gen_9/fidough/back.png
diff --git a/graphics/pokemon/fidough/front.png b/graphics/pokemon/gen_9/fidough/front.png
similarity index 100%
rename from graphics/pokemon/fidough/front.png
rename to graphics/pokemon/gen_9/fidough/front.png
diff --git a/graphics/pokemon/fidough/icon.png b/graphics/pokemon/gen_9/fidough/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/fidough/icon.png
rename to graphics/pokemon/gen_9/fidough/icon.png
diff --git a/graphics/pokemon/fidough/normal.pal b/graphics/pokemon/gen_9/fidough/normal.pal
similarity index 100%
rename from graphics/pokemon/fidough/normal.pal
rename to graphics/pokemon/gen_9/fidough/normal.pal
diff --git a/graphics/pokemon/fidough/shiny.pal b/graphics/pokemon/gen_9/fidough/shiny.pal
similarity index 100%
rename from graphics/pokemon/fidough/shiny.pal
rename to graphics/pokemon/gen_9/fidough/shiny.pal
diff --git a/graphics/pokemon/finizen/back.png b/graphics/pokemon/gen_9/finizen/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/finizen/back.png
rename to graphics/pokemon/gen_9/finizen/back.png
diff --git a/graphics/pokemon/finizen/front.png b/graphics/pokemon/gen_9/finizen/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/finizen/front.png
rename to graphics/pokemon/gen_9/finizen/front.png
diff --git a/graphics/pokemon/finizen/icon.png b/graphics/pokemon/gen_9/finizen/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/finizen/icon.png
rename to graphics/pokemon/gen_9/finizen/icon.png
diff --git a/graphics/pokemon/finizen/normal.pal b/graphics/pokemon/gen_9/finizen/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/finizen/normal.pal
rename to graphics/pokemon/gen_9/finizen/normal.pal
diff --git a/graphics/pokemon/finizen/shiny.pal b/graphics/pokemon/gen_9/finizen/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/finizen/shiny.pal
rename to graphics/pokemon/gen_9/finizen/shiny.pal
diff --git a/graphics/pokemon/flamigo/back.png b/graphics/pokemon/gen_9/flamigo/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flamigo/back.png
rename to graphics/pokemon/gen_9/flamigo/back.png
diff --git a/graphics/pokemon/flamigo/front.png b/graphics/pokemon/gen_9/flamigo/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flamigo/front.png
rename to graphics/pokemon/gen_9/flamigo/front.png
diff --git a/graphics/pokemon/flamigo/icon.png b/graphics/pokemon/gen_9/flamigo/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flamigo/icon.png
rename to graphics/pokemon/gen_9/flamigo/icon.png
diff --git a/graphics/pokemon/flamigo/normal.pal b/graphics/pokemon/gen_9/flamigo/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flamigo/normal.pal
rename to graphics/pokemon/gen_9/flamigo/normal.pal
diff --git a/graphics/pokemon/flamigo/shiny.pal b/graphics/pokemon/gen_9/flamigo/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flamigo/shiny.pal
rename to graphics/pokemon/gen_9/flamigo/shiny.pal
diff --git a/graphics/pokemon/flittle/back.png b/graphics/pokemon/gen_9/flittle/back.png
similarity index 100%
rename from graphics/pokemon/flittle/back.png
rename to graphics/pokemon/gen_9/flittle/back.png
diff --git a/graphics/pokemon/flittle/front.png b/graphics/pokemon/gen_9/flittle/front.png
similarity index 100%
rename from graphics/pokemon/flittle/front.png
rename to graphics/pokemon/gen_9/flittle/front.png
diff --git a/graphics/pokemon/flittle/icon.png b/graphics/pokemon/gen_9/flittle/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flittle/icon.png
rename to graphics/pokemon/gen_9/flittle/icon.png
diff --git a/graphics/pokemon/flittle/normal.pal b/graphics/pokemon/gen_9/flittle/normal.pal
similarity index 100%
rename from graphics/pokemon/flittle/normal.pal
rename to graphics/pokemon/gen_9/flittle/normal.pal
diff --git a/graphics/pokemon/flittle/shiny.pal b/graphics/pokemon/gen_9/flittle/shiny.pal
similarity index 100%
rename from graphics/pokemon/flittle/shiny.pal
rename to graphics/pokemon/gen_9/flittle/shiny.pal
diff --git a/graphics/pokemon/floragato/back.png b/graphics/pokemon/gen_9/floragato/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/floragato/back.png
rename to graphics/pokemon/gen_9/floragato/back.png
diff --git a/graphics/pokemon/floragato/front.png b/graphics/pokemon/gen_9/floragato/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/floragato/front.png
rename to graphics/pokemon/gen_9/floragato/front.png
diff --git a/graphics/pokemon/floragato/icon.png b/graphics/pokemon/gen_9/floragato/icon.png
similarity index 100%
rename from graphics/pokemon/floragato/icon.png
rename to graphics/pokemon/gen_9/floragato/icon.png
diff --git a/graphics/pokemon/floragato/normal.pal b/graphics/pokemon/gen_9/floragato/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/floragato/normal.pal
rename to graphics/pokemon/gen_9/floragato/normal.pal
diff --git a/graphics/pokemon/floragato/shiny.pal b/graphics/pokemon/gen_9/floragato/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/floragato/shiny.pal
rename to graphics/pokemon/gen_9/floragato/shiny.pal
diff --git a/graphics/pokemon/flutter_mane/back.png b/graphics/pokemon/gen_9/flutter_mane/back.png
similarity index 100%
rename from graphics/pokemon/flutter_mane/back.png
rename to graphics/pokemon/gen_9/flutter_mane/back.png
diff --git a/graphics/pokemon/flutter_mane/front.png b/graphics/pokemon/gen_9/flutter_mane/front.png
similarity index 100%
rename from graphics/pokemon/flutter_mane/front.png
rename to graphics/pokemon/gen_9/flutter_mane/front.png
diff --git a/graphics/pokemon/flutter_mane/icon.png b/graphics/pokemon/gen_9/flutter_mane/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/flutter_mane/icon.png
rename to graphics/pokemon/gen_9/flutter_mane/icon.png
diff --git a/graphics/pokemon/flutter_mane/normal.pal b/graphics/pokemon/gen_9/flutter_mane/normal.pal
similarity index 100%
rename from graphics/pokemon/flutter_mane/normal.pal
rename to graphics/pokemon/gen_9/flutter_mane/normal.pal
diff --git a/graphics/pokemon/flutter_mane/shiny.pal b/graphics/pokemon/gen_9/flutter_mane/shiny.pal
similarity index 100%
rename from graphics/pokemon/flutter_mane/shiny.pal
rename to graphics/pokemon/gen_9/flutter_mane/shiny.pal
diff --git a/graphics/pokemon/frigibax/anim_front.png b/graphics/pokemon/gen_9/frigibax/anim_front.png
similarity index 100%
rename from graphics/pokemon/frigibax/anim_front.png
rename to graphics/pokemon/gen_9/frigibax/anim_front.png
diff --git a/graphics/pokemon/frigibax/back.png b/graphics/pokemon/gen_9/frigibax/back.png
similarity index 100%
rename from graphics/pokemon/frigibax/back.png
rename to graphics/pokemon/gen_9/frigibax/back.png
diff --git a/graphics/pokemon/frigibax/icon.png b/graphics/pokemon/gen_9/frigibax/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/frigibax/icon.png
rename to graphics/pokemon/gen_9/frigibax/icon.png
diff --git a/graphics/pokemon/frigibax/normal.pal b/graphics/pokemon/gen_9/frigibax/normal.pal
similarity index 100%
rename from graphics/pokemon/frigibax/normal.pal
rename to graphics/pokemon/gen_9/frigibax/normal.pal
diff --git a/graphics/pokemon/frigibax/shiny.pal b/graphics/pokemon/gen_9/frigibax/shiny.pal
similarity index 100%
rename from graphics/pokemon/frigibax/shiny.pal
rename to graphics/pokemon/gen_9/frigibax/shiny.pal
diff --git a/graphics/pokemon/fuecoco/back.png b/graphics/pokemon/gen_9/fuecoco/back.png
similarity index 100%
rename from graphics/pokemon/fuecoco/back.png
rename to graphics/pokemon/gen_9/fuecoco/back.png
diff --git a/graphics/pokemon/fuecoco/front.png b/graphics/pokemon/gen_9/fuecoco/front.png
similarity index 100%
rename from graphics/pokemon/fuecoco/front.png
rename to graphics/pokemon/gen_9/fuecoco/front.png
diff --git a/graphics/pokemon/fuecoco/icon.png b/graphics/pokemon/gen_9/fuecoco/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/fuecoco/icon.png
rename to graphics/pokemon/gen_9/fuecoco/icon.png
diff --git a/graphics/pokemon/fuecoco/normal.pal b/graphics/pokemon/gen_9/fuecoco/normal.pal
similarity index 100%
rename from graphics/pokemon/fuecoco/normal.pal
rename to graphics/pokemon/gen_9/fuecoco/normal.pal
diff --git a/graphics/pokemon/fuecoco/shiny.pal b/graphics/pokemon/gen_9/fuecoco/shiny.pal
similarity index 100%
rename from graphics/pokemon/fuecoco/shiny.pal
rename to graphics/pokemon/gen_9/fuecoco/shiny.pal
diff --git a/graphics/pokemon/garganacl/back.png b/graphics/pokemon/gen_9/garganacl/back.png
similarity index 100%
rename from graphics/pokemon/garganacl/back.png
rename to graphics/pokemon/gen_9/garganacl/back.png
diff --git a/graphics/pokemon/garganacl/front.png b/graphics/pokemon/gen_9/garganacl/front.png
similarity index 100%
rename from graphics/pokemon/garganacl/front.png
rename to graphics/pokemon/gen_9/garganacl/front.png
diff --git a/graphics/pokemon/garganacl/icon.png b/graphics/pokemon/gen_9/garganacl/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/garganacl/icon.png
rename to graphics/pokemon/gen_9/garganacl/icon.png
diff --git a/graphics/pokemon/garganacl/normal.pal b/graphics/pokemon/gen_9/garganacl/normal.pal
similarity index 100%
rename from graphics/pokemon/garganacl/normal.pal
rename to graphics/pokemon/gen_9/garganacl/normal.pal
diff --git a/graphics/pokemon/garganacl/shiny.pal b/graphics/pokemon/gen_9/garganacl/shiny.pal
similarity index 100%
rename from graphics/pokemon/garganacl/shiny.pal
rename to graphics/pokemon/gen_9/garganacl/shiny.pal
diff --git a/graphics/pokemon/gholdengo/back.png b/graphics/pokemon/gen_9/gholdengo/back.png
similarity index 100%
rename from graphics/pokemon/gholdengo/back.png
rename to graphics/pokemon/gen_9/gholdengo/back.png
diff --git a/graphics/pokemon/gholdengo/front.png b/graphics/pokemon/gen_9/gholdengo/front.png
similarity index 100%
rename from graphics/pokemon/gholdengo/front.png
rename to graphics/pokemon/gen_9/gholdengo/front.png
diff --git a/graphics/pokemon/gholdengo/icon.png b/graphics/pokemon/gen_9/gholdengo/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/gholdengo/icon.png
rename to graphics/pokemon/gen_9/gholdengo/icon.png
diff --git a/graphics/pokemon/gholdengo/normal.pal b/graphics/pokemon/gen_9/gholdengo/normal.pal
similarity index 100%
rename from graphics/pokemon/gholdengo/normal.pal
rename to graphics/pokemon/gen_9/gholdengo/normal.pal
diff --git a/graphics/pokemon/gholdengo/shiny.pal b/graphics/pokemon/gen_9/gholdengo/shiny.pal
similarity index 100%
rename from graphics/pokemon/gholdengo/shiny.pal
rename to graphics/pokemon/gen_9/gholdengo/shiny.pal
diff --git a/graphics/pokemon/gimmighoul/back.png b/graphics/pokemon/gen_9/gimmighoul/back.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/back.png
rename to graphics/pokemon/gen_9/gimmighoul/back.png
diff --git a/graphics/pokemon/gimmighoul/front.png b/graphics/pokemon/gen_9/gimmighoul/front.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/front.png
rename to graphics/pokemon/gen_9/gimmighoul/front.png
diff --git a/graphics/pokemon/gimmighoul/icon.png b/graphics/pokemon/gen_9/gimmighoul/icon.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/icon.png
rename to graphics/pokemon/gen_9/gimmighoul/icon.png
diff --git a/graphics/pokemon/gimmighoul/normal.pal b/graphics/pokemon/gen_9/gimmighoul/normal.pal
similarity index 100%
rename from graphics/pokemon/gimmighoul/normal.pal
rename to graphics/pokemon/gen_9/gimmighoul/normal.pal
diff --git a/graphics/pokemon/gimmighoul/roaming/back.png b/graphics/pokemon/gen_9/gimmighoul/roaming/back.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/roaming/back.png
rename to graphics/pokemon/gen_9/gimmighoul/roaming/back.png
diff --git a/graphics/pokemon/gimmighoul/roaming/front.png b/graphics/pokemon/gen_9/gimmighoul/roaming/front.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/roaming/front.png
rename to graphics/pokemon/gen_9/gimmighoul/roaming/front.png
diff --git a/graphics/pokemon/gimmighoul/roaming/icon.png b/graphics/pokemon/gen_9/gimmighoul/roaming/icon.png
similarity index 100%
rename from graphics/pokemon/gimmighoul/roaming/icon.png
rename to graphics/pokemon/gen_9/gimmighoul/roaming/icon.png
diff --git a/graphics/pokemon/gimmighoul/roaming/normal.pal b/graphics/pokemon/gen_9/gimmighoul/roaming/normal.pal
similarity index 100%
rename from graphics/pokemon/gimmighoul/roaming/normal.pal
rename to graphics/pokemon/gen_9/gimmighoul/roaming/normal.pal
diff --git a/graphics/pokemon/gimmighoul/roaming/shiny.pal b/graphics/pokemon/gen_9/gimmighoul/roaming/shiny.pal
similarity index 100%
rename from graphics/pokemon/gimmighoul/roaming/shiny.pal
rename to graphics/pokemon/gen_9/gimmighoul/roaming/shiny.pal
diff --git a/graphics/pokemon/gimmighoul/shiny.pal b/graphics/pokemon/gen_9/gimmighoul/shiny.pal
similarity index 100%
rename from graphics/pokemon/gimmighoul/shiny.pal
rename to graphics/pokemon/gen_9/gimmighoul/shiny.pal
diff --git a/graphics/pokemon/glimmet/back.png b/graphics/pokemon/gen_9/glimmet/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmet/back.png
rename to graphics/pokemon/gen_9/glimmet/back.png
diff --git a/graphics/pokemon/glimmet/front.png b/graphics/pokemon/gen_9/glimmet/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmet/front.png
rename to graphics/pokemon/gen_9/glimmet/front.png
diff --git a/graphics/pokemon/glimmet/icon.png b/graphics/pokemon/gen_9/glimmet/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmet/icon.png
rename to graphics/pokemon/gen_9/glimmet/icon.png
diff --git a/graphics/pokemon/glimmet/normal.pal b/graphics/pokemon/gen_9/glimmet/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmet/normal.pal
rename to graphics/pokemon/gen_9/glimmet/normal.pal
diff --git a/graphics/pokemon/glimmet/shiny.pal b/graphics/pokemon/gen_9/glimmet/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmet/shiny.pal
rename to graphics/pokemon/gen_9/glimmet/shiny.pal
diff --git a/graphics/pokemon/glimmora/back.png b/graphics/pokemon/gen_9/glimmora/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmora/back.png
rename to graphics/pokemon/gen_9/glimmora/back.png
diff --git a/graphics/pokemon/glimmora/front.png b/graphics/pokemon/gen_9/glimmora/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmora/front.png
rename to graphics/pokemon/gen_9/glimmora/front.png
diff --git a/graphics/pokemon/glimmora/icon.png b/graphics/pokemon/gen_9/glimmora/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmora/icon.png
rename to graphics/pokemon/gen_9/glimmora/icon.png
diff --git a/graphics/pokemon/glimmora/normal.pal b/graphics/pokemon/gen_9/glimmora/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmora/normal.pal
rename to graphics/pokemon/gen_9/glimmora/normal.pal
diff --git a/graphics/pokemon/glimmora/shiny.pal b/graphics/pokemon/gen_9/glimmora/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/glimmora/shiny.pal
rename to graphics/pokemon/gen_9/glimmora/shiny.pal
diff --git a/graphics/pokemon/grafaiai/back.png b/graphics/pokemon/gen_9/grafaiai/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/grafaiai/back.png
rename to graphics/pokemon/gen_9/grafaiai/back.png
diff --git a/graphics/pokemon/grafaiai/front.png b/graphics/pokemon/gen_9/grafaiai/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/grafaiai/front.png
rename to graphics/pokemon/gen_9/grafaiai/front.png
diff --git a/graphics/pokemon/grafaiai/icon.png b/graphics/pokemon/gen_9/grafaiai/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/grafaiai/icon.png
rename to graphics/pokemon/gen_9/grafaiai/icon.png
diff --git a/graphics/pokemon/grafaiai/normal.pal b/graphics/pokemon/gen_9/grafaiai/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/grafaiai/normal.pal
rename to graphics/pokemon/gen_9/grafaiai/normal.pal
diff --git a/graphics/pokemon/grafaiai/shiny.pal b/graphics/pokemon/gen_9/grafaiai/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/grafaiai/shiny.pal
rename to graphics/pokemon/gen_9/grafaiai/shiny.pal
diff --git a/graphics/pokemon/great_tusk/anim_front.png b/graphics/pokemon/gen_9/great_tusk/anim_front.png
similarity index 100%
rename from graphics/pokemon/great_tusk/anim_front.png
rename to graphics/pokemon/gen_9/great_tusk/anim_front.png
diff --git a/graphics/pokemon/great_tusk/back.png b/graphics/pokemon/gen_9/great_tusk/back.png
similarity index 100%
rename from graphics/pokemon/great_tusk/back.png
rename to graphics/pokemon/gen_9/great_tusk/back.png
diff --git a/graphics/pokemon/great_tusk/icon.png b/graphics/pokemon/gen_9/great_tusk/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/great_tusk/icon.png
rename to graphics/pokemon/gen_9/great_tusk/icon.png
diff --git a/graphics/pokemon/great_tusk/normal.pal b/graphics/pokemon/gen_9/great_tusk/normal.pal
similarity index 100%
rename from graphics/pokemon/great_tusk/normal.pal
rename to graphics/pokemon/gen_9/great_tusk/normal.pal
diff --git a/graphics/pokemon/great_tusk/shiny.pal b/graphics/pokemon/gen_9/great_tusk/shiny.pal
similarity index 100%
rename from graphics/pokemon/great_tusk/shiny.pal
rename to graphics/pokemon/gen_9/great_tusk/shiny.pal
diff --git a/graphics/pokemon/greavard/back.png b/graphics/pokemon/gen_9/greavard/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/greavard/back.png
rename to graphics/pokemon/gen_9/greavard/back.png
diff --git a/graphics/pokemon/greavard/front.png b/graphics/pokemon/gen_9/greavard/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/greavard/front.png
rename to graphics/pokemon/gen_9/greavard/front.png
diff --git a/graphics/pokemon/greavard/icon.png b/graphics/pokemon/gen_9/greavard/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/greavard/icon.png
rename to graphics/pokemon/gen_9/greavard/icon.png
diff --git a/graphics/pokemon/greavard/normal.pal b/graphics/pokemon/gen_9/greavard/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/greavard/normal.pal
rename to graphics/pokemon/gen_9/greavard/normal.pal
diff --git a/graphics/pokemon/greavard/shiny.pal b/graphics/pokemon/gen_9/greavard/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/greavard/shiny.pal
rename to graphics/pokemon/gen_9/greavard/shiny.pal
diff --git a/graphics/pokemon/houndstone/back.png b/graphics/pokemon/gen_9/houndstone/back.png
similarity index 100%
rename from graphics/pokemon/houndstone/back.png
rename to graphics/pokemon/gen_9/houndstone/back.png
diff --git a/graphics/pokemon/houndstone/front.png b/graphics/pokemon/gen_9/houndstone/front.png
similarity index 100%
rename from graphics/pokemon/houndstone/front.png
rename to graphics/pokemon/gen_9/houndstone/front.png
diff --git a/graphics/pokemon/houndstone/icon.png b/graphics/pokemon/gen_9/houndstone/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/houndstone/icon.png
rename to graphics/pokemon/gen_9/houndstone/icon.png
diff --git a/graphics/pokemon/houndstone/normal.pal b/graphics/pokemon/gen_9/houndstone/normal.pal
similarity index 100%
rename from graphics/pokemon/houndstone/normal.pal
rename to graphics/pokemon/gen_9/houndstone/normal.pal
diff --git a/graphics/pokemon/houndstone/shiny.pal b/graphics/pokemon/gen_9/houndstone/shiny.pal
similarity index 100%
rename from graphics/pokemon/houndstone/shiny.pal
rename to graphics/pokemon/gen_9/houndstone/shiny.pal
diff --git a/graphics/pokemon/iron_bundle/back.png b/graphics/pokemon/gen_9/iron_bundle/back.png
similarity index 100%
rename from graphics/pokemon/iron_bundle/back.png
rename to graphics/pokemon/gen_9/iron_bundle/back.png
diff --git a/graphics/pokemon/iron_bundle/front.png b/graphics/pokemon/gen_9/iron_bundle/front.png
similarity index 100%
rename from graphics/pokemon/iron_bundle/front.png
rename to graphics/pokemon/gen_9/iron_bundle/front.png
diff --git a/graphics/pokemon/iron_bundle/icon.png b/graphics/pokemon/gen_9/iron_bundle/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_bundle/icon.png
rename to graphics/pokemon/gen_9/iron_bundle/icon.png
diff --git a/graphics/pokemon/iron_bundle/normal.pal b/graphics/pokemon/gen_9/iron_bundle/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_bundle/normal.pal
rename to graphics/pokemon/gen_9/iron_bundle/normal.pal
diff --git a/graphics/pokemon/iron_bundle/shiny.pal b/graphics/pokemon/gen_9/iron_bundle/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_bundle/shiny.pal
rename to graphics/pokemon/gen_9/iron_bundle/shiny.pal
diff --git a/graphics/pokemon/iron_hands/back.png b/graphics/pokemon/gen_9/iron_hands/back.png
similarity index 100%
rename from graphics/pokemon/iron_hands/back.png
rename to graphics/pokemon/gen_9/iron_hands/back.png
diff --git a/graphics/pokemon/iron_hands/front.png b/graphics/pokemon/gen_9/iron_hands/front.png
similarity index 100%
rename from graphics/pokemon/iron_hands/front.png
rename to graphics/pokemon/gen_9/iron_hands/front.png
diff --git a/graphics/pokemon/iron_hands/icon.png b/graphics/pokemon/gen_9/iron_hands/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_hands/icon.png
rename to graphics/pokemon/gen_9/iron_hands/icon.png
diff --git a/graphics/pokemon/iron_hands/normal.pal b/graphics/pokemon/gen_9/iron_hands/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_hands/normal.pal
rename to graphics/pokemon/gen_9/iron_hands/normal.pal
diff --git a/graphics/pokemon/iron_hands/shiny.pal b/graphics/pokemon/gen_9/iron_hands/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_hands/shiny.pal
rename to graphics/pokemon/gen_9/iron_hands/shiny.pal
diff --git a/graphics/pokemon/iron_jugulis/back.png b/graphics/pokemon/gen_9/iron_jugulis/back.png
similarity index 100%
rename from graphics/pokemon/iron_jugulis/back.png
rename to graphics/pokemon/gen_9/iron_jugulis/back.png
diff --git a/graphics/pokemon/iron_jugulis/front.png b/graphics/pokemon/gen_9/iron_jugulis/front.png
similarity index 100%
rename from graphics/pokemon/iron_jugulis/front.png
rename to graphics/pokemon/gen_9/iron_jugulis/front.png
diff --git a/graphics/pokemon/iron_jugulis/icon.png b/graphics/pokemon/gen_9/iron_jugulis/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_jugulis/icon.png
rename to graphics/pokemon/gen_9/iron_jugulis/icon.png
diff --git a/graphics/pokemon/iron_jugulis/normal.pal b/graphics/pokemon/gen_9/iron_jugulis/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_jugulis/normal.pal
rename to graphics/pokemon/gen_9/iron_jugulis/normal.pal
diff --git a/graphics/pokemon/iron_jugulis/shiny.pal b/graphics/pokemon/gen_9/iron_jugulis/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_jugulis/shiny.pal
rename to graphics/pokemon/gen_9/iron_jugulis/shiny.pal
diff --git a/graphics/pokemon/iron_leaves/back.png b/graphics/pokemon/gen_9/iron_leaves/back.png
similarity index 100%
rename from graphics/pokemon/iron_leaves/back.png
rename to graphics/pokemon/gen_9/iron_leaves/back.png
diff --git a/graphics/pokemon/iron_leaves/front.png b/graphics/pokemon/gen_9/iron_leaves/front.png
similarity index 100%
rename from graphics/pokemon/iron_leaves/front.png
rename to graphics/pokemon/gen_9/iron_leaves/front.png
diff --git a/graphics/pokemon/iron_leaves/icon.png b/graphics/pokemon/gen_9/iron_leaves/icon.png
similarity index 100%
rename from graphics/pokemon/iron_leaves/icon.png
rename to graphics/pokemon/gen_9/iron_leaves/icon.png
diff --git a/graphics/pokemon/iron_leaves/normal.pal b/graphics/pokemon/gen_9/iron_leaves/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_leaves/normal.pal
rename to graphics/pokemon/gen_9/iron_leaves/normal.pal
diff --git a/graphics/pokemon/iron_leaves/shiny.pal b/graphics/pokemon/gen_9/iron_leaves/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_leaves/shiny.pal
rename to graphics/pokemon/gen_9/iron_leaves/shiny.pal
diff --git a/graphics/pokemon/iron_moth/back.png b/graphics/pokemon/gen_9/iron_moth/back.png
similarity index 100%
rename from graphics/pokemon/iron_moth/back.png
rename to graphics/pokemon/gen_9/iron_moth/back.png
diff --git a/graphics/pokemon/iron_moth/front.png b/graphics/pokemon/gen_9/iron_moth/front.png
similarity index 100%
rename from graphics/pokemon/iron_moth/front.png
rename to graphics/pokemon/gen_9/iron_moth/front.png
diff --git a/graphics/pokemon/iron_moth/icon.png b/graphics/pokemon/gen_9/iron_moth/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_moth/icon.png
rename to graphics/pokemon/gen_9/iron_moth/icon.png
diff --git a/graphics/pokemon/iron_moth/normal.pal b/graphics/pokemon/gen_9/iron_moth/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_moth/normal.pal
rename to graphics/pokemon/gen_9/iron_moth/normal.pal
diff --git a/graphics/pokemon/iron_moth/shiny.pal b/graphics/pokemon/gen_9/iron_moth/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_moth/shiny.pal
rename to graphics/pokemon/gen_9/iron_moth/shiny.pal
diff --git a/graphics/pokemon/iron_thorns/back.png b/graphics/pokemon/gen_9/iron_thorns/back.png
similarity index 100%
rename from graphics/pokemon/iron_thorns/back.png
rename to graphics/pokemon/gen_9/iron_thorns/back.png
diff --git a/graphics/pokemon/iron_thorns/front.png b/graphics/pokemon/gen_9/iron_thorns/front.png
similarity index 100%
rename from graphics/pokemon/iron_thorns/front.png
rename to graphics/pokemon/gen_9/iron_thorns/front.png
diff --git a/graphics/pokemon/iron_thorns/icon.png b/graphics/pokemon/gen_9/iron_thorns/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_thorns/icon.png
rename to graphics/pokemon/gen_9/iron_thorns/icon.png
diff --git a/graphics/pokemon/iron_thorns/normal.pal b/graphics/pokemon/gen_9/iron_thorns/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_thorns/normal.pal
rename to graphics/pokemon/gen_9/iron_thorns/normal.pal
diff --git a/graphics/pokemon/iron_thorns/shiny.pal b/graphics/pokemon/gen_9/iron_thorns/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_thorns/shiny.pal
rename to graphics/pokemon/gen_9/iron_thorns/shiny.pal
diff --git a/graphics/pokemon/iron_treads/back.png b/graphics/pokemon/gen_9/iron_treads/back.png
similarity index 100%
rename from graphics/pokemon/iron_treads/back.png
rename to graphics/pokemon/gen_9/iron_treads/back.png
diff --git a/graphics/pokemon/iron_treads/front.png b/graphics/pokemon/gen_9/iron_treads/front.png
similarity index 100%
rename from graphics/pokemon/iron_treads/front.png
rename to graphics/pokemon/gen_9/iron_treads/front.png
diff --git a/graphics/pokemon/iron_treads/icon.png b/graphics/pokemon/gen_9/iron_treads/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_treads/icon.png
rename to graphics/pokemon/gen_9/iron_treads/icon.png
diff --git a/graphics/pokemon/iron_treads/normal.pal b/graphics/pokemon/gen_9/iron_treads/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_treads/normal.pal
rename to graphics/pokemon/gen_9/iron_treads/normal.pal
diff --git a/graphics/pokemon/iron_treads/shiny.pal b/graphics/pokemon/gen_9/iron_treads/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_treads/shiny.pal
rename to graphics/pokemon/gen_9/iron_treads/shiny.pal
diff --git a/graphics/pokemon/iron_valiant/back.png b/graphics/pokemon/gen_9/iron_valiant/back.png
similarity index 100%
rename from graphics/pokemon/iron_valiant/back.png
rename to graphics/pokemon/gen_9/iron_valiant/back.png
diff --git a/graphics/pokemon/iron_valiant/front.png b/graphics/pokemon/gen_9/iron_valiant/front.png
similarity index 100%
rename from graphics/pokemon/iron_valiant/front.png
rename to graphics/pokemon/gen_9/iron_valiant/front.png
diff --git a/graphics/pokemon/iron_valiant/icon.png b/graphics/pokemon/gen_9/iron_valiant/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/iron_valiant/icon.png
rename to graphics/pokemon/gen_9/iron_valiant/icon.png
diff --git a/graphics/pokemon/iron_valiant/normal.pal b/graphics/pokemon/gen_9/iron_valiant/normal.pal
similarity index 100%
rename from graphics/pokemon/iron_valiant/normal.pal
rename to graphics/pokemon/gen_9/iron_valiant/normal.pal
diff --git a/graphics/pokemon/iron_valiant/shiny.pal b/graphics/pokemon/gen_9/iron_valiant/shiny.pal
similarity index 100%
rename from graphics/pokemon/iron_valiant/shiny.pal
rename to graphics/pokemon/gen_9/iron_valiant/shiny.pal
diff --git a/graphics/pokemon/kilowattrel/back.png b/graphics/pokemon/gen_9/kilowattrel/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kilowattrel/back.png
rename to graphics/pokemon/gen_9/kilowattrel/back.png
diff --git a/graphics/pokemon/kilowattrel/front.png b/graphics/pokemon/gen_9/kilowattrel/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kilowattrel/front.png
rename to graphics/pokemon/gen_9/kilowattrel/front.png
diff --git a/graphics/pokemon/kilowattrel/icon.png b/graphics/pokemon/gen_9/kilowattrel/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kilowattrel/icon.png
rename to graphics/pokemon/gen_9/kilowattrel/icon.png
diff --git a/graphics/pokemon/kilowattrel/normal.pal b/graphics/pokemon/gen_9/kilowattrel/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kilowattrel/normal.pal
rename to graphics/pokemon/gen_9/kilowattrel/normal.pal
diff --git a/graphics/pokemon/kilowattrel/shiny.pal b/graphics/pokemon/gen_9/kilowattrel/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kilowattrel/shiny.pal
rename to graphics/pokemon/gen_9/kilowattrel/shiny.pal
diff --git a/graphics/pokemon/kingambit/back.png b/graphics/pokemon/gen_9/kingambit/back.png
similarity index 100%
rename from graphics/pokemon/kingambit/back.png
rename to graphics/pokemon/gen_9/kingambit/back.png
diff --git a/graphics/pokemon/kingambit/front.png b/graphics/pokemon/gen_9/kingambit/front.png
similarity index 100%
rename from graphics/pokemon/kingambit/front.png
rename to graphics/pokemon/gen_9/kingambit/front.png
diff --git a/graphics/pokemon/kingambit/icon.png b/graphics/pokemon/gen_9/kingambit/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/kingambit/icon.png
rename to graphics/pokemon/gen_9/kingambit/icon.png
diff --git a/graphics/pokemon/kingambit/normal.pal b/graphics/pokemon/gen_9/kingambit/normal.pal
similarity index 100%
rename from graphics/pokemon/kingambit/normal.pal
rename to graphics/pokemon/gen_9/kingambit/normal.pal
diff --git a/graphics/pokemon/kingambit/shiny.pal b/graphics/pokemon/gen_9/kingambit/shiny.pal
similarity index 100%
rename from graphics/pokemon/kingambit/shiny.pal
rename to graphics/pokemon/gen_9/kingambit/shiny.pal
diff --git a/graphics/pokemon/klawf/back.png b/graphics/pokemon/gen_9/klawf/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/klawf/back.png
rename to graphics/pokemon/gen_9/klawf/back.png
diff --git a/graphics/pokemon/klawf/front.png b/graphics/pokemon/gen_9/klawf/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/klawf/front.png
rename to graphics/pokemon/gen_9/klawf/front.png
diff --git a/graphics/pokemon/klawf/icon.png b/graphics/pokemon/gen_9/klawf/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/klawf/icon.png
rename to graphics/pokemon/gen_9/klawf/icon.png
diff --git a/graphics/pokemon/klawf/normal.pal b/graphics/pokemon/gen_9/klawf/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/klawf/normal.pal
rename to graphics/pokemon/gen_9/klawf/normal.pal
diff --git a/graphics/pokemon/klawf/shiny.pal b/graphics/pokemon/gen_9/klawf/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/klawf/shiny.pal
rename to graphics/pokemon/gen_9/klawf/shiny.pal
diff --git a/graphics/pokemon/koraidon/back.png b/graphics/pokemon/gen_9/koraidon/back.png
similarity index 100%
rename from graphics/pokemon/koraidon/back.png
rename to graphics/pokemon/gen_9/koraidon/back.png
diff --git a/graphics/pokemon/koraidon/front.png b/graphics/pokemon/gen_9/koraidon/front.png
similarity index 100%
rename from graphics/pokemon/koraidon/front.png
rename to graphics/pokemon/gen_9/koraidon/front.png
diff --git a/graphics/pokemon/koraidon/icon.png b/graphics/pokemon/gen_9/koraidon/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/koraidon/icon.png
rename to graphics/pokemon/gen_9/koraidon/icon.png
diff --git a/graphics/pokemon/koraidon/normal.pal b/graphics/pokemon/gen_9/koraidon/normal.pal
similarity index 100%
rename from graphics/pokemon/koraidon/normal.pal
rename to graphics/pokemon/gen_9/koraidon/normal.pal
diff --git a/graphics/pokemon/koraidon/shiny.pal b/graphics/pokemon/gen_9/koraidon/shiny.pal
similarity index 100%
rename from graphics/pokemon/koraidon/shiny.pal
rename to graphics/pokemon/gen_9/koraidon/shiny.pal
diff --git a/graphics/pokemon/lechonk/back.png b/graphics/pokemon/gen_9/lechonk/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lechonk/back.png
rename to graphics/pokemon/gen_9/lechonk/back.png
diff --git a/graphics/pokemon/lechonk/front.png b/graphics/pokemon/gen_9/lechonk/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lechonk/front.png
rename to graphics/pokemon/gen_9/lechonk/front.png
diff --git a/graphics/pokemon/lechonk/icon.png b/graphics/pokemon/gen_9/lechonk/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lechonk/icon.png
rename to graphics/pokemon/gen_9/lechonk/icon.png
diff --git a/graphics/pokemon/lechonk/normal.pal b/graphics/pokemon/gen_9/lechonk/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lechonk/normal.pal
rename to graphics/pokemon/gen_9/lechonk/normal.pal
diff --git a/graphics/pokemon/lechonk/shiny.pal b/graphics/pokemon/gen_9/lechonk/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lechonk/shiny.pal
rename to graphics/pokemon/gen_9/lechonk/shiny.pal
diff --git a/graphics/pokemon/lokix/back.png b/graphics/pokemon/gen_9/lokix/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lokix/back.png
rename to graphics/pokemon/gen_9/lokix/back.png
diff --git a/graphics/pokemon/lokix/front.png b/graphics/pokemon/gen_9/lokix/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lokix/front.png
rename to graphics/pokemon/gen_9/lokix/front.png
diff --git a/graphics/pokemon/lokix/icon.png b/graphics/pokemon/gen_9/lokix/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lokix/icon.png
rename to graphics/pokemon/gen_9/lokix/icon.png
diff --git a/graphics/pokemon/lokix/normal.pal b/graphics/pokemon/gen_9/lokix/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lokix/normal.pal
rename to graphics/pokemon/gen_9/lokix/normal.pal
diff --git a/graphics/pokemon/lokix/shiny.pal b/graphics/pokemon/gen_9/lokix/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/lokix/shiny.pal
rename to graphics/pokemon/gen_9/lokix/shiny.pal
diff --git a/graphics/pokemon/mabosstiff/back.png b/graphics/pokemon/gen_9/mabosstiff/back.png
similarity index 100%
rename from graphics/pokemon/mabosstiff/back.png
rename to graphics/pokemon/gen_9/mabosstiff/back.png
diff --git a/graphics/pokemon/mabosstiff/front.png b/graphics/pokemon/gen_9/mabosstiff/front.png
similarity index 100%
rename from graphics/pokemon/mabosstiff/front.png
rename to graphics/pokemon/gen_9/mabosstiff/front.png
diff --git a/graphics/pokemon/mabosstiff/icon.png b/graphics/pokemon/gen_9/mabosstiff/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mabosstiff/icon.png
rename to graphics/pokemon/gen_9/mabosstiff/icon.png
diff --git a/graphics/pokemon/mabosstiff/normal.pal b/graphics/pokemon/gen_9/mabosstiff/normal.pal
similarity index 100%
rename from graphics/pokemon/mabosstiff/normal.pal
rename to graphics/pokemon/gen_9/mabosstiff/normal.pal
diff --git a/graphics/pokemon/mabosstiff/shiny.pal b/graphics/pokemon/gen_9/mabosstiff/shiny.pal
similarity index 100%
rename from graphics/pokemon/mabosstiff/shiny.pal
rename to graphics/pokemon/gen_9/mabosstiff/shiny.pal
diff --git a/graphics/pokemon/maschiff/back.png b/graphics/pokemon/gen_9/maschiff/back.png
similarity index 100%
rename from graphics/pokemon/maschiff/back.png
rename to graphics/pokemon/gen_9/maschiff/back.png
diff --git a/graphics/pokemon/maschiff/front.png b/graphics/pokemon/gen_9/maschiff/front.png
similarity index 100%
rename from graphics/pokemon/maschiff/front.png
rename to graphics/pokemon/gen_9/maschiff/front.png
diff --git a/graphics/pokemon/maschiff/icon.png b/graphics/pokemon/gen_9/maschiff/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/maschiff/icon.png
rename to graphics/pokemon/gen_9/maschiff/icon.png
diff --git a/graphics/pokemon/maschiff/normal.pal b/graphics/pokemon/gen_9/maschiff/normal.pal
similarity index 100%
rename from graphics/pokemon/maschiff/normal.pal
rename to graphics/pokemon/gen_9/maschiff/normal.pal
diff --git a/graphics/pokemon/maschiff/shiny.pal b/graphics/pokemon/gen_9/maschiff/shiny.pal
similarity index 100%
rename from graphics/pokemon/maschiff/shiny.pal
rename to graphics/pokemon/gen_9/maschiff/shiny.pal
diff --git a/graphics/pokemon/maushold/back.png b/graphics/pokemon/gen_9/maushold/back.png
similarity index 100%
rename from graphics/pokemon/maushold/back.png
rename to graphics/pokemon/gen_9/maushold/back.png
diff --git a/graphics/pokemon/maushold/four/back.png b/graphics/pokemon/gen_9/maushold/four/back.png
similarity index 100%
rename from graphics/pokemon/maushold/four/back.png
rename to graphics/pokemon/gen_9/maushold/four/back.png
diff --git a/graphics/pokemon/maushold/four/front.png b/graphics/pokemon/gen_9/maushold/four/front.png
similarity index 100%
rename from graphics/pokemon/maushold/four/front.png
rename to graphics/pokemon/gen_9/maushold/four/front.png
diff --git a/graphics/pokemon/maushold/four/icon.png b/graphics/pokemon/gen_9/maushold/four/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/maushold/four/icon.png
rename to graphics/pokemon/gen_9/maushold/four/icon.png
diff --git a/graphics/pokemon/maushold/front.png b/graphics/pokemon/gen_9/maushold/front.png
similarity index 100%
rename from graphics/pokemon/maushold/front.png
rename to graphics/pokemon/gen_9/maushold/front.png
diff --git a/graphics/pokemon/maushold/icon.png b/graphics/pokemon/gen_9/maushold/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/maushold/icon.png
rename to graphics/pokemon/gen_9/maushold/icon.png
diff --git a/graphics/pokemon/maushold/normal.pal b/graphics/pokemon/gen_9/maushold/normal.pal
similarity index 100%
rename from graphics/pokemon/maushold/normal.pal
rename to graphics/pokemon/gen_9/maushold/normal.pal
diff --git a/graphics/pokemon/maushold/shiny.pal b/graphics/pokemon/gen_9/maushold/shiny.pal
similarity index 100%
rename from graphics/pokemon/maushold/shiny.pal
rename to graphics/pokemon/gen_9/maushold/shiny.pal
diff --git a/graphics/pokemon/meowscarada/back.png b/graphics/pokemon/gen_9/meowscarada/back.png
similarity index 100%
rename from graphics/pokemon/meowscarada/back.png
rename to graphics/pokemon/gen_9/meowscarada/back.png
diff --git a/graphics/pokemon/meowscarada/front.png b/graphics/pokemon/gen_9/meowscarada/front.png
similarity index 100%
rename from graphics/pokemon/meowscarada/front.png
rename to graphics/pokemon/gen_9/meowscarada/front.png
diff --git a/graphics/pokemon/meowscarada/icon.png b/graphics/pokemon/gen_9/meowscarada/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/meowscarada/icon.png
rename to graphics/pokemon/gen_9/meowscarada/icon.png
diff --git a/graphics/pokemon/meowscarada/normal.pal b/graphics/pokemon/gen_9/meowscarada/normal.pal
similarity index 100%
rename from graphics/pokemon/meowscarada/normal.pal
rename to graphics/pokemon/gen_9/meowscarada/normal.pal
diff --git a/graphics/pokemon/meowscarada/shiny.pal b/graphics/pokemon/gen_9/meowscarada/shiny.pal
similarity index 100%
rename from graphics/pokemon/meowscarada/shiny.pal
rename to graphics/pokemon/gen_9/meowscarada/shiny.pal
diff --git a/graphics/pokemon/miraidon/back.png b/graphics/pokemon/gen_9/miraidon/back.png
similarity index 100%
rename from graphics/pokemon/miraidon/back.png
rename to graphics/pokemon/gen_9/miraidon/back.png
diff --git a/graphics/pokemon/miraidon/front.png b/graphics/pokemon/gen_9/miraidon/front.png
similarity index 100%
rename from graphics/pokemon/miraidon/front.png
rename to graphics/pokemon/gen_9/miraidon/front.png
diff --git a/graphics/pokemon/miraidon/icon.png b/graphics/pokemon/gen_9/miraidon/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/miraidon/icon.png
rename to graphics/pokemon/gen_9/miraidon/icon.png
diff --git a/graphics/pokemon/miraidon/normal.pal b/graphics/pokemon/gen_9/miraidon/normal.pal
similarity index 100%
rename from graphics/pokemon/miraidon/normal.pal
rename to graphics/pokemon/gen_9/miraidon/normal.pal
diff --git a/graphics/pokemon/miraidon/shiny.pal b/graphics/pokemon/gen_9/miraidon/shiny.pal
similarity index 100%
rename from graphics/pokemon/miraidon/shiny.pal
rename to graphics/pokemon/gen_9/miraidon/shiny.pal
diff --git a/graphics/pokemon/munkidori/back.png b/graphics/pokemon/gen_9/munkidori/back.png
similarity index 100%
rename from graphics/pokemon/munkidori/back.png
rename to graphics/pokemon/gen_9/munkidori/back.png
diff --git a/graphics/pokemon/munkidori/front.png b/graphics/pokemon/gen_9/munkidori/front.png
similarity index 100%
rename from graphics/pokemon/munkidori/front.png
rename to graphics/pokemon/gen_9/munkidori/front.png
diff --git a/graphics/pokemon/munkidori/icon.png b/graphics/pokemon/gen_9/munkidori/icon.png
similarity index 100%
rename from graphics/pokemon/munkidori/icon.png
rename to graphics/pokemon/gen_9/munkidori/icon.png
diff --git a/graphics/pokemon/munkidori/normal.pal b/graphics/pokemon/gen_9/munkidori/normal.pal
similarity index 100%
rename from graphics/pokemon/munkidori/normal.pal
rename to graphics/pokemon/gen_9/munkidori/normal.pal
diff --git a/graphics/pokemon/munkidori/shiny.pal b/graphics/pokemon/gen_9/munkidori/shiny.pal
similarity index 100%
rename from graphics/pokemon/munkidori/shiny.pal
rename to graphics/pokemon/gen_9/munkidori/shiny.pal
diff --git a/graphics/pokemon/nacli/back.png b/graphics/pokemon/gen_9/nacli/back.png
similarity index 100%
rename from graphics/pokemon/nacli/back.png
rename to graphics/pokemon/gen_9/nacli/back.png
diff --git a/graphics/pokemon/nacli/front.png b/graphics/pokemon/gen_9/nacli/front.png
similarity index 100%
rename from graphics/pokemon/nacli/front.png
rename to graphics/pokemon/gen_9/nacli/front.png
diff --git a/graphics/pokemon/nacli/icon.png b/graphics/pokemon/gen_9/nacli/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nacli/icon.png
rename to graphics/pokemon/gen_9/nacli/icon.png
diff --git a/graphics/pokemon/nacli/normal.pal b/graphics/pokemon/gen_9/nacli/normal.pal
similarity index 100%
rename from graphics/pokemon/nacli/normal.pal
rename to graphics/pokemon/gen_9/nacli/normal.pal
diff --git a/graphics/pokemon/nacli/shiny.pal b/graphics/pokemon/gen_9/nacli/shiny.pal
similarity index 100%
rename from graphics/pokemon/nacli/shiny.pal
rename to graphics/pokemon/gen_9/nacli/shiny.pal
diff --git a/graphics/pokemon/naclstack/back.png b/graphics/pokemon/gen_9/naclstack/back.png
similarity index 100%
rename from graphics/pokemon/naclstack/back.png
rename to graphics/pokemon/gen_9/naclstack/back.png
diff --git a/graphics/pokemon/naclstack/front.png b/graphics/pokemon/gen_9/naclstack/front.png
similarity index 100%
rename from graphics/pokemon/naclstack/front.png
rename to graphics/pokemon/gen_9/naclstack/front.png
diff --git a/graphics/pokemon/naclstack/icon.png b/graphics/pokemon/gen_9/naclstack/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/naclstack/icon.png
rename to graphics/pokemon/gen_9/naclstack/icon.png
diff --git a/graphics/pokemon/naclstack/normal.pal b/graphics/pokemon/gen_9/naclstack/normal.pal
similarity index 100%
rename from graphics/pokemon/naclstack/normal.pal
rename to graphics/pokemon/gen_9/naclstack/normal.pal
diff --git a/graphics/pokemon/naclstack/shiny.pal b/graphics/pokemon/gen_9/naclstack/shiny.pal
similarity index 100%
rename from graphics/pokemon/naclstack/shiny.pal
rename to graphics/pokemon/gen_9/naclstack/shiny.pal
diff --git a/graphics/pokemon/nymble/back.png b/graphics/pokemon/gen_9/nymble/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nymble/back.png
rename to graphics/pokemon/gen_9/nymble/back.png
diff --git a/graphics/pokemon/nymble/front.png b/graphics/pokemon/gen_9/nymble/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nymble/front.png
rename to graphics/pokemon/gen_9/nymble/front.png
diff --git a/graphics/pokemon/nymble/icon.png b/graphics/pokemon/gen_9/nymble/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nymble/icon.png
rename to graphics/pokemon/gen_9/nymble/icon.png
diff --git a/graphics/pokemon/nymble/normal.pal b/graphics/pokemon/gen_9/nymble/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nymble/normal.pal
rename to graphics/pokemon/gen_9/nymble/normal.pal
diff --git a/graphics/pokemon/nymble/shiny.pal b/graphics/pokemon/gen_9/nymble/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/nymble/shiny.pal
rename to graphics/pokemon/gen_9/nymble/shiny.pal
diff --git a/graphics/pokemon/ogerpon/back.png b/graphics/pokemon/gen_9/ogerpon/back.png
similarity index 100%
rename from graphics/pokemon/ogerpon/back.png
rename to graphics/pokemon/gen_9/ogerpon/back.png
diff --git a/graphics/pokemon/ogerpon/cornerstone/back.png b/graphics/pokemon/gen_9/ogerpon/cornerstone/back.png
similarity index 100%
rename from graphics/pokemon/ogerpon/cornerstone/back.png
rename to graphics/pokemon/gen_9/ogerpon/cornerstone/back.png
diff --git a/graphics/pokemon/ogerpon/cornerstone/front.png b/graphics/pokemon/gen_9/ogerpon/cornerstone/front.png
similarity index 100%
rename from graphics/pokemon/ogerpon/cornerstone/front.png
rename to graphics/pokemon/gen_9/ogerpon/cornerstone/front.png
diff --git a/graphics/pokemon/ogerpon/cornerstone/normal.pal b/graphics/pokemon/gen_9/ogerpon/cornerstone/normal.pal
similarity index 100%
rename from graphics/pokemon/ogerpon/cornerstone/normal.pal
rename to graphics/pokemon/gen_9/ogerpon/cornerstone/normal.pal
diff --git a/graphics/pokemon/ogerpon/front.png b/graphics/pokemon/gen_9/ogerpon/front.png
similarity index 100%
rename from graphics/pokemon/ogerpon/front.png
rename to graphics/pokemon/gen_9/ogerpon/front.png
diff --git a/graphics/pokemon/ogerpon/hearthflame/back.png b/graphics/pokemon/gen_9/ogerpon/hearthflame/back.png
similarity index 100%
rename from graphics/pokemon/ogerpon/hearthflame/back.png
rename to graphics/pokemon/gen_9/ogerpon/hearthflame/back.png
diff --git a/graphics/pokemon/ogerpon/hearthflame/front.png b/graphics/pokemon/gen_9/ogerpon/hearthflame/front.png
similarity index 100%
rename from graphics/pokemon/ogerpon/hearthflame/front.png
rename to graphics/pokemon/gen_9/ogerpon/hearthflame/front.png
diff --git a/graphics/pokemon/ogerpon/hearthflame/normal.pal b/graphics/pokemon/gen_9/ogerpon/hearthflame/normal.pal
similarity index 100%
rename from graphics/pokemon/ogerpon/hearthflame/normal.pal
rename to graphics/pokemon/gen_9/ogerpon/hearthflame/normal.pal
diff --git a/graphics/pokemon/ogerpon/icon.png b/graphics/pokemon/gen_9/ogerpon/icon.png
similarity index 100%
rename from graphics/pokemon/ogerpon/icon.png
rename to graphics/pokemon/gen_9/ogerpon/icon.png
diff --git a/graphics/pokemon/ogerpon/normal.pal b/graphics/pokemon/gen_9/ogerpon/normal.pal
similarity index 100%
rename from graphics/pokemon/ogerpon/normal.pal
rename to graphics/pokemon/gen_9/ogerpon/normal.pal
diff --git a/graphics/pokemon/ogerpon/wellspring/back.png b/graphics/pokemon/gen_9/ogerpon/wellspring/back.png
similarity index 100%
rename from graphics/pokemon/ogerpon/wellspring/back.png
rename to graphics/pokemon/gen_9/ogerpon/wellspring/back.png
diff --git a/graphics/pokemon/ogerpon/wellspring/front.png b/graphics/pokemon/gen_9/ogerpon/wellspring/front.png
similarity index 100%
rename from graphics/pokemon/ogerpon/wellspring/front.png
rename to graphics/pokemon/gen_9/ogerpon/wellspring/front.png
diff --git a/graphics/pokemon/ogerpon/wellspring/normal.pal b/graphics/pokemon/gen_9/ogerpon/wellspring/normal.pal
similarity index 100%
rename from graphics/pokemon/ogerpon/wellspring/normal.pal
rename to graphics/pokemon/gen_9/ogerpon/wellspring/normal.pal
diff --git a/graphics/pokemon/oinkologne/back.png b/graphics/pokemon/gen_9/oinkologne/back.png
similarity index 100%
rename from graphics/pokemon/oinkologne/back.png
rename to graphics/pokemon/gen_9/oinkologne/back.png
diff --git a/graphics/pokemon/oinkologne/female/back.png b/graphics/pokemon/gen_9/oinkologne/female/back.png
similarity index 100%
rename from graphics/pokemon/oinkologne/female/back.png
rename to graphics/pokemon/gen_9/oinkologne/female/back.png
diff --git a/graphics/pokemon/oinkologne/female/front.png b/graphics/pokemon/gen_9/oinkologne/female/front.png
similarity index 100%
rename from graphics/pokemon/oinkologne/female/front.png
rename to graphics/pokemon/gen_9/oinkologne/female/front.png
diff --git a/graphics/pokemon/oinkologne/female/icon.png b/graphics/pokemon/gen_9/oinkologne/female/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/oinkologne/female/icon.png
rename to graphics/pokemon/gen_9/oinkologne/female/icon.png
diff --git a/graphics/pokemon/oinkologne/female/iconTODO.png b/graphics/pokemon/gen_9/oinkologne/female/iconTODO.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/oinkologne/female/iconTODO.png
rename to graphics/pokemon/gen_9/oinkologne/female/iconTODO.png
diff --git a/graphics/pokemon/oinkologne/female/normal.pal b/graphics/pokemon/gen_9/oinkologne/female/normal.pal
similarity index 100%
rename from graphics/pokemon/oinkologne/female/normal.pal
rename to graphics/pokemon/gen_9/oinkologne/female/normal.pal
diff --git a/graphics/pokemon/oinkologne/female/shiny.pal b/graphics/pokemon/gen_9/oinkologne/female/shiny.pal
similarity index 100%
rename from graphics/pokemon/oinkologne/female/shiny.pal
rename to graphics/pokemon/gen_9/oinkologne/female/shiny.pal
diff --git a/graphics/pokemon/oinkologne/front.png b/graphics/pokemon/gen_9/oinkologne/front.png
similarity index 100%
rename from graphics/pokemon/oinkologne/front.png
rename to graphics/pokemon/gen_9/oinkologne/front.png
diff --git a/graphics/pokemon/oinkologne/icon.png b/graphics/pokemon/gen_9/oinkologne/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/oinkologne/icon.png
rename to graphics/pokemon/gen_9/oinkologne/icon.png
diff --git a/graphics/pokemon/oinkologne/normal.pal b/graphics/pokemon/gen_9/oinkologne/normal.pal
similarity index 100%
rename from graphics/pokemon/oinkologne/normal.pal
rename to graphics/pokemon/gen_9/oinkologne/normal.pal
diff --git a/graphics/pokemon/oinkologne/shiny.pal b/graphics/pokemon/gen_9/oinkologne/shiny.pal
similarity index 100%
rename from graphics/pokemon/oinkologne/shiny.pal
rename to graphics/pokemon/gen_9/oinkologne/shiny.pal
diff --git a/graphics/pokemon/okidogi/back.png b/graphics/pokemon/gen_9/okidogi/back.png
similarity index 100%
rename from graphics/pokemon/okidogi/back.png
rename to graphics/pokemon/gen_9/okidogi/back.png
diff --git a/graphics/pokemon/okidogi/front.png b/graphics/pokemon/gen_9/okidogi/front.png
similarity index 100%
rename from graphics/pokemon/okidogi/front.png
rename to graphics/pokemon/gen_9/okidogi/front.png
diff --git a/graphics/pokemon/okidogi/icon.png b/graphics/pokemon/gen_9/okidogi/icon.png
similarity index 100%
rename from graphics/pokemon/okidogi/icon.png
rename to graphics/pokemon/gen_9/okidogi/icon.png
diff --git a/graphics/pokemon/okidogi/normal.pal b/graphics/pokemon/gen_9/okidogi/normal.pal
similarity index 100%
rename from graphics/pokemon/okidogi/normal.pal
rename to graphics/pokemon/gen_9/okidogi/normal.pal
diff --git a/graphics/pokemon/okidogi/shiny.pal b/graphics/pokemon/gen_9/okidogi/shiny.pal
similarity index 100%
rename from graphics/pokemon/okidogi/shiny.pal
rename to graphics/pokemon/gen_9/okidogi/shiny.pal
diff --git a/graphics/pokemon/orthworm/back.png b/graphics/pokemon/gen_9/orthworm/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/orthworm/back.png
rename to graphics/pokemon/gen_9/orthworm/back.png
diff --git a/graphics/pokemon/orthworm/front.png b/graphics/pokemon/gen_9/orthworm/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/orthworm/front.png
rename to graphics/pokemon/gen_9/orthworm/front.png
diff --git a/graphics/pokemon/orthworm/icon.png b/graphics/pokemon/gen_9/orthworm/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/orthworm/icon.png
rename to graphics/pokemon/gen_9/orthworm/icon.png
diff --git a/graphics/pokemon/orthworm/normal.pal b/graphics/pokemon/gen_9/orthworm/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/orthworm/normal.pal
rename to graphics/pokemon/gen_9/orthworm/normal.pal
diff --git a/graphics/pokemon/orthworm/shiny.pal b/graphics/pokemon/gen_9/orthworm/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/orthworm/shiny.pal
rename to graphics/pokemon/gen_9/orthworm/shiny.pal
diff --git a/graphics/pokemon/palafin/back.png b/graphics/pokemon/gen_9/palafin/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/back.png
rename to graphics/pokemon/gen_9/palafin/back.png
diff --git a/graphics/pokemon/palafin/front.png b/graphics/pokemon/gen_9/palafin/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/front.png
rename to graphics/pokemon/gen_9/palafin/front.png
diff --git a/graphics/pokemon/palafin/hero/back.png b/graphics/pokemon/gen_9/palafin/hero/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/hero/back.png
rename to graphics/pokemon/gen_9/palafin/hero/back.png
diff --git a/graphics/pokemon/palafin/hero/front.png b/graphics/pokemon/gen_9/palafin/hero/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/hero/front.png
rename to graphics/pokemon/gen_9/palafin/hero/front.png
diff --git a/graphics/pokemon/palafin/hero/icon.png b/graphics/pokemon/gen_9/palafin/hero/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/hero/icon.png
rename to graphics/pokemon/gen_9/palafin/hero/icon.png
diff --git a/graphics/pokemon/palafin/hero/normal.pal b/graphics/pokemon/gen_9/palafin/hero/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/hero/normal.pal
rename to graphics/pokemon/gen_9/palafin/hero/normal.pal
diff --git a/graphics/pokemon/palafin/hero/shiny.pal b/graphics/pokemon/gen_9/palafin/hero/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/hero/shiny.pal
rename to graphics/pokemon/gen_9/palafin/hero/shiny.pal
diff --git a/graphics/pokemon/palafin/icon.png b/graphics/pokemon/gen_9/palafin/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/icon.png
rename to graphics/pokemon/gen_9/palafin/icon.png
diff --git a/graphics/pokemon/palafin/normal.pal b/graphics/pokemon/gen_9/palafin/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/normal.pal
rename to graphics/pokemon/gen_9/palafin/normal.pal
diff --git a/graphics/pokemon/palafin/shiny.pal b/graphics/pokemon/gen_9/palafin/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/palafin/shiny.pal
rename to graphics/pokemon/gen_9/palafin/shiny.pal
diff --git a/graphics/pokemon/pawmi/back.png b/graphics/pokemon/gen_9/pawmi/back.png
similarity index 100%
rename from graphics/pokemon/pawmi/back.png
rename to graphics/pokemon/gen_9/pawmi/back.png
diff --git a/graphics/pokemon/pawmi/front.png b/graphics/pokemon/gen_9/pawmi/front.png
similarity index 100%
rename from graphics/pokemon/pawmi/front.png
rename to graphics/pokemon/gen_9/pawmi/front.png
diff --git a/graphics/pokemon/pawmi/icon.png b/graphics/pokemon/gen_9/pawmi/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmi/icon.png
rename to graphics/pokemon/gen_9/pawmi/icon.png
diff --git a/graphics/pokemon/pawmi/normal.pal b/graphics/pokemon/gen_9/pawmi/normal.pal
similarity index 100%
rename from graphics/pokemon/pawmi/normal.pal
rename to graphics/pokemon/gen_9/pawmi/normal.pal
diff --git a/graphics/pokemon/pawmi/normal.png b/graphics/pokemon/gen_9/pawmi/normal.png
similarity index 100%
rename from graphics/pokemon/pawmi/normal.png
rename to graphics/pokemon/gen_9/pawmi/normal.png
diff --git a/graphics/pokemon/pawmi/shiny.pal b/graphics/pokemon/gen_9/pawmi/shiny.pal
similarity index 100%
rename from graphics/pokemon/pawmi/shiny.pal
rename to graphics/pokemon/gen_9/pawmi/shiny.pal
diff --git a/graphics/pokemon/pawmo/back.png b/graphics/pokemon/gen_9/pawmo/back.png
similarity index 100%
rename from graphics/pokemon/pawmo/back.png
rename to graphics/pokemon/gen_9/pawmo/back.png
diff --git a/graphics/pokemon/pawmo/front.png b/graphics/pokemon/gen_9/pawmo/front.png
similarity index 100%
rename from graphics/pokemon/pawmo/front.png
rename to graphics/pokemon/gen_9/pawmo/front.png
diff --git a/graphics/pokemon/pawmo/icon.png b/graphics/pokemon/gen_9/pawmo/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmo/icon.png
rename to graphics/pokemon/gen_9/pawmo/icon.png
diff --git a/graphics/pokemon/pawmo/normal.pal b/graphics/pokemon/gen_9/pawmo/normal.pal
similarity index 100%
rename from graphics/pokemon/pawmo/normal.pal
rename to graphics/pokemon/gen_9/pawmo/normal.pal
diff --git a/graphics/pokemon/pawmo/shiny.pal b/graphics/pokemon/gen_9/pawmo/shiny.pal
similarity index 100%
rename from graphics/pokemon/pawmo/shiny.pal
rename to graphics/pokemon/gen_9/pawmo/shiny.pal
diff --git a/graphics/pokemon/pawmot/back.png b/graphics/pokemon/gen_9/pawmot/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmot/back.png
rename to graphics/pokemon/gen_9/pawmot/back.png
diff --git a/graphics/pokemon/pawmot/front.png b/graphics/pokemon/gen_9/pawmot/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmot/front.png
rename to graphics/pokemon/gen_9/pawmot/front.png
diff --git a/graphics/pokemon/pawmot/icon.png b/graphics/pokemon/gen_9/pawmot/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmot/icon.png
rename to graphics/pokemon/gen_9/pawmot/icon.png
diff --git a/graphics/pokemon/pawmot/normal.pal b/graphics/pokemon/gen_9/pawmot/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmot/normal.pal
rename to graphics/pokemon/gen_9/pawmot/normal.pal
diff --git a/graphics/pokemon/pawmot/shiny.pal b/graphics/pokemon/gen_9/pawmot/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/pawmot/shiny.pal
rename to graphics/pokemon/gen_9/pawmot/shiny.pal
diff --git a/graphics/pokemon/poltchageist/back.png b/graphics/pokemon/gen_9/poltchageist/back.png
similarity index 100%
rename from graphics/pokemon/poltchageist/back.png
rename to graphics/pokemon/gen_9/poltchageist/back.png
diff --git a/graphics/pokemon/poltchageist/front.png b/graphics/pokemon/gen_9/poltchageist/front.png
similarity index 100%
rename from graphics/pokemon/poltchageist/front.png
rename to graphics/pokemon/gen_9/poltchageist/front.png
diff --git a/graphics/pokemon/poltchageist/icon.png b/graphics/pokemon/gen_9/poltchageist/icon.png
similarity index 100%
rename from graphics/pokemon/poltchageist/icon.png
rename to graphics/pokemon/gen_9/poltchageist/icon.png
diff --git a/graphics/pokemon/poltchageist/normal.pal b/graphics/pokemon/gen_9/poltchageist/normal.pal
similarity index 100%
rename from graphics/pokemon/poltchageist/normal.pal
rename to graphics/pokemon/gen_9/poltchageist/normal.pal
diff --git a/graphics/pokemon/poltchageist/shiny.pal b/graphics/pokemon/gen_9/poltchageist/shiny.pal
similarity index 100%
rename from graphics/pokemon/poltchageist/shiny.pal
rename to graphics/pokemon/gen_9/poltchageist/shiny.pal
diff --git a/graphics/pokemon/quaquaval/back.png b/graphics/pokemon/gen_9/quaquaval/back.png
similarity index 100%
rename from graphics/pokemon/quaquaval/back.png
rename to graphics/pokemon/gen_9/quaquaval/back.png
diff --git a/graphics/pokemon/quaquaval/front.png b/graphics/pokemon/gen_9/quaquaval/front.png
similarity index 100%
rename from graphics/pokemon/quaquaval/front.png
rename to graphics/pokemon/gen_9/quaquaval/front.png
diff --git a/graphics/pokemon/quaquaval/icon.png b/graphics/pokemon/gen_9/quaquaval/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/quaquaval/icon.png
rename to graphics/pokemon/gen_9/quaquaval/icon.png
diff --git a/graphics/pokemon/quaquaval/normal.pal b/graphics/pokemon/gen_9/quaquaval/normal.pal
similarity index 100%
rename from graphics/pokemon/quaquaval/normal.pal
rename to graphics/pokemon/gen_9/quaquaval/normal.pal
diff --git a/graphics/pokemon/quaquaval/shiny.pal b/graphics/pokemon/gen_9/quaquaval/shiny.pal
similarity index 100%
rename from graphics/pokemon/quaquaval/shiny.pal
rename to graphics/pokemon/gen_9/quaquaval/shiny.pal
diff --git a/graphics/pokemon/quaxly/back.png b/graphics/pokemon/gen_9/quaxly/back.png
similarity index 100%
rename from graphics/pokemon/quaxly/back.png
rename to graphics/pokemon/gen_9/quaxly/back.png
diff --git a/graphics/pokemon/quaxly/front.png b/graphics/pokemon/gen_9/quaxly/front.png
similarity index 100%
rename from graphics/pokemon/quaxly/front.png
rename to graphics/pokemon/gen_9/quaxly/front.png
diff --git a/graphics/pokemon/quaxly/icon.png b/graphics/pokemon/gen_9/quaxly/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/quaxly/icon.png
rename to graphics/pokemon/gen_9/quaxly/icon.png
diff --git a/graphics/pokemon/quaxly/normal.pal b/graphics/pokemon/gen_9/quaxly/normal.pal
similarity index 100%
rename from graphics/pokemon/quaxly/normal.pal
rename to graphics/pokemon/gen_9/quaxly/normal.pal
diff --git a/graphics/pokemon/quaxly/shiny.pal b/graphics/pokemon/gen_9/quaxly/shiny.pal
similarity index 100%
rename from graphics/pokemon/quaxly/shiny.pal
rename to graphics/pokemon/gen_9/quaxly/shiny.pal
diff --git a/graphics/pokemon/quaxwell/back.png b/graphics/pokemon/gen_9/quaxwell/back.png
similarity index 100%
rename from graphics/pokemon/quaxwell/back.png
rename to graphics/pokemon/gen_9/quaxwell/back.png
diff --git a/graphics/pokemon/quaxwell/front.png b/graphics/pokemon/gen_9/quaxwell/front.png
similarity index 100%
rename from graphics/pokemon/quaxwell/front.png
rename to graphics/pokemon/gen_9/quaxwell/front.png
diff --git a/graphics/pokemon/quaxwell/icon.png b/graphics/pokemon/gen_9/quaxwell/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/quaxwell/icon.png
rename to graphics/pokemon/gen_9/quaxwell/icon.png
diff --git a/graphics/pokemon/quaxwell/normal.pal b/graphics/pokemon/gen_9/quaxwell/normal.pal
similarity index 100%
rename from graphics/pokemon/quaxwell/normal.pal
rename to graphics/pokemon/gen_9/quaxwell/normal.pal
diff --git a/graphics/pokemon/quaxwell/shiny.pal b/graphics/pokemon/gen_9/quaxwell/shiny.pal
similarity index 100%
rename from graphics/pokemon/quaxwell/shiny.pal
rename to graphics/pokemon/gen_9/quaxwell/shiny.pal
diff --git a/graphics/pokemon/rabsca/back.png b/graphics/pokemon/gen_9/rabsca/back.png
similarity index 100%
rename from graphics/pokemon/rabsca/back.png
rename to graphics/pokemon/gen_9/rabsca/back.png
diff --git a/graphics/pokemon/rabsca/front.png b/graphics/pokemon/gen_9/rabsca/front.png
similarity index 100%
rename from graphics/pokemon/rabsca/front.png
rename to graphics/pokemon/gen_9/rabsca/front.png
diff --git a/graphics/pokemon/rabsca/icon.png b/graphics/pokemon/gen_9/rabsca/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/rabsca/icon.png
rename to graphics/pokemon/gen_9/rabsca/icon.png
diff --git a/graphics/pokemon/rabsca/normal.pal b/graphics/pokemon/gen_9/rabsca/normal.pal
similarity index 100%
rename from graphics/pokemon/rabsca/normal.pal
rename to graphics/pokemon/gen_9/rabsca/normal.pal
diff --git a/graphics/pokemon/rabsca/shiny.pal b/graphics/pokemon/gen_9/rabsca/shiny.pal
similarity index 100%
rename from graphics/pokemon/rabsca/shiny.pal
rename to graphics/pokemon/gen_9/rabsca/shiny.pal
diff --git a/graphics/pokemon/rellor/back.png b/graphics/pokemon/gen_9/rellor/back.png
similarity index 100%
rename from graphics/pokemon/rellor/back.png
rename to graphics/pokemon/gen_9/rellor/back.png
diff --git a/graphics/pokemon/rellor/front.png b/graphics/pokemon/gen_9/rellor/front.png
similarity index 100%
rename from graphics/pokemon/rellor/front.png
rename to graphics/pokemon/gen_9/rellor/front.png
diff --git a/graphics/pokemon/rellor/icon.png b/graphics/pokemon/gen_9/rellor/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/rellor/icon.png
rename to graphics/pokemon/gen_9/rellor/icon.png
diff --git a/graphics/pokemon/rellor/normal.pal b/graphics/pokemon/gen_9/rellor/normal.pal
similarity index 100%
rename from graphics/pokemon/rellor/normal.pal
rename to graphics/pokemon/gen_9/rellor/normal.pal
diff --git a/graphics/pokemon/rellor/shiny.pal b/graphics/pokemon/gen_9/rellor/shiny.pal
similarity index 100%
rename from graphics/pokemon/rellor/shiny.pal
rename to graphics/pokemon/gen_9/rellor/shiny.pal
diff --git a/graphics/pokemon/revavroom/back.png b/graphics/pokemon/gen_9/revavroom/back.png
similarity index 100%
rename from graphics/pokemon/revavroom/back.png
rename to graphics/pokemon/gen_9/revavroom/back.png
diff --git a/graphics/pokemon/revavroom/front.png b/graphics/pokemon/gen_9/revavroom/front.png
similarity index 100%
rename from graphics/pokemon/revavroom/front.png
rename to graphics/pokemon/gen_9/revavroom/front.png
diff --git a/graphics/pokemon/revavroom/icon.png b/graphics/pokemon/gen_9/revavroom/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/revavroom/icon.png
rename to graphics/pokemon/gen_9/revavroom/icon.png
diff --git a/graphics/pokemon/revavroom/normal.pal b/graphics/pokemon/gen_9/revavroom/normal.pal
similarity index 100%
rename from graphics/pokemon/revavroom/normal.pal
rename to graphics/pokemon/gen_9/revavroom/normal.pal
diff --git a/graphics/pokemon/revavroom/shiny.pal b/graphics/pokemon/gen_9/revavroom/shiny.pal
similarity index 100%
rename from graphics/pokemon/revavroom/shiny.pal
rename to graphics/pokemon/gen_9/revavroom/shiny.pal
diff --git a/graphics/pokemon/roaring_moon/back.png b/graphics/pokemon/gen_9/roaring_moon/back.png
similarity index 100%
rename from graphics/pokemon/roaring_moon/back.png
rename to graphics/pokemon/gen_9/roaring_moon/back.png
diff --git a/graphics/pokemon/roaring_moon/front.png b/graphics/pokemon/gen_9/roaring_moon/front.png
similarity index 100%
rename from graphics/pokemon/roaring_moon/front.png
rename to graphics/pokemon/gen_9/roaring_moon/front.png
diff --git a/graphics/pokemon/roaring_moon/icon.png b/graphics/pokemon/gen_9/roaring_moon/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/roaring_moon/icon.png
rename to graphics/pokemon/gen_9/roaring_moon/icon.png
diff --git a/graphics/pokemon/roaring_moon/normal.pal b/graphics/pokemon/gen_9/roaring_moon/normal.pal
similarity index 100%
rename from graphics/pokemon/roaring_moon/normal.pal
rename to graphics/pokemon/gen_9/roaring_moon/normal.pal
diff --git a/graphics/pokemon/roaring_moon/shiny.pal b/graphics/pokemon/gen_9/roaring_moon/shiny.pal
similarity index 100%
rename from graphics/pokemon/roaring_moon/shiny.pal
rename to graphics/pokemon/gen_9/roaring_moon/shiny.pal
diff --git a/graphics/pokemon/sandy_shocks/back.png b/graphics/pokemon/gen_9/sandy_shocks/back.png
similarity index 100%
rename from graphics/pokemon/sandy_shocks/back.png
rename to graphics/pokemon/gen_9/sandy_shocks/back.png
diff --git a/graphics/pokemon/sandy_shocks/front.png b/graphics/pokemon/gen_9/sandy_shocks/front.png
similarity index 100%
rename from graphics/pokemon/sandy_shocks/front.png
rename to graphics/pokemon/gen_9/sandy_shocks/front.png
diff --git a/graphics/pokemon/sandy_shocks/icon.png b/graphics/pokemon/gen_9/sandy_shocks/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sandy_shocks/icon.png
rename to graphics/pokemon/gen_9/sandy_shocks/icon.png
diff --git a/graphics/pokemon/sandy_shocks/normal.pal b/graphics/pokemon/gen_9/sandy_shocks/normal.pal
similarity index 100%
rename from graphics/pokemon/sandy_shocks/normal.pal
rename to graphics/pokemon/gen_9/sandy_shocks/normal.pal
diff --git a/graphics/pokemon/sandy_shocks/shiny.pal b/graphics/pokemon/gen_9/sandy_shocks/shiny.pal
similarity index 100%
rename from graphics/pokemon/sandy_shocks/shiny.pal
rename to graphics/pokemon/gen_9/sandy_shocks/shiny.pal
diff --git a/graphics/pokemon/scovillain/back.png b/graphics/pokemon/gen_9/scovillain/back.png
similarity index 100%
rename from graphics/pokemon/scovillain/back.png
rename to graphics/pokemon/gen_9/scovillain/back.png
diff --git a/graphics/pokemon/scovillain/front.png b/graphics/pokemon/gen_9/scovillain/front.png
similarity index 100%
rename from graphics/pokemon/scovillain/front.png
rename to graphics/pokemon/gen_9/scovillain/front.png
diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/gen_9/scovillain/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/scovillain/icon.png
rename to graphics/pokemon/gen_9/scovillain/icon.png
diff --git a/graphics/pokemon/scovillain/normal.pal b/graphics/pokemon/gen_9/scovillain/normal.pal
similarity index 100%
rename from graphics/pokemon/scovillain/normal.pal
rename to graphics/pokemon/gen_9/scovillain/normal.pal
diff --git a/graphics/pokemon/scovillain/shiny.pal b/graphics/pokemon/gen_9/scovillain/shiny.pal
similarity index 100%
rename from graphics/pokemon/scovillain/shiny.pal
rename to graphics/pokemon/gen_9/scovillain/shiny.pal
diff --git a/graphics/pokemon/scream_tail/back.png b/graphics/pokemon/gen_9/scream_tail/back.png
similarity index 100%
rename from graphics/pokemon/scream_tail/back.png
rename to graphics/pokemon/gen_9/scream_tail/back.png
diff --git a/graphics/pokemon/scream_tail/front.png b/graphics/pokemon/gen_9/scream_tail/front.png
similarity index 100%
rename from graphics/pokemon/scream_tail/front.png
rename to graphics/pokemon/gen_9/scream_tail/front.png
diff --git a/graphics/pokemon/scream_tail/icon.png b/graphics/pokemon/gen_9/scream_tail/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/scream_tail/icon.png
rename to graphics/pokemon/gen_9/scream_tail/icon.png
diff --git a/graphics/pokemon/scream_tail/normal.pal b/graphics/pokemon/gen_9/scream_tail/normal.pal
similarity index 100%
rename from graphics/pokemon/scream_tail/normal.pal
rename to graphics/pokemon/gen_9/scream_tail/normal.pal
diff --git a/graphics/pokemon/scream_tail/shiny.pal b/graphics/pokemon/gen_9/scream_tail/shiny.pal
similarity index 100%
rename from graphics/pokemon/scream_tail/shiny.pal
rename to graphics/pokemon/gen_9/scream_tail/shiny.pal
diff --git a/graphics/pokemon/shroodle/back.png b/graphics/pokemon/gen_9/shroodle/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/shroodle/back.png
rename to graphics/pokemon/gen_9/shroodle/back.png
diff --git a/graphics/pokemon/shroodle/front.png b/graphics/pokemon/gen_9/shroodle/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/shroodle/front.png
rename to graphics/pokemon/gen_9/shroodle/front.png
diff --git a/graphics/pokemon/shroodle/icon.png b/graphics/pokemon/gen_9/shroodle/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/shroodle/icon.png
rename to graphics/pokemon/gen_9/shroodle/icon.png
diff --git a/graphics/pokemon/shroodle/normal.pal b/graphics/pokemon/gen_9/shroodle/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/shroodle/normal.pal
rename to graphics/pokemon/gen_9/shroodle/normal.pal
diff --git a/graphics/pokemon/shroodle/shiny.pal b/graphics/pokemon/gen_9/shroodle/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/shroodle/shiny.pal
rename to graphics/pokemon/gen_9/shroodle/shiny.pal
diff --git a/graphics/pokemon/sinistcha/back.png b/graphics/pokemon/gen_9/sinistcha/back.png
similarity index 100%
rename from graphics/pokemon/sinistcha/back.png
rename to graphics/pokemon/gen_9/sinistcha/back.png
diff --git a/graphics/pokemon/sinistcha/front.png b/graphics/pokemon/gen_9/sinistcha/front.png
similarity index 100%
rename from graphics/pokemon/sinistcha/front.png
rename to graphics/pokemon/gen_9/sinistcha/front.png
diff --git a/graphics/pokemon/sinistcha/icon.png b/graphics/pokemon/gen_9/sinistcha/icon.png
similarity index 100%
rename from graphics/pokemon/sinistcha/icon.png
rename to graphics/pokemon/gen_9/sinistcha/icon.png
diff --git a/graphics/pokemon/sinistcha/normal.pal b/graphics/pokemon/gen_9/sinistcha/normal.pal
similarity index 100%
rename from graphics/pokemon/sinistcha/normal.pal
rename to graphics/pokemon/gen_9/sinistcha/normal.pal
diff --git a/graphics/pokemon/sinistcha/shiny.pal b/graphics/pokemon/gen_9/sinistcha/shiny.pal
similarity index 100%
rename from graphics/pokemon/sinistcha/shiny.pal
rename to graphics/pokemon/gen_9/sinistcha/shiny.pal
diff --git a/graphics/pokemon/skeledirge/back.png b/graphics/pokemon/gen_9/skeledirge/back.png
similarity index 100%
rename from graphics/pokemon/skeledirge/back.png
rename to graphics/pokemon/gen_9/skeledirge/back.png
diff --git a/graphics/pokemon/skeledirge/front.png b/graphics/pokemon/gen_9/skeledirge/front.png
similarity index 100%
rename from graphics/pokemon/skeledirge/front.png
rename to graphics/pokemon/gen_9/skeledirge/front.png
diff --git a/graphics/pokemon/skeledirge/icon.png b/graphics/pokemon/gen_9/skeledirge/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/skeledirge/icon.png
rename to graphics/pokemon/gen_9/skeledirge/icon.png
diff --git a/graphics/pokemon/skeledirge/normal.pal b/graphics/pokemon/gen_9/skeledirge/normal.pal
similarity index 100%
rename from graphics/pokemon/skeledirge/normal.pal
rename to graphics/pokemon/gen_9/skeledirge/normal.pal
diff --git a/graphics/pokemon/skeledirge/shiny.pal b/graphics/pokemon/gen_9/skeledirge/shiny.pal
similarity index 100%
rename from graphics/pokemon/skeledirge/shiny.pal
rename to graphics/pokemon/gen_9/skeledirge/shiny.pal
diff --git a/graphics/pokemon/slither_wing/back.png b/graphics/pokemon/gen_9/slither_wing/back.png
similarity index 100%
rename from graphics/pokemon/slither_wing/back.png
rename to graphics/pokemon/gen_9/slither_wing/back.png
diff --git a/graphics/pokemon/slither_wing/front.png b/graphics/pokemon/gen_9/slither_wing/front.png
similarity index 100%
rename from graphics/pokemon/slither_wing/front.png
rename to graphics/pokemon/gen_9/slither_wing/front.png
diff --git a/graphics/pokemon/slither_wing/icon.png b/graphics/pokemon/gen_9/slither_wing/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/slither_wing/icon.png
rename to graphics/pokemon/gen_9/slither_wing/icon.png
diff --git a/graphics/pokemon/slither_wing/normal.pal b/graphics/pokemon/gen_9/slither_wing/normal.pal
similarity index 100%
rename from graphics/pokemon/slither_wing/normal.pal
rename to graphics/pokemon/gen_9/slither_wing/normal.pal
diff --git a/graphics/pokemon/slither_wing/shiny.pal b/graphics/pokemon/gen_9/slither_wing/shiny.pal
similarity index 100%
rename from graphics/pokemon/slither_wing/shiny.pal
rename to graphics/pokemon/gen_9/slither_wing/shiny.pal
diff --git a/graphics/pokemon/smoliv/back.png b/graphics/pokemon/gen_9/smoliv/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/smoliv/back.png
rename to graphics/pokemon/gen_9/smoliv/back.png
diff --git a/graphics/pokemon/smoliv/front.png b/graphics/pokemon/gen_9/smoliv/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/smoliv/front.png
rename to graphics/pokemon/gen_9/smoliv/front.png
diff --git a/graphics/pokemon/smoliv/icon.png b/graphics/pokemon/gen_9/smoliv/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/smoliv/icon.png
rename to graphics/pokemon/gen_9/smoliv/icon.png
diff --git a/graphics/pokemon/smoliv/normal.pal b/graphics/pokemon/gen_9/smoliv/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/smoliv/normal.pal
rename to graphics/pokemon/gen_9/smoliv/normal.pal
diff --git a/graphics/pokemon/smoliv/shiny.pal b/graphics/pokemon/gen_9/smoliv/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/smoliv/shiny.pal
rename to graphics/pokemon/gen_9/smoliv/shiny.pal
diff --git a/graphics/pokemon/spidops/back.png b/graphics/pokemon/gen_9/spidops/back.png
similarity index 100%
rename from graphics/pokemon/spidops/back.png
rename to graphics/pokemon/gen_9/spidops/back.png
diff --git a/graphics/pokemon/spidops/front.png b/graphics/pokemon/gen_9/spidops/front.png
similarity index 100%
rename from graphics/pokemon/spidops/front.png
rename to graphics/pokemon/gen_9/spidops/front.png
diff --git a/graphics/pokemon/spidops/icon.png b/graphics/pokemon/gen_9/spidops/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/spidops/icon.png
rename to graphics/pokemon/gen_9/spidops/icon.png
diff --git a/graphics/pokemon/spidops/normal.pal b/graphics/pokemon/gen_9/spidops/normal.pal
similarity index 100%
rename from graphics/pokemon/spidops/normal.pal
rename to graphics/pokemon/gen_9/spidops/normal.pal
diff --git a/graphics/pokemon/spidops/shiny.pal b/graphics/pokemon/gen_9/spidops/shiny.pal
similarity index 100%
rename from graphics/pokemon/spidops/shiny.pal
rename to graphics/pokemon/gen_9/spidops/shiny.pal
diff --git a/graphics/pokemon/sprigatito/back.png b/graphics/pokemon/gen_9/sprigatito/back.png
similarity index 100%
rename from graphics/pokemon/sprigatito/back.png
rename to graphics/pokemon/gen_9/sprigatito/back.png
diff --git a/graphics/pokemon/sprigatito/front.png b/graphics/pokemon/gen_9/sprigatito/front.png
similarity index 100%
rename from graphics/pokemon/sprigatito/front.png
rename to graphics/pokemon/gen_9/sprigatito/front.png
diff --git a/graphics/pokemon/sprigatito/icon.png b/graphics/pokemon/gen_9/sprigatito/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/sprigatito/icon.png
rename to graphics/pokemon/gen_9/sprigatito/icon.png
diff --git a/graphics/pokemon/sprigatito/normal.pal b/graphics/pokemon/gen_9/sprigatito/normal.pal
similarity index 100%
rename from graphics/pokemon/sprigatito/normal.pal
rename to graphics/pokemon/gen_9/sprigatito/normal.pal
diff --git a/graphics/pokemon/sprigatito/shiny.pal b/graphics/pokemon/gen_9/sprigatito/shiny.pal
similarity index 100%
rename from graphics/pokemon/sprigatito/shiny.pal
rename to graphics/pokemon/gen_9/sprigatito/shiny.pal
diff --git a/graphics/pokemon/squawkabilly/back.png b/graphics/pokemon/gen_9/squawkabilly/back.png
similarity index 100%
rename from graphics/pokemon/squawkabilly/back.png
rename to graphics/pokemon/gen_9/squawkabilly/back.png
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/squawkabilly/blue_plumage/icon.png
rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.png
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/blue_plumage/normal.pal
rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.pal
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/blue_plumage/shiny.pal
rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.pal
diff --git a/graphics/pokemon/squawkabilly/front.png b/graphics/pokemon/gen_9/squawkabilly/front.png
similarity index 100%
rename from graphics/pokemon/squawkabilly/front.png
rename to graphics/pokemon/gen_9/squawkabilly/front.png
diff --git a/graphics/pokemon/squawkabilly/green_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/squawkabilly/green_plumage/icon.png
rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.png
diff --git a/graphics/pokemon/squawkabilly/green_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/green_plumage/normal.pal
rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.pal
diff --git a/graphics/pokemon/squawkabilly/green_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/green_plumage/shiny.pal
rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.pal
diff --git a/graphics/pokemon/squawkabilly/white_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/squawkabilly/white_plumage/icon.png
rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.png
diff --git a/graphics/pokemon/squawkabilly/white_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/white_plumage/normal.pal
rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.pal
diff --git a/graphics/pokemon/squawkabilly/white_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/white_plumage/shiny.pal
rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.pal
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/squawkabilly/yellow_plumage/icon.png
rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.png
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/yellow_plumage/normal.pal
rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.pal
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.pal
similarity index 100%
rename from graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal
rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.pal
diff --git a/graphics/pokemon/tadbulb/back.png b/graphics/pokemon/gen_9/tadbulb/back.png
similarity index 100%
rename from graphics/pokemon/tadbulb/back.png
rename to graphics/pokemon/gen_9/tadbulb/back.png
diff --git a/graphics/pokemon/tadbulb/front.png b/graphics/pokemon/gen_9/tadbulb/front.png
similarity index 100%
rename from graphics/pokemon/tadbulb/front.png
rename to graphics/pokemon/gen_9/tadbulb/front.png
diff --git a/graphics/pokemon/tadbulb/icon.png b/graphics/pokemon/gen_9/tadbulb/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tadbulb/icon.png
rename to graphics/pokemon/gen_9/tadbulb/icon.png
diff --git a/graphics/pokemon/tadbulb/normal.pal b/graphics/pokemon/gen_9/tadbulb/normal.pal
similarity index 100%
rename from graphics/pokemon/tadbulb/normal.pal
rename to graphics/pokemon/gen_9/tadbulb/normal.pal
diff --git a/graphics/pokemon/tadbulb/shiny.pal b/graphics/pokemon/gen_9/tadbulb/shiny.pal
similarity index 100%
rename from graphics/pokemon/tadbulb/shiny.pal
rename to graphics/pokemon/gen_9/tadbulb/shiny.pal
diff --git a/graphics/pokemon/tandemaus/back.png b/graphics/pokemon/gen_9/tandemaus/back.png
similarity index 100%
rename from graphics/pokemon/tandemaus/back.png
rename to graphics/pokemon/gen_9/tandemaus/back.png
diff --git a/graphics/pokemon/tandemaus/front.png b/graphics/pokemon/gen_9/tandemaus/front.png
similarity index 100%
rename from graphics/pokemon/tandemaus/front.png
rename to graphics/pokemon/gen_9/tandemaus/front.png
diff --git a/graphics/pokemon/tandemaus/icon.png b/graphics/pokemon/gen_9/tandemaus/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tandemaus/icon.png
rename to graphics/pokemon/gen_9/tandemaus/icon.png
diff --git a/graphics/pokemon/tandemaus/normal.pal b/graphics/pokemon/gen_9/tandemaus/normal.pal
similarity index 100%
rename from graphics/pokemon/tandemaus/normal.pal
rename to graphics/pokemon/gen_9/tandemaus/normal.pal
diff --git a/graphics/pokemon/tandemaus/shiny.pal b/graphics/pokemon/gen_9/tandemaus/shiny.pal
similarity index 100%
rename from graphics/pokemon/tandemaus/shiny.pal
rename to graphics/pokemon/gen_9/tandemaus/shiny.pal
diff --git a/graphics/pokemon/tarountula/back.png b/graphics/pokemon/gen_9/tarountula/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tarountula/back.png
rename to graphics/pokemon/gen_9/tarountula/back.png
diff --git a/graphics/pokemon/tarountula/front.png b/graphics/pokemon/gen_9/tarountula/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tarountula/front.png
rename to graphics/pokemon/gen_9/tarountula/front.png
diff --git a/graphics/pokemon/tarountula/icon.png b/graphics/pokemon/gen_9/tarountula/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tarountula/icon.png
rename to graphics/pokemon/gen_9/tarountula/icon.png
diff --git a/graphics/pokemon/tarountula/normal.pal b/graphics/pokemon/gen_9/tarountula/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tarountula/normal.pal
rename to graphics/pokemon/gen_9/tarountula/normal.pal
diff --git a/graphics/pokemon/tarountula/shiny.pal b/graphics/pokemon/gen_9/tarountula/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tarountula/shiny.pal
rename to graphics/pokemon/gen_9/tarountula/shiny.pal
diff --git a/graphics/pokemon/tatsugiri/curly/back.png b/graphics/pokemon/gen_9/tatsugiri/curly/back.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/curly/back.png
rename to graphics/pokemon/gen_9/tatsugiri/curly/back.png
diff --git a/graphics/pokemon/tatsugiri/curly/front.png b/graphics/pokemon/gen_9/tatsugiri/curly/front.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/curly/front.png
rename to graphics/pokemon/gen_9/tatsugiri/curly/front.png
diff --git a/graphics/pokemon/tatsugiri/curly/icon.png b/graphics/pokemon/gen_9/tatsugiri/curly/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tatsugiri/curly/icon.png
rename to graphics/pokemon/gen_9/tatsugiri/curly/icon.png
diff --git a/graphics/pokemon/tatsugiri/curly/normal.pal b/graphics/pokemon/gen_9/tatsugiri/curly/normal.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/curly/normal.pal
rename to graphics/pokemon/gen_9/tatsugiri/curly/normal.pal
diff --git a/graphics/pokemon/tatsugiri/curly/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/curly/shiny.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/curly/shiny.pal
rename to graphics/pokemon/gen_9/tatsugiri/curly/shiny.pal
diff --git a/graphics/pokemon/tatsugiri/droopy/back.png b/graphics/pokemon/gen_9/tatsugiri/droopy/back.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/droopy/back.png
rename to graphics/pokemon/gen_9/tatsugiri/droopy/back.png
diff --git a/graphics/pokemon/tatsugiri/droopy/front.png b/graphics/pokemon/gen_9/tatsugiri/droopy/front.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/droopy/front.png
rename to graphics/pokemon/gen_9/tatsugiri/droopy/front.png
diff --git a/graphics/pokemon/tatsugiri/droopy/icon.png b/graphics/pokemon/gen_9/tatsugiri/droopy/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tatsugiri/droopy/icon.png
rename to graphics/pokemon/gen_9/tatsugiri/droopy/icon.png
diff --git a/graphics/pokemon/tatsugiri/droopy/normal.pal b/graphics/pokemon/gen_9/tatsugiri/droopy/normal.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/droopy/normal.pal
rename to graphics/pokemon/gen_9/tatsugiri/droopy/normal.pal
diff --git a/graphics/pokemon/tatsugiri/droopy/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/droopy/shiny.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/droopy/shiny.pal
rename to graphics/pokemon/gen_9/tatsugiri/droopy/shiny.pal
diff --git a/graphics/pokemon/tatsugiri/stretchy/back.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/back.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/stretchy/back.png
rename to graphics/pokemon/gen_9/tatsugiri/stretchy/back.png
diff --git a/graphics/pokemon/tatsugiri/stretchy/front.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/front.png
similarity index 100%
rename from graphics/pokemon/tatsugiri/stretchy/front.png
rename to graphics/pokemon/gen_9/tatsugiri/stretchy/front.png
diff --git a/graphics/pokemon/tatsugiri/stretchy/icon.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tatsugiri/stretchy/icon.png
rename to graphics/pokemon/gen_9/tatsugiri/stretchy/icon.png
diff --git a/graphics/pokemon/tatsugiri/stretchy/normal.pal b/graphics/pokemon/gen_9/tatsugiri/stretchy/normal.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/stretchy/normal.pal
rename to graphics/pokemon/gen_9/tatsugiri/stretchy/normal.pal
diff --git a/graphics/pokemon/tatsugiri/stretchy/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.pal
similarity index 100%
rename from graphics/pokemon/tatsugiri/stretchy/shiny.pal
rename to graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.pal
diff --git a/graphics/pokemon/ting_lu/back.png b/graphics/pokemon/gen_9/ting_lu/back.png
similarity index 100%
rename from graphics/pokemon/ting_lu/back.png
rename to graphics/pokemon/gen_9/ting_lu/back.png
diff --git a/graphics/pokemon/ting_lu/front.png b/graphics/pokemon/gen_9/ting_lu/front.png
similarity index 100%
rename from graphics/pokemon/ting_lu/front.png
rename to graphics/pokemon/gen_9/ting_lu/front.png
diff --git a/graphics/pokemon/ting_lu/icon.png b/graphics/pokemon/gen_9/ting_lu/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/ting_lu/icon.png
rename to graphics/pokemon/gen_9/ting_lu/icon.png
diff --git a/graphics/pokemon/ting_lu/normal.pal b/graphics/pokemon/gen_9/ting_lu/normal.pal
similarity index 100%
rename from graphics/pokemon/ting_lu/normal.pal
rename to graphics/pokemon/gen_9/ting_lu/normal.pal
diff --git a/graphics/pokemon/ting_lu/shiny.pal b/graphics/pokemon/gen_9/ting_lu/shiny.pal
similarity index 100%
rename from graphics/pokemon/ting_lu/shiny.pal
rename to graphics/pokemon/gen_9/ting_lu/shiny.pal
diff --git a/graphics/pokemon/tinkatink/back.png b/graphics/pokemon/gen_9/tinkatink/back.png
similarity index 100%
rename from graphics/pokemon/tinkatink/back.png
rename to graphics/pokemon/gen_9/tinkatink/back.png
diff --git a/graphics/pokemon/tinkatink/front.png b/graphics/pokemon/gen_9/tinkatink/front.png
similarity index 100%
rename from graphics/pokemon/tinkatink/front.png
rename to graphics/pokemon/gen_9/tinkatink/front.png
diff --git a/graphics/pokemon/tinkatink/icon.png b/graphics/pokemon/gen_9/tinkatink/icon.png
similarity index 100%
rename from graphics/pokemon/tinkatink/icon.png
rename to graphics/pokemon/gen_9/tinkatink/icon.png
diff --git a/graphics/pokemon/tinkatink/normal.pal b/graphics/pokemon/gen_9/tinkatink/normal.pal
similarity index 100%
rename from graphics/pokemon/tinkatink/normal.pal
rename to graphics/pokemon/gen_9/tinkatink/normal.pal
diff --git a/graphics/pokemon/tinkatink/shiny.pal b/graphics/pokemon/gen_9/tinkatink/shiny.pal
similarity index 100%
rename from graphics/pokemon/tinkatink/shiny.pal
rename to graphics/pokemon/gen_9/tinkatink/shiny.pal
diff --git a/graphics/pokemon/tinkaton/back.png b/graphics/pokemon/gen_9/tinkaton/back.png
similarity index 100%
rename from graphics/pokemon/tinkaton/back.png
rename to graphics/pokemon/gen_9/tinkaton/back.png
diff --git a/graphics/pokemon/tinkaton/front.png b/graphics/pokemon/gen_9/tinkaton/front.png
similarity index 100%
rename from graphics/pokemon/tinkaton/front.png
rename to graphics/pokemon/gen_9/tinkaton/front.png
diff --git a/graphics/pokemon/tinkaton/icon.png b/graphics/pokemon/gen_9/tinkaton/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tinkaton/icon.png
rename to graphics/pokemon/gen_9/tinkaton/icon.png
diff --git a/graphics/pokemon/tinkaton/normal.pal b/graphics/pokemon/gen_9/tinkaton/normal.pal
similarity index 100%
rename from graphics/pokemon/tinkaton/normal.pal
rename to graphics/pokemon/gen_9/tinkaton/normal.pal
diff --git a/graphics/pokemon/tinkaton/shiny.pal b/graphics/pokemon/gen_9/tinkaton/shiny.pal
similarity index 100%
rename from graphics/pokemon/tinkaton/shiny.pal
rename to graphics/pokemon/gen_9/tinkaton/shiny.pal
diff --git a/graphics/pokemon/tinkatuff/back.png b/graphics/pokemon/gen_9/tinkatuff/back.png
similarity index 100%
rename from graphics/pokemon/tinkatuff/back.png
rename to graphics/pokemon/gen_9/tinkatuff/back.png
diff --git a/graphics/pokemon/tinkatuff/front.png b/graphics/pokemon/gen_9/tinkatuff/front.png
similarity index 100%
rename from graphics/pokemon/tinkatuff/front.png
rename to graphics/pokemon/gen_9/tinkatuff/front.png
diff --git a/graphics/pokemon/tinkatuff/icon.png b/graphics/pokemon/gen_9/tinkatuff/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/tinkatuff/icon.png
rename to graphics/pokemon/gen_9/tinkatuff/icon.png
diff --git a/graphics/pokemon/tinkatuff/normal.pal b/graphics/pokemon/gen_9/tinkatuff/normal.pal
similarity index 100%
rename from graphics/pokemon/tinkatuff/normal.pal
rename to graphics/pokemon/gen_9/tinkatuff/normal.pal
diff --git a/graphics/pokemon/tinkatuff/shiny.pal b/graphics/pokemon/gen_9/tinkatuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/tinkatuff/shiny.pal
rename to graphics/pokemon/gen_9/tinkatuff/shiny.pal
diff --git a/graphics/pokemon/toedscool/back.png b/graphics/pokemon/gen_9/toedscool/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscool/back.png
rename to graphics/pokemon/gen_9/toedscool/back.png
diff --git a/graphics/pokemon/toedscool/front.png b/graphics/pokemon/gen_9/toedscool/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscool/front.png
rename to graphics/pokemon/gen_9/toedscool/front.png
diff --git a/graphics/pokemon/toedscool/icon.png b/graphics/pokemon/gen_9/toedscool/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscool/icon.png
rename to graphics/pokemon/gen_9/toedscool/icon.png
diff --git a/graphics/pokemon/toedscool/normal.pal b/graphics/pokemon/gen_9/toedscool/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscool/normal.pal
rename to graphics/pokemon/gen_9/toedscool/normal.pal
diff --git a/graphics/pokemon/toedscool/shiny.pal b/graphics/pokemon/gen_9/toedscool/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscool/shiny.pal
rename to graphics/pokemon/gen_9/toedscool/shiny.pal
diff --git a/graphics/pokemon/toedscruel/back.png b/graphics/pokemon/gen_9/toedscruel/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscruel/back.png
rename to graphics/pokemon/gen_9/toedscruel/back.png
diff --git a/graphics/pokemon/toedscruel/front.png b/graphics/pokemon/gen_9/toedscruel/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscruel/front.png
rename to graphics/pokemon/gen_9/toedscruel/front.png
diff --git a/graphics/pokemon/toedscruel/icon.png b/graphics/pokemon/gen_9/toedscruel/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscruel/icon.png
rename to graphics/pokemon/gen_9/toedscruel/icon.png
diff --git a/graphics/pokemon/toedscruel/normal.pal b/graphics/pokemon/gen_9/toedscruel/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscruel/normal.pal
rename to graphics/pokemon/gen_9/toedscruel/normal.pal
diff --git a/graphics/pokemon/toedscruel/shiny.pal b/graphics/pokemon/gen_9/toedscruel/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/toedscruel/shiny.pal
rename to graphics/pokemon/gen_9/toedscruel/shiny.pal
diff --git a/graphics/pokemon/varoom/back.png b/graphics/pokemon/gen_9/varoom/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/varoom/back.png
rename to graphics/pokemon/gen_9/varoom/back.png
diff --git a/graphics/pokemon/varoom/front.png b/graphics/pokemon/gen_9/varoom/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/varoom/front.png
rename to graphics/pokemon/gen_9/varoom/front.png
diff --git a/graphics/pokemon/varoom/icon.png b/graphics/pokemon/gen_9/varoom/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/varoom/icon.png
rename to graphics/pokemon/gen_9/varoom/icon.png
diff --git a/graphics/pokemon/varoom/normal.pal b/graphics/pokemon/gen_9/varoom/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/varoom/normal.pal
rename to graphics/pokemon/gen_9/varoom/normal.pal
diff --git a/graphics/pokemon/varoom/shiny.pal b/graphics/pokemon/gen_9/varoom/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/varoom/shiny.pal
rename to graphics/pokemon/gen_9/varoom/shiny.pal
diff --git a/graphics/pokemon/veluza/back.png b/graphics/pokemon/gen_9/veluza/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/veluza/back.png
rename to graphics/pokemon/gen_9/veluza/back.png
diff --git a/graphics/pokemon/veluza/front.png b/graphics/pokemon/gen_9/veluza/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/veluza/front.png
rename to graphics/pokemon/gen_9/veluza/front.png
diff --git a/graphics/pokemon/veluza/icon.png b/graphics/pokemon/gen_9/veluza/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/veluza/icon.png
rename to graphics/pokemon/gen_9/veluza/icon.png
diff --git a/graphics/pokemon/veluza/normal.pal b/graphics/pokemon/gen_9/veluza/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/veluza/normal.pal
rename to graphics/pokemon/gen_9/veluza/normal.pal
diff --git a/graphics/pokemon/veluza/shiny.pal b/graphics/pokemon/gen_9/veluza/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/veluza/shiny.pal
rename to graphics/pokemon/gen_9/veluza/shiny.pal
diff --git a/graphics/pokemon/walking_wake/back.png b/graphics/pokemon/gen_9/walking_wake/back.png
similarity index 100%
rename from graphics/pokemon/walking_wake/back.png
rename to graphics/pokemon/gen_9/walking_wake/back.png
diff --git a/graphics/pokemon/walking_wake/front.png b/graphics/pokemon/gen_9/walking_wake/front.png
similarity index 100%
rename from graphics/pokemon/walking_wake/front.png
rename to graphics/pokemon/gen_9/walking_wake/front.png
diff --git a/graphics/pokemon/walking_wake/icon.png b/graphics/pokemon/gen_9/walking_wake/icon.png
similarity index 100%
rename from graphics/pokemon/walking_wake/icon.png
rename to graphics/pokemon/gen_9/walking_wake/icon.png
diff --git a/graphics/pokemon/walking_wake/normal.pal b/graphics/pokemon/gen_9/walking_wake/normal.pal
similarity index 100%
rename from graphics/pokemon/walking_wake/normal.pal
rename to graphics/pokemon/gen_9/walking_wake/normal.pal
diff --git a/graphics/pokemon/walking_wake/shiny.pal b/graphics/pokemon/gen_9/walking_wake/shiny.pal
similarity index 100%
rename from graphics/pokemon/walking_wake/shiny.pal
rename to graphics/pokemon/gen_9/walking_wake/shiny.pal
diff --git a/graphics/pokemon/wattrel/back.png b/graphics/pokemon/gen_9/wattrel/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wattrel/back.png
rename to graphics/pokemon/gen_9/wattrel/back.png
diff --git a/graphics/pokemon/wattrel/front.png b/graphics/pokemon/gen_9/wattrel/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wattrel/front.png
rename to graphics/pokemon/gen_9/wattrel/front.png
diff --git a/graphics/pokemon/wattrel/icon.png b/graphics/pokemon/gen_9/wattrel/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wattrel/icon.png
rename to graphics/pokemon/gen_9/wattrel/icon.png
diff --git a/graphics/pokemon/wattrel/normal.pal b/graphics/pokemon/gen_9/wattrel/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wattrel/normal.pal
rename to graphics/pokemon/gen_9/wattrel/normal.pal
diff --git a/graphics/pokemon/wattrel/shiny.pal b/graphics/pokemon/gen_9/wattrel/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wattrel/shiny.pal
rename to graphics/pokemon/gen_9/wattrel/shiny.pal
diff --git a/graphics/pokemon/wiglett/back.png b/graphics/pokemon/gen_9/wiglett/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wiglett/back.png
rename to graphics/pokemon/gen_9/wiglett/back.png
diff --git a/graphics/pokemon/wiglett/front.png b/graphics/pokemon/gen_9/wiglett/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wiglett/front.png
rename to graphics/pokemon/gen_9/wiglett/front.png
diff --git a/graphics/pokemon/wiglett/icon.png b/graphics/pokemon/gen_9/wiglett/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wiglett/icon.png
rename to graphics/pokemon/gen_9/wiglett/icon.png
diff --git a/graphics/pokemon/wiglett/normal.pal b/graphics/pokemon/gen_9/wiglett/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wiglett/normal.pal
rename to graphics/pokemon/gen_9/wiglett/normal.pal
diff --git a/graphics/pokemon/wiglett/shiny.pal b/graphics/pokemon/gen_9/wiglett/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wiglett/shiny.pal
rename to graphics/pokemon/gen_9/wiglett/shiny.pal
diff --git a/graphics/pokemon/wo_chien/back.png b/graphics/pokemon/gen_9/wo_chien/back.png
similarity index 100%
rename from graphics/pokemon/wo_chien/back.png
rename to graphics/pokemon/gen_9/wo_chien/back.png
diff --git a/graphics/pokemon/wo_chien/front.png b/graphics/pokemon/gen_9/wo_chien/front.png
similarity index 100%
rename from graphics/pokemon/wo_chien/front.png
rename to graphics/pokemon/gen_9/wo_chien/front.png
diff --git a/graphics/pokemon/wo_chien/icon.png b/graphics/pokemon/gen_9/wo_chien/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wo_chien/icon.png
rename to graphics/pokemon/gen_9/wo_chien/icon.png
diff --git a/graphics/pokemon/wo_chien/normal.pal b/graphics/pokemon/gen_9/wo_chien/normal.pal
similarity index 100%
rename from graphics/pokemon/wo_chien/normal.pal
rename to graphics/pokemon/gen_9/wo_chien/normal.pal
diff --git a/graphics/pokemon/wo_chien/shiny.pal b/graphics/pokemon/gen_9/wo_chien/shiny.pal
similarity index 100%
rename from graphics/pokemon/wo_chien/shiny.pal
rename to graphics/pokemon/gen_9/wo_chien/shiny.pal
diff --git a/graphics/pokemon/wugtrio/back.png b/graphics/pokemon/gen_9/wugtrio/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wugtrio/back.png
rename to graphics/pokemon/gen_9/wugtrio/back.png
diff --git a/graphics/pokemon/wugtrio/front.png b/graphics/pokemon/gen_9/wugtrio/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wugtrio/front.png
rename to graphics/pokemon/gen_9/wugtrio/front.png
diff --git a/graphics/pokemon/wugtrio/icon.png b/graphics/pokemon/gen_9/wugtrio/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wugtrio/icon.png
rename to graphics/pokemon/gen_9/wugtrio/icon.png
diff --git a/graphics/pokemon/wugtrio/normal.pal b/graphics/pokemon/gen_9/wugtrio/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wugtrio/normal.pal
rename to graphics/pokemon/gen_9/wugtrio/normal.pal
diff --git a/graphics/pokemon/wugtrio/shiny.pal b/graphics/pokemon/gen_9/wugtrio/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/wugtrio/shiny.pal
rename to graphics/pokemon/gen_9/wugtrio/shiny.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 6a2728aff4..8aa873ee06 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -20,7 +20,7 @@ JPCONTESTGFXDIR := graphics/contest/japanese
 POKEDEXGFXDIR := graphics/pokedex
 STARTERGFXDIR := graphics/starter_choose
 NAMINGGFXDIR := graphics/naming_screen
-SPINDAGFXDIR := graphics/pokemon/spinda/spots
+SPINDAGFXDIR := graphics/pokemon/gen_3/spinda/spots
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
 contest_types := cool beauty cute smart tough
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index de164520d2..daa1a29784 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -8,11569 +8,11571 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
 #endif //P_FOOTPRINTS
 
 #if P_FAMILY_BULBASAUR
-    const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/normal.gbapal.lz");
-    const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/shiny.gbapal.lz");
-    const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp");
+    const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/normal.gbapal.lz");
+    const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/shiny.gbapal.lz");
+    const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/gen_1/bulbasaur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp");
+    const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/gen_1/bulbasaur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/shiny.gbapal.lz");
-    const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp");
+    const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/normal.gbapal.lz");
+    const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/shiny.gbapal.lz");
+    const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/gen_1/ivysaur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp");
+    const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/gen_1/ivysaur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/shiny.gbapal.lz");
-    const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/icon.4bpp");
+    const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/anim_front.4bpp.lz");
+    const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/normal.gbapal.lz");
+    const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/shiny.gbapal.lz");
+    const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp");
+    const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/backf.4bpp.lz");
+
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz");
-    const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/front.4bpp.lz");
+    const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/venusaur/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_BULBASAUR
 
 #if P_FAMILY_CHARMANDER
-    const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz");
-    const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/normal.gbapal.lz");
-    const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz");
-    const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/shiny.gbapal.lz");
-    const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/icon.4bpp");
+    const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/anim_front.4bpp.lz");
+    const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/normal.gbapal.lz");
+    const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/back.4bpp.lz");
+    const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/shiny.gbapal.lz");
+    const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/gen_1/charmander/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp");
+    const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/gen_1/charmander/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/shiny.gbapal.lz");
-    const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/icon.4bpp");
+    const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/normal.gbapal.lz");
+    const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/shiny.gbapal.lz");
+    const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/gen_1/charmeleon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp");
+    const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/gen_1/charmeleon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz");
-    const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/shiny.gbapal.lz");
-    const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/icon.4bpp");
+    const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/anim_front.4bpp.lz");
+    const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/normal.gbapal.lz");
+    const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/back.4bpp.lz");
+    const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/shiny.gbapal.lz");
+    const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp");
+    const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz");
-    const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/front.4bpp.lz");
+    const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/normal.gbapal.lz");
+    const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/back.4bpp.lz");
+    const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/shiny.gbapal.lz");
+    const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/mega_x/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/front.4bpp.lz");
+    const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/normal.gbapal.lz");
+    const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/back.4bpp.lz");
+    const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/shiny.gbapal.lz");
+    const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/mega_y/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/charizard/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_CHARMANDER
 
 #if P_FAMILY_SQUIRTLE
-    const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/normal.gbapal.lz");
-    const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/shiny.gbapal.lz");
-    const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/icon.4bpp");
+    const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/normal.gbapal.lz");
+    const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/shiny.gbapal.lz");
+    const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/gen_1/squirtle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp");
+    const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/gen_1/squirtle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/shiny.gbapal.lz");
-    const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/icon.4bpp");
+    const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/normal.gbapal.lz");
+    const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/shiny.gbapal.lz");
+    const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/gen_1/wartortle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp");
+    const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/gen_1/wartortle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/shiny.gbapal.lz");
-    const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/icon.4bpp");
+    const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/anim_front.4bpp.lz");
+    const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/normal.gbapal.lz");
+    const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/shiny.gbapal.lz");
+    const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp");
+    const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/front.4bpp.lz");
-    const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/front.4bpp.lz");
+    const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/blastoise/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SQUIRTLE
 
 #if P_FAMILY_CATERPIE
-    const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz");
-    const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/normal.gbapal.lz");
-    const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/shiny.gbapal.lz");
-    const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/icon.4bpp");
+    const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/normal.gbapal.lz");
+    const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/shiny.gbapal.lz");
+    const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/gen_1/caterpie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp");
+    const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/gen_1/caterpie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz");
-    const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/shiny.gbapal.lz");
-    const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/metapod/icon.4bpp");
+    const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/anim_front.4bpp.lz");
+    const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/normal.gbapal.lz");
+    const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/back.4bpp.lz");
+    const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/shiny.gbapal.lz");
+    const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/gen_1/metapod/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp");
+    const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/gen_1/metapod/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz");
-    const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/shiny.gbapal.lz");
-    const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/icon.4bpp");
+    const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/anim_front.4bpp.lz");
+    const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/normal.gbapal.lz");
+    const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/back.4bpp.lz");
+    const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/shiny.gbapal.lz");
+    const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp");
+    const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/backf.4bpp.lz");
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/butterfree/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_CATERPIE
 
 #if P_FAMILY_WEEDLE
-    const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/normal.gbapal.lz");
-    const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/shiny.gbapal.lz");
-    const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/icon.4bpp");
+    const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/normal.gbapal.lz");
+    const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/shiny.gbapal.lz");
+    const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/gen_1/weedle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp");
+    const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/gen_1/weedle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/shiny.gbapal.lz");
-    const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/icon.4bpp");
+    const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/normal.gbapal.lz");
+    const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/shiny.gbapal.lz");
+    const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/gen_1/kakuna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp");
+    const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/gen_1/kakuna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/shiny.gbapal.lz");
-    const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/icon.4bpp");
+    const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/normal.gbapal.lz");
+    const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/shiny.gbapal.lz");
+    const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp");
+    const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/front.4bpp.lz");
-    const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/front.4bpp.lz");
+    const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_WEEDLE
 
 #if P_FAMILY_PIDGEY
-    const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/normal.gbapal.lz");
-    const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/shiny.gbapal.lz");
-    const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/icon.4bpp");
+    const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/normal.gbapal.lz");
+    const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/shiny.gbapal.lz");
+    const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/gen_1/pidgey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp");
+    const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/gen_1/pidgey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/shiny.gbapal.lz");
-    const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/icon.4bpp");
+    const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/normal.gbapal.lz");
+    const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/shiny.gbapal.lz");
+    const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeotto/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp");
+    const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeotto/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/shiny.gbapal.lz");
-    const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/icon.4bpp");
+    const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/normal.gbapal.lz");
+    const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/shiny.gbapal.lz");
+    const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp");
+    const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/front.4bpp.lz");
-    const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/front.4bpp.lz");
+    const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_PIDGEY
 
 #if P_FAMILY_RATTATA
-    const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/normal.gbapal.lz");
-    const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/shiny.gbapal.lz");
-    const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/icon.4bpp");
+    const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/normal.gbapal.lz");
+    const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/shiny.gbapal.lz");
+    const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp");
+    const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz");
-    const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/normal.gbapal.lz");
-    const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz");
-    const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/shiny.gbapal.lz");
-    const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/icon.4bpp");
+    const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/anim_front.4bpp.lz");
+    const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/normal.gbapal.lz");
+    const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/back.4bpp.lz");
+    const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/shiny.gbapal.lz");
+    const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp");
+    const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/backf.4bpp.lz");
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/front.4bpp.lz");
-    const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/rattata/alolan/icon.4bpp");
+    const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/front.4bpp.lz");
+    const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/front.4bpp.lz");
-    const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/raticate/alolan/icon.4bpp");
+    const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/front.4bpp.lz");
+    const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_RATTATA
 
 #if P_FAMILY_SPEAROW
-    const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/normal.gbapal.lz");
-    const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/shiny.gbapal.lz");
-    const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/icon.4bpp");
+    const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/normal.gbapal.lz");
+    const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/shiny.gbapal.lz");
+    const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/gen_1/spearow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp");
+    const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/gen_1/spearow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/shiny.gbapal.lz");
-    const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp");
+    const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/normal.gbapal.lz");
+    const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/shiny.gbapal.lz");
+    const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/gen_1/fearow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp");
+    const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/gen_1/fearow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPEAROW
 
 #if P_FAMILY_EKANS
-    const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/normal.gbapal.lz");
-    const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/shiny.gbapal.lz");
-    const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp");
+    const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/normal.gbapal.lz");
+    const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/shiny.gbapal.lz");
+    const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/gen_1/ekans/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp");
+    const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/gen_1/ekans/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/shiny.gbapal.lz");
-    const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp");
+    const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/anim_front.4bpp.lz");
+    const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/normal.gbapal.lz");
+    const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/shiny.gbapal.lz");
+    const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/gen_1/arbok/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp");
+    const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/gen_1/arbok/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_EKANS
 
 #if P_FAMILY_PIKACHU
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/normal.gbapal.lz");
-    const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/shiny.gbapal.lz");
-    const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/icon.4bpp");
+    const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/normal.gbapal.lz");
+    const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/shiny.gbapal.lz");
+    const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp");
+    const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.4bpp.lz");
+    const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/normal.gbapal.lz");
+    const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/back.4bpp.lz");
+    const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/shiny.gbapal.lz");
+    const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/spiky_eared/icon.4bpp");
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/normal.gbapal.lz");
-    const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/shiny.gbapal.lz");
-    const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp");
+    const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/normal.gbapal.lz");
+    const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/shiny.gbapal.lz");
+    const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp");
+    const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/backf.4bpp.lz");
 #if P_CUSTOM_GENDER_DIFF_ICONS
-    const u8 gMonIcon_PikachuF[] = INCBIN_U8("graphics/pokemon/pikachu/iconf.4bpp");
+    const u8 gMonIcon_PikachuF[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/iconf.4bpp");
 #endif
 
 #if P_COSPLAY_PIKACHU_FORMS
-    const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz");
-    const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp");
+    const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/front.4bpp.lz");
+    const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/cosplay/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz");
-    const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp");
+    const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/front.4bpp.lz");
+    const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/rock_star/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/front.4bpp.lz");
-    const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp");
+    const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/front.4bpp.lz");
+    const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/belle/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/front.4bpp.lz");
-    const u32 gMonPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuPopStar[] = INCBIN_U8("graphics/pokemon/pikachu/pop_star/icon.4bpp");
+    const u32 gMonFrontPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/front.4bpp.lz");
+    const u32 gMonPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuPopStar[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/pop_star/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/front.4bpp.lz");
-    const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/pikachu/ph_d/icon.4bpp");
+    const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/front.4bpp.lz");
+    const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/ph_d/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/front.4bpp.lz");
-    const u32 gMonPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/front.4bpp.lz");
+    const u32 gMonPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuLibre[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/libre/icon.4bpp");
 #endif //P_COSPLAY_PIKACHU_FORMS
 
 #if P_CAP_PIKACHU_FORMS
-    const u32 gMonFrontPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuOriginalCap[] = INCBIN_U8("graphics/pokemon/pikachu/original_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuOriginalCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/original_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuHoennCap[] = INCBIN_U8("graphics/pokemon/pikachu/hoenn_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuHoennCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuSinnohCap[] = INCBIN_U8("graphics/pokemon/pikachu/sinnoh_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuSinnohCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuUnovaCap[] = INCBIN_U8("graphics/pokemon/pikachu/unova_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuUnovaCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/unova_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/kalos_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/alola_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/partner_cap/icon.4bpp");
 
-    const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz");
-    const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz");
-    const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz");
-    const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuWorldCap[] = INCBIN_U8("graphics/pokemon/pikachu/world_cap/icon.4bpp");
+    const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/front.4bpp.lz");
+    const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/normal.gbapal.lz");
+    const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/back.4bpp.lz");
+    const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuWorldCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/world_cap/icon.4bpp");
 #endif //P_CAP_PIKACHU_FORMS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/pikachu/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 
-    const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/normal.gbapal.lz");
-    const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/shiny.gbapal.lz");
-    const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp");
+    const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/normal.gbapal.lz");
+    const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/shiny.gbapal.lz");
+    const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp");
+    const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/anim_frontf.4bpp.lz");
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/front.4bpp.lz");
-    const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/raichu/alolan/icon.4bpp");
+    const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/front.4bpp.lz");
+    const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_PIKACHU
 
 #if P_FAMILY_SANDSHREW
-    const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/normal.gbapal.lz");
-    const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/shiny.gbapal.lz");
-    const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp");
+    const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/normal.gbapal.lz");
+    const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/shiny.gbapal.lz");
+    const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp");
+    const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/shiny.gbapal.lz");
-    const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp");
+    const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/normal.gbapal.lz");
+    const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/shiny.gbapal.lz");
+    const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp");
+    const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz");
-    const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/sandshrew/alolan/icon.4bpp");
+    const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/front.4bpp.lz");
+    const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/front.4bpp.lz");
-    const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/sandslash/alolan/icon.4bpp");
+    const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/front.4bpp.lz");
+    const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_SANDSHREW
 
 #if P_FAMILY_NIDORAN
-    const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz");
-    const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/normal.gbapal.lz");
-    const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/back.4bpp.lz");
-    const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/shiny.gbapal.lz");
-    const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/icon.4bpp");
+    const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/anim_front.4bpp.lz");
+    const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/normal.gbapal.lz");
+    const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/back.4bpp.lz");
+    const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/shiny.gbapal.lz");
+    const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_f/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp");
+    const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_f/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/shiny.gbapal.lz");
-    const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/icon.4bpp");
+    const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/normal.gbapal.lz");
+    const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/shiny.gbapal.lz");
+    const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/gen_1/nidorina/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp");
+    const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/gen_1/nidorina/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/shiny.gbapal.lz");
-    const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/icon.4bpp");
+    const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/normal.gbapal.lz");
+    const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/shiny.gbapal.lz");
+    const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/gen_1/nidoqueen/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp");
+    const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/gen_1/nidoqueen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/back.4bpp.lz");
-    const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/shiny.gbapal.lz");
-    const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/icon.4bpp");
+    const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/anim_front.4bpp.lz");
+    const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/normal.gbapal.lz");
+    const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/back.4bpp.lz");
+    const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/shiny.gbapal.lz");
+    const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_m/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp");
+    const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_m/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/shiny.gbapal.lz");
-    const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/icon.4bpp");
+    const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/normal.gbapal.lz");
+    const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/shiny.gbapal.lz");
+    const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/gen_1/nidorino/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp");
+    const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/gen_1/nidorino/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/shiny.gbapal.lz");
-    const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/icon.4bpp");
+    const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/normal.gbapal.lz");
+    const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/shiny.gbapal.lz");
+    const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/gen_1/nidoking/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp");
+    const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/gen_1/nidoking/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NIDORAN
 
 #if P_FAMILY_CLEFAIRY
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/normal.gbapal.lz");
-    const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/shiny.gbapal.lz");
-    const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/icon.4bpp");
+    const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/normal.gbapal.lz");
+    const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/shiny.gbapal.lz");
+    const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/gen_2/cleffa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp");
+    const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/gen_2/cleffa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/normal.gbapal.lz");
-    const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/shiny.gbapal.lz");
-    const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/icon.4bpp");
+    const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/normal.gbapal.lz");
+    const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/shiny.gbapal.lz");
+    const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/gen_1/clefairy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp");
+    const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/gen_1/clefairy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/shiny.gbapal.lz");
-    const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/icon.4bpp");
+    const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/anim_front.4bpp.lz");
+    const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/normal.gbapal.lz");
+    const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/shiny.gbapal.lz");
+    const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/gen_1/clefable/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp");
+    const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/gen_1/clefable/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CLEFAIRY
 
 #if P_FAMILY_VULPIX
-    const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/anim_front.4bpp.lz");
-    const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/normal.gbapal.lz");
-    const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/shiny.gbapal.lz");
-    const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/icon.4bpp");
+    const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/normal.gbapal.lz");
+    const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/shiny.gbapal.lz");
+    const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp");
+    const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/shiny.gbapal.lz");
-    const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/icon.4bpp");
+    const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/normal.gbapal.lz");
+    const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/shiny.gbapal.lz");
+    const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp");
+    const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz");
-    const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/vulpix/alolan/icon.4bpp");
+    const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/front.4bpp.lz");
+    const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/front.4bpp.lz");
-    const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/ninetales/alolan/icon.4bpp");
+    const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/front.4bpp.lz");
+    const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_VULPIX
 
 #if P_FAMILY_JIGGLYPUFF
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/anim_front.4bpp.lz");
-    const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/normal.gbapal.lz");
-    const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/shiny.gbapal.lz");
-    const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/icon.4bpp");
+    const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/normal.gbapal.lz");
+    const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/shiny.gbapal.lz");
+    const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/gen_2/igglybuff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp");
+    const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/gen_2/igglybuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz");
-    const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/normal.gbapal.lz");
-    const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/shiny.gbapal.lz");
-    const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/icon.4bpp");
+    const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/normal.gbapal.lz");
+    const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/shiny.gbapal.lz");
+    const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/gen_1/jigglypuff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp");
+    const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/gen_1/jigglypuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/shiny.gbapal.lz");
-    const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/icon.4bpp");
+    const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/normal.gbapal.lz");
+    const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/shiny.gbapal.lz");
+    const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/gen_1/wigglytuff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp");
+    const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/gen_1/wigglytuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_JIGGLYPUFF
 
 #if P_FAMILY_ZUBAT
-    const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/normal.gbapal.lz");
-    const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/shiny.gbapal.lz");
-    const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/icon.4bpp");
+    const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/normal.gbapal.lz");
+    const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/shiny.gbapal.lz");
+    const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/gen_1/zubat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp");
+    const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/gen_1/zubat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/normal.gbapal.lz");
-    const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/shiny.gbapal.lz");
-    const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/icon.4bpp");
+    const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/normal.gbapal.lz");
+    const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/shiny.gbapal.lz");
+    const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/gen_1/golbat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp");
+    const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/gen_1/golbat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/backf.4bpp.lz");
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/normal.gbapal.lz");
-    const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/shiny.gbapal.lz");
-    const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/icon.4bpp");
+    const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/normal.gbapal.lz");
+    const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/shiny.gbapal.lz");
+    const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/gen_2/crobat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp");
+    const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/gen_2/crobat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_ZUBAT
 
 #if P_FAMILY_ODDISH
-    const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/normal.gbapal.lz");
-    const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/shiny.gbapal.lz");
-    const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/icon.4bpp");
+    const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/normal.gbapal.lz");
+    const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/shiny.gbapal.lz");
+    const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/gen_1/oddish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp");
+    const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/gen_1/oddish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/shiny.gbapal.lz");
-    const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/icon.4bpp");
+    const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/normal.gbapal.lz");
+    const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/shiny.gbapal.lz");
+    const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gen_1/gloom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp");
+    const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gen_1/gloom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz");
-    const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/normal.gbapal.lz");
-    const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/shiny.gbapal.lz");
-    const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/icon.4bpp");
+    const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/normal.gbapal.lz");
+    const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/shiny.gbapal.lz");
+    const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/gen_1/vileplume/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp");
+    const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/gen_1/vileplume/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/backf.4bpp.lz");
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/normal.gbapal.lz");
-    const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/shiny.gbapal.lz");
-    const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/icon.4bpp");
+    const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/normal.gbapal.lz");
+    const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/shiny.gbapal.lz");
+    const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/gen_2/bellossom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp");
+    const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/gen_2/bellossom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_ODDISH
 
 #if P_FAMILY_PARAS
-    const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz");
-    const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/normal.gbapal.lz");
-    const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz");
-    const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/shiny.gbapal.lz");
-    const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/paras/icon.4bpp");
+    const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/anim_front.4bpp.lz");
+    const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/normal.gbapal.lz");
+    const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/back.4bpp.lz");
+    const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/shiny.gbapal.lz");
+    const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/gen_1/paras/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp");
+    const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/gen_1/paras/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz");
-    const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/shiny.gbapal.lz");
-    const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/icon.4bpp");
+    const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/anim_front.4bpp.lz");
+    const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/normal.gbapal.lz");
+    const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/back.4bpp.lz");
+    const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/shiny.gbapal.lz");
+    const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/gen_1/parasect/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp");
+    const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/gen_1/parasect/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PARAS
 
 #if P_FAMILY_VENONAT
-    const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/normal.gbapal.lz");
-    const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/shiny.gbapal.lz");
-    const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/icon.4bpp");
+    const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/normal.gbapal.lz");
+    const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/shiny.gbapal.lz");
+    const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/gen_1/venonat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp");
+    const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/gen_1/venonat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/shiny.gbapal.lz");
-    const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/icon.4bpp");
+    const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/normal.gbapal.lz");
+    const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/shiny.gbapal.lz");
+    const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/gen_1/venomoth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp");
+    const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/gen_1/venomoth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VENONAT
 
 #if P_FAMILY_DIGLETT
-    const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/anim_front.4bpp.lz");
-    const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/normal.gbapal.lz");
-    const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/back.4bpp.lz");
-    const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/shiny.gbapal.lz");
-    const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/icon.4bpp");
+    const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/anim_front.4bpp.lz");
+    const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/normal.gbapal.lz");
+    const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/back.4bpp.lz");
+    const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/shiny.gbapal.lz");
+    const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp");
+    const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/shiny.gbapal.lz");
-    const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/icon.4bpp");
+    const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/normal.gbapal.lz");
+    const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/shiny.gbapal.lz");
+    const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp");
+    const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz");
-    const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/diglett/alolan/icon.4bpp");
+    const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/front.4bpp.lz");
+    const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/front.4bpp.lz");
-    const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/dugtrio/alolan/icon.4bpp");
+    const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/front.4bpp.lz");
+    const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_DIGLETT
 
 #if P_FAMILY_MEOWTH
-    const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/anim_front.4bpp.lz");
-    const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/normal.gbapal.lz");
-    const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/shiny.gbapal.lz");
-    const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/icon.4bpp");
+    const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/normal.gbapal.lz");
+    const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/shiny.gbapal.lz");
+    const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp");
+    const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/back.4bpp.lz");
-    const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/shiny.gbapal.lz");
-    const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/persian/icon.4bpp");
+    const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/anim_front.4bpp.lz");
+    const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/normal.gbapal.lz");
+    const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/back.4bpp.lz");
+    const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/shiny.gbapal.lz");
+    const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/gen_1/persian/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp");
+    const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/gen_1/persian/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz");
-    const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/meowth/alolan/icon.4bpp");
+    const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/front.4bpp.lz");
+    const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/front.4bpp.lz");
-    const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/persian/alolan/icon.4bpp");
+    const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/front.4bpp.lz");
+    const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/persian/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/front.4bpp.lz");
-    const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp");
+    const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/front.4bpp.lz");
+    const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz");
-    const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz");
-    const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz");
-    const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz");
-    const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/icon.4bpp");
+    const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/front.4bpp.lz");
+    const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/normal.gbapal.lz");
+    const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/back.4bpp.lz");
+    const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/shiny.gbapal.lz");
+    const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/gen_8/perrserker/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/footprint.1bpp");
+    const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/gen_8/perrserker/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/meowth/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_MEOWTH
 
 #if P_FAMILY_PSYDUCK
-    const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/anim_front.4bpp.lz");
-    const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/normal.gbapal.lz");
-    const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/back.4bpp.lz");
-    const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/shiny.gbapal.lz");
-    const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/icon.4bpp");
+    const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/anim_front.4bpp.lz");
+    const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/normal.gbapal.lz");
+    const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/back.4bpp.lz");
+    const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/shiny.gbapal.lz");
+    const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/gen_1/psyduck/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp");
+    const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/gen_1/psyduck/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/shiny.gbapal.lz");
-    const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/icon.4bpp");
+    const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/normal.gbapal.lz");
+    const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/shiny.gbapal.lz");
+    const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/gen_1/golduck/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp");
+    const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/gen_1/golduck/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PSYDUCK
 
 #if P_FAMILY_MANKEY
-    const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/normal.gbapal.lz");
-    const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/shiny.gbapal.lz");
-    const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/icon.4bpp");
+    const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/normal.gbapal.lz");
+    const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/shiny.gbapal.lz");
+    const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/gen_1/mankey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp");
+    const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/gen_1/mankey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/back.4bpp.lz");
-    const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/shiny.gbapal.lz");
-    const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/icon.4bpp");
+    const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/anim_front.4bpp.lz");
+    const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/normal.gbapal.lz");
+    const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/back.4bpp.lz");
+    const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/shiny.gbapal.lz");
+    const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/gen_1/primeape/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp");
+    const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/gen_1/primeape/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_9_CROSS_EVOS
-    const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz");
-    const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/normal.gbapal.lz");
-    const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/back.4bpp.lz");
-    const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/shiny.gbapal.lz");
-    const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/icon.4bpp");
+    const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/front.4bpp.lz");
+    const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/normal.gbapal.lz");
+    const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/back.4bpp.lz");
+    const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/shiny.gbapal.lz");
+    const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/gen_9/annihilape/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp");
+    // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/gen_9/annihilape/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_MANKEY
 
 #if P_FAMILY_GROWLITHE
-    const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/anim_front.4bpp.lz");
-    const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/normal.gbapal.lz");
-    const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/back.4bpp.lz");
-    const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/shiny.gbapal.lz");
-    const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/icon.4bpp");
+    const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/anim_front.4bpp.lz");
+    const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/normal.gbapal.lz");
+    const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/back.4bpp.lz");
+    const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/shiny.gbapal.lz");
+    const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp");
+    const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/shiny.gbapal.lz");
-    const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/icon.4bpp");
+    const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/normal.gbapal.lz");
+    const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/shiny.gbapal.lz");
+    const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp");
+    const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/hisuian/icon.4bpp");
 
-    const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_GROWLITHE
 
 #if P_FAMILY_POLIWAG
-    const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/anim_front.4bpp.lz");
-    const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/normal.gbapal.lz");
-    const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/shiny.gbapal.lz");
-    const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/icon.4bpp");
+    const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/anim_front.4bpp.lz");
+    const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/normal.gbapal.lz");
+    const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/shiny.gbapal.lz");
+    const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/gen_1/poliwag/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp");
+    const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/gen_1/poliwag/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/shiny.gbapal.lz");
-    const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/icon.4bpp");
+    const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/anim_front.4bpp.lz");
+    const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/normal.gbapal.lz");
+    const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/shiny.gbapal.lz");
+    const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/gen_1/poliwhirl/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp");
+    const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/gen_1/poliwhirl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/shiny.gbapal.lz");
-    const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/icon.4bpp");
+    const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/anim_front.4bpp.lz");
+    const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/normal.gbapal.lz");
+    const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/shiny.gbapal.lz");
+    const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/gen_1/poliwrath/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp");
+    const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/gen_1/poliwrath/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz");
-    const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/normal.gbapal.lz");
-    const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz");
-    const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/shiny.gbapal.lz");
-    const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/icon.4bpp");
+    const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/anim_front.4bpp.lz");
+    const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/normal.gbapal.lz");
+    const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/back.4bpp.lz");
+    const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/shiny.gbapal.lz");
+    const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/gen_2/politoed/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp");
+    const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/gen_2/politoed/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/backf.4bpp.lz");
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_POLIWAG
 
 #if P_FAMILY_ABRA
-    const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz");
-    const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/normal.gbapal.lz");
-    const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/shiny.gbapal.lz");
-    const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/abra/icon.4bpp");
+    const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/normal.gbapal.lz");
+    const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/shiny.gbapal.lz");
+    const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/gen_1/abra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp");
+    const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/gen_1/abra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/shiny.gbapal.lz");
-    const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/icon.4bpp");
+    const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/normal.gbapal.lz");
+    const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/shiny.gbapal.lz");
+    const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/gen_1/kadabra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp");
+    const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/gen_1/kadabra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz");
-    const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/normal.gbapal.lz");
-    const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz");
-    const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/shiny.gbapal.lz");
-    const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/icon.4bpp");
+    const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/anim_front.4bpp.lz");
+    const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/normal.gbapal.lz");
+    const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/back.4bpp.lz");
+    const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/shiny.gbapal.lz");
+    const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp");
+    const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/front.4bpp.lz");
-    const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/front.4bpp.lz");
+    const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_ABRA
 
 #if P_FAMILY_MACHOP
-    const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz");
-    const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/normal.gbapal.lz");
-    const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz");
-    const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/shiny.gbapal.lz");
-    const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/machop/icon.4bpp");
+    const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/anim_front.4bpp.lz");
+    const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/normal.gbapal.lz");
+    const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/back.4bpp.lz");
+    const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/shiny.gbapal.lz");
+    const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/gen_1/machop/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp");
+    const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/gen_1/machop/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz");
-    const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/shiny.gbapal.lz");
-    const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/icon.4bpp");
+    const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/anim_front.4bpp.lz");
+    const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/normal.gbapal.lz");
+    const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/back.4bpp.lz");
+    const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/shiny.gbapal.lz");
+    const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/gen_1/machoke/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp");
+    const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/gen_1/machoke/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/shiny.gbapal.lz");
-    const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/icon.4bpp");
+    const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/normal.gbapal.lz");
+    const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/shiny.gbapal.lz");
+    const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp");
+    const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/machamp/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_MACHOP
 
 #if P_FAMILY_BELLSPROUT
-    const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/normal.gbapal.lz");
-    const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/shiny.gbapal.lz");
-    const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/icon.4bpp");
+    const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/normal.gbapal.lz");
+    const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/shiny.gbapal.lz");
+    const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/gen_1/bellsprout/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp");
+    const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/gen_1/bellsprout/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/back.4bpp.lz");
-    const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/shiny.gbapal.lz");
-    const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/icon.4bpp");
+    const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/anim_front.4bpp.lz");
+    const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/normal.gbapal.lz");
+    const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/back.4bpp.lz");
+    const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/shiny.gbapal.lz");
+    const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/gen_1/weepinbell/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp");
+    const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/gen_1/weepinbell/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/shiny.gbapal.lz");
-    const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/icon.4bpp");
+    const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/normal.gbapal.lz");
+    const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/shiny.gbapal.lz");
+    const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/gen_1/victreebel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp");
+    const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/gen_1/victreebel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BELLSPROUT
 
 #if P_FAMILY_TENTACOOL
-    const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/normal.gbapal.lz");
-    const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/shiny.gbapal.lz");
-    const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/icon.4bpp");
+    const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/normal.gbapal.lz");
+    const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/shiny.gbapal.lz");
+    const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/gen_1/tentacool/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp");
+    const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/gen_1/tentacool/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/shiny.gbapal.lz");
-    const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/icon.4bpp");
+    const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/normal.gbapal.lz");
+    const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/shiny.gbapal.lz");
+    const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/gen_1/tentacruel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp");
+    const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/gen_1/tentacruel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TENTACOOL
 
 #if P_FAMILY_GEODUDE
-    const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/anim_front.4bpp.lz");
-    const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/normal.gbapal.lz");
-    const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/back.4bpp.lz");
-    const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/shiny.gbapal.lz");
-    const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/icon.4bpp");
+    const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/anim_front.4bpp.lz");
+    const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/normal.gbapal.lz");
+    const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/back.4bpp.lz");
+    const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/shiny.gbapal.lz");
+    const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp");
+    const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/shiny.gbapal.lz");
-    const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/icon.4bpp");
+    const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/anim_front.4bpp.lz");
+    const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/normal.gbapal.lz");
+    const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/shiny.gbapal.lz");
+    const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp");
+    const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/shiny.gbapal.lz");
-    const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/golem/icon.4bpp");
+    const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/normal.gbapal.lz");
+    const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/shiny.gbapal.lz");
+    const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/gen_1/golem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp");
+    const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/gen_1/golem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz");
-    const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/geodude/alolan/icon.4bpp");
+    const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/front.4bpp.lz");
+    const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/front.4bpp.lz");
-    const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/graveler/alolan/icon.4bpp");
+    const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/front.4bpp.lz");
+    const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/front.4bpp.lz");
-    const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/golem/alolan/icon.4bpp");
+    const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/front.4bpp.lz");
+    const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/golem/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_GEODUDE
 
 #if P_FAMILY_PONYTA
-    const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/normal.gbapal.lz");
-    const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/shiny.gbapal.lz");
-    const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/icon.4bpp");
+    const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/normal.gbapal.lz");
+    const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/shiny.gbapal.lz");
+    const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp");
+    const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/shiny.gbapal.lz");
-    const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/icon.4bpp");
+    const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/normal.gbapal.lz");
+    const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/shiny.gbapal.lz");
+    const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp");
+    const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz");
-    const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp");
+    const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/front.4bpp.lz");
+    const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/front.4bpp.lz");
-    const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp");
+    const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/front.4bpp.lz");
+    const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_PONYTA
 
 #if P_FAMILY_SLOWPOKE
-    const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_front.4bpp.lz");
-    const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/normal.gbapal.lz");
-    const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/shiny.gbapal.lz");
-    const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/icon.4bpp");
+    const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/normal.gbapal.lz");
+    const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/shiny.gbapal.lz");
+    const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp");
+    const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/shiny.gbapal.lz");
-    const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/icon.4bpp");
+    const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/normal.gbapal.lz");
+    const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/shiny.gbapal.lz");
+    const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp");
+    const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz");
-    const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/normal.gbapal.lz");
-    const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/shiny.gbapal.lz");
-    const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp");
+    const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/normal.gbapal.lz");
+    const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/shiny.gbapal.lz");
+    const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp");
+    const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/front.4bpp.lz");
-    const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/front.4bpp.lz");
+    const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/front.4bpp.lz");
-    const u32 gMonPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp");
+    const u32 gMonFrontPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/front.4bpp.lz");
+    const u32 gMonPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/front.4bpp.lz");
-    const u32 gMonPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp");
+    const u32 gMonFrontPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/front.4bpp.lz");
+    const u32 gMonPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/galarian/icon.4bpp");
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/front.4bpp.lz");
-    const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp");
+    const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/front.4bpp.lz");
+    const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/galarian/icon.4bpp");
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_SLOWPOKE
 
 #if P_FAMILY_MAGNEMITE
-    const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/normal.gbapal.lz");
-    const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/shiny.gbapal.lz");
-    const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/icon.4bpp");
+    const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/normal.gbapal.lz");
+    const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/shiny.gbapal.lz");
+    const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/gen_1/magnemite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp");
+    const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/gen_1/magnemite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/shiny.gbapal.lz");
-    const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp");
+    const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/normal.gbapal.lz");
+    const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/shiny.gbapal.lz");
+    const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/gen_1/magneton/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp");
+    const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/gen_1/magneton/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/normal.gbapal.lz");
-    const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/shiny.gbapal.lz");
-    const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/icon.4bpp");
+    const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/normal.gbapal.lz");
+    const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/shiny.gbapal.lz");
+    const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/gen_4/magnezone/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/footprint.1bpp");
+    const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/gen_4/magnezone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_MAGNEMITE
 
 #if P_FAMILY_FARFETCHD
-    const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/anim_front.4bpp.lz");
-    const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/normal.gbapal.lz");
-    const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz");
-    const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/shiny.gbapal.lz");
-    const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/icon.4bpp");
+    const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/anim_front.4bpp.lz");
+    const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/normal.gbapal.lz");
+    const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/back.4bpp.lz");
+    const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/shiny.gbapal.lz");
+    const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp");
+    const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/front.4bpp.lz");
-    const u32 gMonPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp");
+    const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/front.4bpp.lz");
+    const u32 gMonPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz");
-    const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz");
-    const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz");
-    const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp");
+    const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/front.4bpp.lz");
+    const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/normal.gbapal.lz");
+    const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/shiny.gbapal.lz");
+    const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/gen_8/sirfetchd/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/footprint.1bpp");
+    const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/gen_8/sirfetchd/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_FARFETCHD
 
 #if P_FAMILY_DODUO
-    const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz");
-    const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/shiny.gbapal.lz");
-    const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/icon.4bpp");
+    const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/normal.gbapal.lz");
+    const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/shiny.gbapal.lz");
+    const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/gen_1/doduo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp");
+    const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/gen_1/doduo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/normal.gbapal.lz");
-    const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/shiny.gbapal.lz");
-    const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/icon.4bpp");
+    const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/normal.gbapal.lz");
+    const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/shiny.gbapal.lz");
+    const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/gen_1/dodrio/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp");
+    const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/gen_1/dodrio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/backf.4bpp.lz");
 #endif //P_FAMILY_DODUO
 
 #if P_FAMILY_SEEL
-    const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/normal.gbapal.lz");
-    const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/shiny.gbapal.lz");
-    const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/seel/icon.4bpp");
+    const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/normal.gbapal.lz");
+    const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/shiny.gbapal.lz");
+    const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/gen_1/seel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp");
+    const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/gen_1/seel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/shiny.gbapal.lz");
-    const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/icon.4bpp");
+    const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/normal.gbapal.lz");
+    const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/shiny.gbapal.lz");
+    const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/gen_1/dewgong/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp");
+    const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/gen_1/dewgong/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SEEL
 
 #if P_FAMILY_GRIMER
-    const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz");
-    const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/normal.gbapal.lz");
-    const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/shiny.gbapal.lz");
-    const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/icon.4bpp");
+    const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/anim_front.4bpp.lz");
+    const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/normal.gbapal.lz");
+    const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/shiny.gbapal.lz");
+    const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp");
+    const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/shiny.gbapal.lz");
-    const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/muk/icon.4bpp");
+    const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/normal.gbapal.lz");
+    const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/shiny.gbapal.lz");
+    const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/gen_1/muk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp");
+    const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/gen_1/muk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz");
-    const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/grimer/alolan/icon.4bpp");
+    const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/front.4bpp.lz");
+    const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/alolan/icon.4bpp");
 
-    const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/front.4bpp.lz");
-    const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/muk/alolan/icon.4bpp");
+    const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/front.4bpp.lz");
+    const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/muk/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_GRIMER
 
 #if P_FAMILY_SHELLDER
-    const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/normal.gbapal.lz");
-    const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/shiny.gbapal.lz");
-    const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/icon.4bpp");
+    const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/normal.gbapal.lz");
+    const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/shiny.gbapal.lz");
+    const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/gen_1/shellder/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp");
+    const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/gen_1/shellder/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/shiny.gbapal.lz");
-    const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/icon.4bpp");
+    const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/normal.gbapal.lz");
+    const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/shiny.gbapal.lz");
+    const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/gen_1/cloyster/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp");
+    const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/gen_1/cloyster/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHELLDER
 
 #if P_FAMILY_GASTLY
-    const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/normal.gbapal.lz");
-    const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/shiny.gbapal.lz");
-    const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/icon.4bpp");
+    const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/normal.gbapal.lz");
+    const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/shiny.gbapal.lz");
+    const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gen_1/gastly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp");
+    const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gen_1/gastly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/back.4bpp.lz");
-    const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/shiny.gbapal.lz");
-    const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/icon.4bpp");
+    const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/anim_front.4bpp.lz");
+    const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/normal.gbapal.lz");
+    const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/back.4bpp.lz");
+    const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/shiny.gbapal.lz");
+    const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/gen_1/haunter/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp");
+    const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/gen_1/haunter/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/shiny.gbapal.lz");
-    const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/icon.4bpp");
+    const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/normal.gbapal.lz");
+    const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/shiny.gbapal.lz");
+    const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp");
+    const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/front.4bpp.lz");
-    const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/front.4bpp.lz");
+    const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gengar/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_GASTLY
 
 #if P_FAMILY_ONIX
-    const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz");
-    const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/normal.gbapal.lz");
-    const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/shiny.gbapal.lz");
-    const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/onix/icon.4bpp");
+    const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/anim_front.4bpp.lz");
+    const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/normal.gbapal.lz");
+    const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/shiny.gbapal.lz");
+    const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/gen_1/onix/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp");
+    const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/gen_1/onix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz");
-    const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/normal.gbapal.lz");
-    const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/shiny.gbapal.lz");
-    const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/icon.4bpp");
+    const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/anim_front.4bpp.lz");
+    const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/normal.gbapal.lz");
+    const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/shiny.gbapal.lz");
+    const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp");
+    const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/front.4bpp.lz");
-    const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/front.4bpp.lz");
+    const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_ONIX
 
 #if P_FAMILY_DROWZEE
-    const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/normal.gbapal.lz");
-    const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/shiny.gbapal.lz");
-    const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/icon.4bpp");
+    const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/normal.gbapal.lz");
+    const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/shiny.gbapal.lz");
+    const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/gen_1/drowzee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp");
+    const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/gen_1/drowzee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/shiny.gbapal.lz");
-    const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/icon.4bpp");
+    const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/normal.gbapal.lz");
+    const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/shiny.gbapal.lz");
+    const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/gen_1/hypno/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp");
+    const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/gen_1/hypno/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/backf.4bpp.lz");
 #endif //P_FAMILY_DROWZEE
 
 #if P_FAMILY_KRABBY
-    const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz");
-    const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/normal.gbapal.lz");
-    const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz");
-    const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/shiny.gbapal.lz");
-    const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/icon.4bpp");
+    const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/anim_front.4bpp.lz");
+    const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/normal.gbapal.lz");
+    const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/back.4bpp.lz");
+    const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/shiny.gbapal.lz");
+    const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/gen_1/krabby/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp");
+    const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/gen_1/krabby/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/shiny.gbapal.lz");
-    const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/icon.4bpp");
+    const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/normal.gbapal.lz");
+    const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/shiny.gbapal.lz");
+    const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp");
+    const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/kingler/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_KRABBY
 
 #if P_FAMILY_VOLTORB
-    const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz");
-    const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/normal.gbapal.lz");
-    const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz");
-    const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/shiny.gbapal.lz");
-    const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/icon.4bpp");
+    const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/anim_front.4bpp.lz");
+    const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/normal.gbapal.lz");
+    const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/back.4bpp.lz");
+    const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/shiny.gbapal.lz");
+    const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp");
+    const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/back.4bpp.lz");
-    const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/shiny.gbapal.lz");
-    const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/icon.4bpp");
+    const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/anim_front.4bpp.lz");
+    const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/normal.gbapal.lz");
+    const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/back.4bpp.lz");
+    const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/shiny.gbapal.lz");
+    const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp");
+    const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/hisuian/icon.4bpp");
 
-    const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_VOLTORB
 
 #if P_FAMILY_EXEGGCUTE
-    const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/anim_front.4bpp.lz");
-    const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/normal.gbapal.lz");
-    const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/back.4bpp.lz");
-    const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/shiny.gbapal.lz");
-    const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/icon.4bpp");
+    const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/anim_front.4bpp.lz");
+    const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/normal.gbapal.lz");
+    const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/back.4bpp.lz");
+    const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/shiny.gbapal.lz");
+    const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/gen_1/exeggcute/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp");
+    const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/gen_1/exeggcute/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/shiny.gbapal.lz");
-    const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/icon.4bpp");
+    const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/normal.gbapal.lz");
+    const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/shiny.gbapal.lz");
+    const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp");
+    const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz");
-    const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/exeggutor/alolan/icon.4bpp");
+    const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/anim_front.4bpp.lz");
+    const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_EXEGGCUTE
 
 #if P_FAMILY_CUBONE
-    const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/normal.gbapal.lz");
-    const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/shiny.gbapal.lz");
-    const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/icon.4bpp");
+    const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/normal.gbapal.lz");
+    const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/shiny.gbapal.lz");
+    const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/gen_1/cubone/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp");
+    const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/gen_1/cubone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/back.4bpp.lz");
-    const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/shiny.gbapal.lz");
-    const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/icon.4bpp");
+    const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/anim_front.4bpp.lz");
+    const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/normal.gbapal.lz");
+    const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/back.4bpp.lz");
+    const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/shiny.gbapal.lz");
+    const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp");
+    const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_ALOLAN_FORMS
-    const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz");
-    const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/normal.gbapal.lz");
-    const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/back.4bpp.lz");
-    const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/shiny.gbapal.lz");
-    const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/marowak/alolan/icon.4bpp");
+    const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/front.4bpp.lz");
+    const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/normal.gbapal.lz");
+    const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/back.4bpp.lz");
+    const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/shiny.gbapal.lz");
+    const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/alolan/icon.4bpp");
 #endif //P_ALOLAN_FORMS
 #endif //P_FAMILY_CUBONE
 
 #if P_FAMILY_HITMONS
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/normal.gbapal.lz");
-    const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/shiny.gbapal.lz");
-    const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/icon.4bpp");
+    const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/normal.gbapal.lz");
+    const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/shiny.gbapal.lz");
+    const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/gen_2/tyrogue/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp");
+    const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/gen_2/tyrogue/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/normal.gbapal.lz");
-    const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/shiny.gbapal.lz");
-    const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/icon.4bpp");
+    const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/normal.gbapal.lz");
+    const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/shiny.gbapal.lz");
+    const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonlee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp");
+    const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonlee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/shiny.gbapal.lz");
-    const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/icon.4bpp");
+    const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/normal.gbapal.lz");
+    const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/shiny.gbapal.lz");
+    const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonchan/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp");
+    const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonchan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/normal.gbapal.lz");
-    const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/shiny.gbapal.lz");
-    const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp");
+    const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/normal.gbapal.lz");
+    const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/shiny.gbapal.lz");
+    const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/gen_2/hitmontop/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp");
+    const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/gen_2/hitmontop/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_HITMONS
 
 #if P_FAMILY_LICKITUNG
-    const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/normal.gbapal.lz");
-    const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/shiny.gbapal.lz");
-    const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/icon.4bpp");
+    const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/normal.gbapal.lz");
+    const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/shiny.gbapal.lz");
+    const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/gen_1/lickitung/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp");
+    const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/gen_1/lickitung/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/normal.gbapal.lz");
-    const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/shiny.gbapal.lz");
-    const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/icon.4bpp");
+    const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/normal.gbapal.lz");
+    const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/shiny.gbapal.lz");
+    const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/gen_4/lickilicky/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/footprint.1bpp");
+    const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/gen_4/lickilicky/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_LICKITUNG
 
 #if P_FAMILY_KOFFING
-    const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz");
-    const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/normal.gbapal.lz");
-    const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz");
-    const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/shiny.gbapal.lz");
-    const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/icon.4bpp");
+    const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/anim_front.4bpp.lz");
+    const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/normal.gbapal.lz");
+    const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/back.4bpp.lz");
+    const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/shiny.gbapal.lz");
+    const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/gen_1/koffing/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp");
+    const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/gen_1/koffing/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz");
-    const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/shiny.gbapal.lz");
-    const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/icon.4bpp");
+    const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/anim_front.4bpp.lz");
+    const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/normal.gbapal.lz");
+    const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/back.4bpp.lz");
+    const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/shiny.gbapal.lz");
+    const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp");
+    const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/front.4bpp.lz");
-    const u32 gMonPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp");
+    const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/front.4bpp.lz");
+    const u32 gMonPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_KOFFING
 
 #if P_FAMILY_RHYHORN
-    const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/normal.gbapal.lz");
-    const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/shiny.gbapal.lz");
-    const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/icon.4bpp");
+    const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/normal.gbapal.lz");
+    const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/shiny.gbapal.lz");
+    const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/gen_1/rhyhorn/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp");
+    const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/gen_1/rhyhorn/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/normal.gbapal.lz");
-    const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/shiny.gbapal.lz");
-    const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/icon.4bpp");
+    const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/normal.gbapal.lz");
+    const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/shiny.gbapal.lz");
+    const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/gen_1/rhydon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp");
+    const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/gen_1/rhydon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/normal.gbapal.lz");
-    const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/shiny.gbapal.lz");
-    const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/icon.4bpp");
+    const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/normal.gbapal.lz");
+    const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/shiny.gbapal.lz");
+    const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/gen_4/rhyperior/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/footprint.1bpp");
+    const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/gen_4/rhyperior/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/backf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_RHYHORN
 
 #if P_FAMILY_CHANSEY
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_front.4bpp.lz");
-    const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/normal.gbapal.lz");
-    const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz");
-    const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz");
-    const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp");
+    const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/anim_front.4bpp.lz");
+    const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/normal.gbapal.lz");
+    const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/back.4bpp.lz");
+    const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/shiny.gbapal.lz");
+    const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/gen_4/happiny/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp");
+    const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/gen_4/happiny/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/normal.gbapal.lz");
-    const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/shiny.gbapal.lz");
-    const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/icon.4bpp");
+    const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/normal.gbapal.lz");
+    const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/shiny.gbapal.lz");
+    const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/gen_1/chansey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp");
+    const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/gen_1/chansey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz");
-    const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/normal.gbapal.lz");
-    const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/shiny.gbapal.lz");
-    const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/icon.4bpp");
+    const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/anim_front.4bpp.lz");
+    const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/normal.gbapal.lz");
+    const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/shiny.gbapal.lz");
+    const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/gen_2/blissey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp");
+    const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/gen_2/blissey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_CHANSEY
 
 #if P_FAMILY_TANGELA
-    const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/normal.gbapal.lz");
-    const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/shiny.gbapal.lz");
-    const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/icon.4bpp");
+    const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/normal.gbapal.lz");
+    const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/shiny.gbapal.lz");
+    const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/gen_1/tangela/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp");
+    const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/gen_1/tangela/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/normal.gbapal.lz");
-    const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/shiny.gbapal.lz");
-    const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/icon.4bpp");
+    const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/normal.gbapal.lz");
+    const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/shiny.gbapal.lz");
+    const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/gen_4/tangrowth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/footprint.1bpp");
+    const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/gen_4/tangrowth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/anim_frontf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_TANGELA
 
 #if P_FAMILY_KANGASKHAN
-    const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/normal.gbapal.lz");
-    const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/shiny.gbapal.lz");
-    const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/icon.4bpp");
+    const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/normal.gbapal.lz");
+    const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/shiny.gbapal.lz");
+    const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp");
+    const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/front.4bpp.lz");
-    const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/front.4bpp.lz");
+    const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_KANGASKHAN
 
 #if P_FAMILY_HORSEA
-    const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz");
-    const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/normal.gbapal.lz");
-    const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz");
-    const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/shiny.gbapal.lz");
-    const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/icon.4bpp");
+    const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/anim_front.4bpp.lz");
+    const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/normal.gbapal.lz");
+    const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/back.4bpp.lz");
+    const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/shiny.gbapal.lz");
+    const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/gen_1/horsea/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp");
+    const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/gen_1/horsea/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/shiny.gbapal.lz");
-    const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/icon.4bpp");
+    const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/normal.gbapal.lz");
+    const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/shiny.gbapal.lz");
+    const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/gen_1/seadra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp");
+    const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/gen_1/seadra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/normal.gbapal.lz");
-    const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/shiny.gbapal.lz");
-    const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/icon.4bpp");
+    const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/normal.gbapal.lz");
+    const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/shiny.gbapal.lz");
+    const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/gen_2/kingdra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp");
+    const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/gen_2/kingdra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_HORSEA
 
 #if P_FAMILY_GOLDEEN
-    const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz");
-    const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gbapal.lz");
-    const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shiny.gbapal.lz");
-    const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp");
+    const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/anim_front.4bpp.lz");
+    const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/normal.gbapal.lz");
+    const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/shiny.gbapal.lz");
+    const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/gen_1/goldeen/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp");
+    const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/gen_1/goldeen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz");
-    const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz");
-    const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz");
-    const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp");
+    const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/normal.gbapal.lz");
+    const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/shiny.gbapal.lz");
+    const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/gen_1/seaking/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp");
+    const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/gen_1/seaking/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/backf.4bpp.lz");
 #endif //P_FAMILY_GOLDEEN
 
 #if P_FAMILY_STARYU
-    const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz");
-    const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz");
-    const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp");
+    const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/normal.gbapal.lz");
+    const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/shiny.gbapal.lz");
+    const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/gen_1/staryu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp");
+    const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/gen_1/staryu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz");
-    const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp");
+    const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/normal.gbapal.lz");
+    const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/shiny.gbapal.lz");
+    const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/gen_1/starmie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp");
+    const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/gen_1/starmie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_STARYU
 
 #if P_FAMILY_MR_MIME
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/anim_front.4bpp.lz");
-    const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/normal.gbapal.lz");
-    const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz");
-    const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz");
-    const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp");
+    const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/anim_front.4bpp.lz");
+    const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/normal.gbapal.lz");
+    const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/back.4bpp.lz");
+    const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/shiny.gbapal.lz");
+    const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/gen_4/mime_jr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp");
+    const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/gen_4/mime_jr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz");
-    const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz");
-    const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz");
-    const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz");
-    const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp");
+    const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/anim_front.4bpp.lz");
+    const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/normal.gbapal.lz");
+    const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/back.4bpp.lz");
+    const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/shiny.gbapal.lz");
+    const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp");
+    const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/front.4bpp.lz");
-    const u32 gMonPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp");
+    const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/front.4bpp.lz");
+    const u32 gMonPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/galarian/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz");
-    const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz");
-    const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp");
+    const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/front.4bpp.lz");
+    const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/normal.gbapal.lz");
+    const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/back.4bpp.lz");
+    const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/shiny.gbapal.lz");
+    const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/gen_8/mr_rime/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/footprint.1bpp");
+    const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/gen_8/mr_rime/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_MR_MIME
 
 #if P_FAMILY_SCYTHER
-    const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz");
-    const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz");
-    const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz");
-    const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp");
+    const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/normal.gbapal.lz");
+    const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/shiny.gbapal.lz");
+    const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/gen_1/scyther/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp");
+    const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/gen_1/scyther/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/anim_frontf.4bpp.lz");
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz");
-    const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/normal.gbapal.lz");
-    const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/shiny.gbapal.lz");
-    const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/icon.4bpp");
+    const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/normal.gbapal.lz");
+    const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/shiny.gbapal.lz");
+    const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp");
+    const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/anim_frontf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/front.4bpp.lz");
-    const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/front.4bpp.lz");
+    const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_GEN_2_CROSS_EVOS
 
 #if P_GEN_8_CROSS_EVOS
-    const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
-    const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
-    const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
-    const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp");
+    const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/front.4bpp.lz");
+    const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/normal.gbapal.lz");
+    const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/shiny.gbapal.lz");
+    const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/gen_8/kleavor/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp");
+    //const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/gen_8/kleavor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_8_CROSS_EVOS
 #endif //P_FAMILY_SCYTHER
 
 #if P_FAMILY_JYNX
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/anim_front.4bpp.lz");
-    const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/normal.gbapal.lz");
-    const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/back.4bpp.lz");
-    const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/shiny.gbapal.lz");
-    const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/icon.4bpp");
+    const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/anim_front.4bpp.lz");
+    const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/normal.gbapal.lz");
+    const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/back.4bpp.lz");
+    const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/shiny.gbapal.lz");
+    const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/gen_2/smoochum/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp");
+    const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/gen_2/smoochum/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz");
-    const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz");
-    const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz");
-    const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp");
+    const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/normal.gbapal.lz");
+    const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/shiny.gbapal.lz");
+    const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/gen_1/jynx/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp");
+    const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/gen_1/jynx/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_JYNX
 
 #if P_FAMILY_ELECTABUZZ
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/anim_front.4bpp.lz");
-    const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/normal.gbapal.lz");
-    const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/back.4bpp.lz");
-    const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/shiny.gbapal.lz");
-    const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/icon.4bpp");
+    const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/anim_front.4bpp.lz");
+    const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/normal.gbapal.lz");
+    const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/back.4bpp.lz");
+    const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/shiny.gbapal.lz");
+    const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/gen_2/elekid/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp");
+    const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/gen_2/elekid/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz");
-    const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz");
-    const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz");
-    const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz");
-    const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp");
+    const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/anim_front.4bpp.lz");
+    const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/normal.gbapal.lz");
+    const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/back.4bpp.lz");
+    const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/shiny.gbapal.lz");
+    const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/gen_1/electabuzz/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp");
+    const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/gen_1/electabuzz/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/anim_front.4bpp.lz");
-    const u32 gMonPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/normal.gbapal.lz");
-    const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/back.4bpp.lz");
-    const u32 gMonShinyPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/shiny.gbapal.lz");
-    const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/icon.4bpp");
+    const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/anim_front.4bpp.lz");
+    const u32 gMonPalette_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/normal.gbapal.lz");
+    const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/back.4bpp.lz");
+    const u32 gMonShinyPalette_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/shiny.gbapal.lz");
+    const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/gen_4/electivire/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/footprint.1bpp");
+    const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/gen_4/electivire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_ELECTABUZZ
 
 #if P_FAMILY_MAGMAR
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/normal.gbapal.lz");
-    const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/shiny.gbapal.lz");
-    const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/magby/icon.4bpp");
+    const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/normal.gbapal.lz");
+    const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/shiny.gbapal.lz");
+    const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/gen_2/magby/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp");
+    const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/gen_2/magby/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
-    const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/normal.gbapal.lz");
-    const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/shiny.gbapal.lz");
-    const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/icon.4bpp");
+    const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/normal.gbapal.lz");
+    const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/shiny.gbapal.lz");
+    const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/gen_1/magmar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp");
+    const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/gen_1/magmar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/normal.gbapal.lz");
-    const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/shiny.gbapal.lz");
-    const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/icon.4bpp");
+    const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/normal.gbapal.lz");
+    const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/shiny.gbapal.lz");
+    const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/gen_4/magmortar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/footprint.1bpp");
+    const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/gen_4/magmortar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_MAGMAR
 
 #if P_FAMILY_PINSIR
-    const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/normal.gbapal.lz");
-    const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/shiny.gbapal.lz");
-    const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/icon.4bpp");
+    const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/normal.gbapal.lz");
+    const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/shiny.gbapal.lz");
+    const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp");
+    const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/front.4bpp.lz");
-    const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/front.4bpp.lz");
+    const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_PINSIR
 
 #if P_FAMILY_TAUROS
-    const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/normal.gbapal.lz");
-    const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/shiny.gbapal.lz");
-    const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/icon.4bpp");
+    const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/normal.gbapal.lz");
+    const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/shiny.gbapal.lz");
+    const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp");
+    const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_PALDEAN_FORMS
-    const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/front.4bpp.lz");
-    const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/normal.gbapal.lz");
-    const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/back.4bpp.lz");
-    const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/shiny.gbapal.lz");
-    const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_combat_breed/icon.4bpp");
+    const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.4bpp.lz");
+    const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.gbapal.lz");
+    const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.4bpp.lz");
+    const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.gbapal.lz");
+    const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.4bpp");
 
-    const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/front.4bpp.lz");
-    const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/normal.gbapal.lz");
-    const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/back.4bpp.lz");
-    const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/shiny.gbapal.lz");
-    const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_blaze_breed/icon.4bpp");
+    const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.4bpp.lz");
+    const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.gbapal.lz");
+    const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.4bpp.lz");
+    const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.gbapal.lz");
+    const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.4bpp");
 
-    const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/front.4bpp.lz");
-    const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/normal.gbapal.lz");
-    const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/back.4bpp.lz");
-    const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/shiny.gbapal.lz");
-    const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_aqua_breed/icon.4bpp");
+    const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.4bpp.lz");
+    const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.gbapal.lz");
+    const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.4bpp.lz");
+    const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.gbapal.lz");
+    const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.4bpp");
 #endif //P_PALDEAN_FORMS
 #endif //P_FAMILY_TAUROS
 
 #if P_FAMILY_MAGIKARP
-    const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz");
-    const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/normal.gbapal.lz");
-    const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/shiny.gbapal.lz");
-    const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/icon.4bpp");
+    const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/normal.gbapal.lz");
+    const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/shiny.gbapal.lz");
+    const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/gen_1/magikarp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp");
+    const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/gen_1/magikarp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/normal.gbapal.lz");
-    const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/shiny.gbapal.lz");
-    const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/icon.4bpp");
+    const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/normal.gbapal.lz");
+    const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/shiny.gbapal.lz");
+    const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp");
+    const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/front.4bpp.lz");
-    const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/front.4bpp.lz");
+    const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MAGIKARP
 
 #if P_FAMILY_LAPRAS
-    const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/normal.gbapal.lz");
-    const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/shiny.gbapal.lz");
-    const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/icon.4bpp");
+    const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/normal.gbapal.lz");
+    const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/shiny.gbapal.lz");
+    const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp");
+    const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/lapras/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_LAPRAS
 
 #if P_FAMILY_DITTO
-    const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/normal.gbapal.lz");
-    const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/shiny.gbapal.lz");
-    const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/icon.4bpp");
+    const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/normal.gbapal.lz");
+    const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/shiny.gbapal.lz");
+    const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/gen_1/ditto/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp");
+    const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/gen_1/ditto/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DITTO
 
 #if P_FAMILY_EEVEE
-    const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/normal.gbapal.lz");
-    const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/shiny.gbapal.lz");
-    const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/icon.4bpp");
+    const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/normal.gbapal.lz");
+    const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/shiny.gbapal.lz");
+    const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp");
+    const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/backf.4bpp.lz");
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/eevee/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 
-    const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/normal.gbapal.lz");
-    const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/shiny.gbapal.lz");
-    const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/icon.4bpp");
+    const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/normal.gbapal.lz");
+    const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/shiny.gbapal.lz");
+    const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/gen_1/vaporeon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp");
+    const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/gen_1/vaporeon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/shiny.gbapal.lz");
-    const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/icon.4bpp");
+    const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/normal.gbapal.lz");
+    const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/shiny.gbapal.lz");
+    const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/gen_1/jolteon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp");
+    const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/gen_1/jolteon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/shiny.gbapal.lz");
-    const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/icon.4bpp");
+    const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/normal.gbapal.lz");
+    const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/shiny.gbapal.lz");
+    const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/gen_1/flareon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp");
+    const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/gen_1/flareon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/normal.gbapal.lz");
-    const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/shiny.gbapal.lz");
-    const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/icon.4bpp");
+    const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/normal.gbapal.lz");
+    const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/shiny.gbapal.lz");
+    const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/gen_2/espeon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp");
+    const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/gen_2/espeon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/shiny.gbapal.lz");
-    const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/icon.4bpp");
+    const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/normal.gbapal.lz");
+    const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/shiny.gbapal.lz");
+    const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/gen_2/umbreon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp");
+    const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/gen_2/umbreon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_2_CROSS_EVOS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/normal.gbapal.lz");
-    const u32 gMonBackPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/shiny.gbapal.lz");
-    const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/icon.4bpp");
+    const u32 gMonFrontPic_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/normal.gbapal.lz");
+    const u32 gMonBackPic_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/shiny.gbapal.lz");
+    const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/gen_4/leafeon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/footprint.1bpp");
+    const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/gen_4/leafeon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/shiny.gbapal.lz");
-    const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/icon.4bpp");
+    const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/normal.gbapal.lz");
+    const u32 gMonBackPic_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/shiny.gbapal.lz");
+    const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/gen_4/glaceon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/footprint.1bpp");
+    const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/gen_4/glaceon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
 #if P_GEN_6_CROSS_EVOS
-    const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/normal.gbapal.lz");
-    const u32 gMonBackPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/shiny.gbapal.lz");
-    const u8 gMonIcon_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/icon.4bpp");
+    const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/normal.gbapal.lz");
+    const u32 gMonBackPic_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/shiny.gbapal.lz");
+    const u8 gMonIcon_Sylveon[] = INCBIN_U8("graphics/pokemon/gen_6/sylveon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/footprint.1bpp");
+    const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/gen_6/sylveon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_6_CROSS_EVOS
 #endif //P_FAMILY_EEVEE
 
 #if P_FAMILY_PORYGON
-    const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/normal.gbapal.lz");
-    const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/shiny.gbapal.lz");
-    const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/icon.4bpp");
+    const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/normal.gbapal.lz");
+    const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/shiny.gbapal.lz");
+    const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/gen_1/porygon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp");
+    const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/gen_1/porygon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_2_CROSS_EVOS
-    const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz");
-    const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/normal.gbapal.lz");
-    const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz");
-    const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz");
-    const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp");
+    const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/anim_front.4bpp.lz");
+    const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/normal.gbapal.lz");
+    const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/back.4bpp.lz");
+    const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/shiny.gbapal.lz");
+    const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/gen_2/porygon2/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp");
+    const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/gen_2/porygon2/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/anim_front.4bpp.lz");
-    const u32 gMonPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/normal.gbapal.lz");
-    const u32 gMonBackPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/back.4bpp.lz");
-    const u32 gMonShinyPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/shiny.gbapal.lz");
-    const u8 gMonIcon_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/icon.4bpp");
+    const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/anim_front.4bpp.lz");
+    const u32 gMonPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/normal.gbapal.lz");
+    const u32 gMonBackPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/back.4bpp.lz");
+    const u32 gMonShinyPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/shiny.gbapal.lz");
+    const u8 gMonIcon_PorygonZ[] = INCBIN_U8("graphics/pokemon/gen_4/porygon_z/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/footprint.1bpp");
+    const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/gen_4/porygon_z/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_GEN_2_CROSS_EVOS
 #endif //P_FAMILY_PORYGON
 
 #if P_FAMILY_OMANYTE
-    const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/anim_front.4bpp.lz");
-    const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/normal.gbapal.lz");
-    const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/back.4bpp.lz");
-    const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/shiny.gbapal.lz");
-    const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/icon.4bpp");
+    const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/anim_front.4bpp.lz");
+    const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/normal.gbapal.lz");
+    const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/back.4bpp.lz");
+    const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/shiny.gbapal.lz");
+    const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/gen_1/omanyte/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp");
+    const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/gen_1/omanyte/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/shiny.gbapal.lz");
-    const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/icon.4bpp");
+    const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/normal.gbapal.lz");
+    const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/shiny.gbapal.lz");
+    const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/gen_1/omastar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp");
+    const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/gen_1/omastar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_OMANYTE
 
 #if P_FAMILY_KABUTO
-    const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/normal.gbapal.lz");
-    const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/shiny.gbapal.lz");
-    const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/icon.4bpp");
+    const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/normal.gbapal.lz");
+    const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/shiny.gbapal.lz");
+    const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/gen_1/kabuto/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp");
+    const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/gen_1/kabuto/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/shiny.gbapal.lz");
-    const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/icon.4bpp");
+    const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/normal.gbapal.lz");
+    const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/shiny.gbapal.lz");
+    const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/gen_1/kabutops/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp");
+    const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/gen_1/kabutops/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KABUTO
 
 #if P_FAMILY_AERODACTYL
-    const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/anim_front.4bpp.lz");
-    const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/normal.gbapal.lz");
-    const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/shiny.gbapal.lz");
-    const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/icon.4bpp");
+    const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/normal.gbapal.lz");
+    const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/shiny.gbapal.lz");
+    const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp");
+    const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/front.4bpp.lz");
-    const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/front.4bpp.lz");
+    const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_AERODACTYL
 
 #if P_FAMILY_SNORLAX
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_front.4bpp.lz");
-    const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/normal.gbapal.lz");
-    const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4bpp.lz");
-    const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/shiny.gbapal.lz");
-    const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp");
+    const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/anim_front.4bpp.lz");
+    const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/normal.gbapal.lz");
+    const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/back.4bpp.lz");
+    const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/shiny.gbapal.lz");
+    const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/gen_4/munchlax/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/footprint.1bpp");
+    const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/gen_4/munchlax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz");
-    const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/normal.gbapal.lz");
-    const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/shiny.gbapal.lz");
-    const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/icon.4bpp");
+    const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/anim_front.4bpp.lz");
+    const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/normal.gbapal.lz");
+    const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/shiny.gbapal.lz");
+    const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp");
+    const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/snorlax/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SNORLAX
 
 #if P_FAMILY_ARTICUNO
-    const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/anim_front.4bpp.lz");
-    const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/normal.gbapal.lz");
-    const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/back.4bpp.lz");
-    const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/shiny.gbapal.lz");
-    const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/icon.4bpp");
+    const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/anim_front.4bpp.lz");
+    const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/normal.gbapal.lz");
+    const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/back.4bpp.lz");
+    const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/shiny.gbapal.lz");
+    const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp");
+    const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/front.4bpp.lz");
-    const u32 gMonPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp");
+    const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/front.4bpp.lz");
+    const u32 gMonPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_ARTICUNO
 
 #if P_FAMILY_ZAPDOS
-    const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/normal.gbapal.lz");
-    const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/shiny.gbapal.lz");
-    const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/icon.4bpp");
+    const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/normal.gbapal.lz");
+    const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/shiny.gbapal.lz");
+    const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp");
+    const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/front.4bpp.lz");
-    const u32 gMonPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp");
+    const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/front.4bpp.lz");
+    const u32 gMonPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_ZAPDOS
 
 #if P_FAMILY_MOLTRES
-    const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/anim_front.4bpp.lz");
-    const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/normal.gbapal.lz");
-    const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/back.4bpp.lz");
-    const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/shiny.gbapal.lz");
-    const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/icon.4bpp");
+    const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/anim_front.4bpp.lz");
+    const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/normal.gbapal.lz");
+    const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/back.4bpp.lz");
+    const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/shiny.gbapal.lz");
+    const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp");
+    const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/front.4bpp.lz");
-    const u32 gMonPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp");
+    const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/front.4bpp.lz");
+    const u32 gMonPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_MOLTRES
 
 #if P_FAMILY_DRATINI
-    const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/normal.gbapal.lz");
-    const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/shiny.gbapal.lz");
-    const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/icon.4bpp");
+    const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/normal.gbapal.lz");
+    const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/shiny.gbapal.lz");
+    const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/gen_1/dratini/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp");
+    const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/gen_1/dratini/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/shiny.gbapal.lz");
-    const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/icon.4bpp");
+    const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/normal.gbapal.lz");
+    const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/shiny.gbapal.lz");
+    const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/gen_1/dragonair/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp");
+    const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/gen_1/dragonair/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/shiny.gbapal.lz");
-    const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/icon.4bpp");
+    const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/normal.gbapal.lz");
+    const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/shiny.gbapal.lz");
+    const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/gen_1/dragonite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp");
+    const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/gen_1/dragonite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRATINI
 
 #if P_FAMILY_MEWTWO
-    const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/normal.gbapal.lz");
-    const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/shiny.gbapal.lz");
-    const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/icon.4bpp");
+    const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/normal.gbapal.lz");
+    const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/shiny.gbapal.lz");
+    const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp");
+    const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/front.4bpp.lz");
-    const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/front.4bpp.lz");
+    const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/normal.gbapal.lz");
+    const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/back.4bpp.lz");
+    const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/shiny.gbapal.lz");
+    const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/mega_x/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/front.4bpp.lz");
+    const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/normal.gbapal.lz");
+    const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/back.4bpp.lz");
+    const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/shiny.gbapal.lz");
+    const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/mega_y/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MEWTWO
 
 #if P_FAMILY_MEW
-    const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/normal.gbapal.lz");
-    const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/shiny.gbapal.lz");
-    const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/mew/icon.4bpp");
+    const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/normal.gbapal.lz");
+    const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/shiny.gbapal.lz");
+    const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/gen_1/mew/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp");
+    const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/gen_1/mew/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MEW
 
 #if P_FAMILY_CHIKORITA
-    const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/normal.gbapal.lz");
-    const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/shiny.gbapal.lz");
-    const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/icon.4bpp");
+    const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/normal.gbapal.lz");
+    const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/shiny.gbapal.lz");
+    const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/gen_2/chikorita/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp");
+    const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/gen_2/chikorita/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/shiny.gbapal.lz");
-    const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/icon.4bpp");
+    const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/normal.gbapal.lz");
+    const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/shiny.gbapal.lz");
+    const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/gen_2/bayleef/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp");
+    const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/gen_2/bayleef/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz");
-    const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/shiny.gbapal.lz");
-    const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/icon.4bpp");
+    const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/anim_front.4bpp.lz");
+    const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/normal.gbapal.lz");
+    const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/back.4bpp.lz");
+    const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/shiny.gbapal.lz");
+    const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/gen_2/meganium/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp");
+    const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/gen_2/meganium/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/backf.4bpp.lz");
 #endif //P_FAMILY_CHIKORITA
 
 #if P_FAMILY_CYNDAQUIL
-    const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/normal.gbapal.lz");
-    const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/shiny.gbapal.lz");
-    const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/icon.4bpp");
+    const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/normal.gbapal.lz");
+    const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/shiny.gbapal.lz");
+    const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/gen_2/cyndaquil/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp");
+    const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/gen_2/cyndaquil/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/shiny.gbapal.lz");
-    const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/icon.4bpp");
+    const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/anim_front.4bpp.lz");
+    const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/normal.gbapal.lz");
+    const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/shiny.gbapal.lz");
+    const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/gen_2/quilava/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp");
+    const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/gen_2/quilava/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/shiny.gbapal.lz");
-    const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/icon.4bpp");
+    const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/normal.gbapal.lz");
+    const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/shiny.gbapal.lz");
+    const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp");
+    const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_CYNDAQUIL
 
 #if P_FAMILY_TOTODILE
-    const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/anim_front.4bpp.lz");
-    const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/normal.gbapal.lz");
-    const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/shiny.gbapal.lz");
-    const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/icon.4bpp");
+    const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/normal.gbapal.lz");
+    const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/shiny.gbapal.lz");
+    const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/gen_2/totodile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp");
+    const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/gen_2/totodile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/back.4bpp.lz");
-    const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/shiny.gbapal.lz");
-    const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/icon.4bpp");
+    const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/anim_front.4bpp.lz");
+    const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/normal.gbapal.lz");
+    const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/back.4bpp.lz");
+    const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/shiny.gbapal.lz");
+    const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/gen_2/croconaw/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp");
+    const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/gen_2/croconaw/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/back.4bpp.lz");
-    const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/shiny.gbapal.lz");
-    const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/icon.4bpp");
+    const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/anim_front.4bpp.lz");
+    const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/normal.gbapal.lz");
+    const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/back.4bpp.lz");
+    const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/shiny.gbapal.lz");
+    const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/gen_2/feraligatr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp");
+    const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/gen_2/feraligatr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TOTODILE
 
 #if P_FAMILY_SENTRET
-    const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/normal.gbapal.lz");
-    const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/shiny.gbapal.lz");
-    const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/icon.4bpp");
+    const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/normal.gbapal.lz");
+    const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/shiny.gbapal.lz");
+    const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/gen_2/sentret/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp");
+    const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/gen_2/sentret/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.lz");
-    const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/shiny.gbapal.lz");
-    const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/furret/icon.4bpp");
+    const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/anim_front.4bpp.lz");
+    const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/normal.gbapal.lz");
+    const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/back.4bpp.lz");
+    const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/shiny.gbapal.lz");
+    const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/gen_2/furret/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp");
+    const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/gen_2/furret/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SENTRET
 
 #if P_FAMILY_HOOTHOOT
-    const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/normal.gbapal.lz");
-    const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/shiny.gbapal.lz");
-    const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/icon.4bpp");
+    const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/normal.gbapal.lz");
+    const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/shiny.gbapal.lz");
+    const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/gen_2/hoothoot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp");
+    const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/gen_2/hoothoot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/shiny.gbapal.lz");
-    const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/icon.4bpp");
+    const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/anim_front.4bpp.lz");
+    const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/normal.gbapal.lz");
+    const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/shiny.gbapal.lz");
+    const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/gen_2/noctowl/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp");
+    const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/gen_2/noctowl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HOOTHOOT
 
 #if P_FAMILY_LEDYBA
-    const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/normal.gbapal.lz");
-    const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/shiny.gbapal.lz");
-    const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/icon.4bpp");
+    const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/normal.gbapal.lz");
+    const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/shiny.gbapal.lz");
+    const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/gen_2/ledyba/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp");
+    const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/gen_2/ledyba/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/normal.gbapal.lz");
-    const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/shiny.gbapal.lz");
-    const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/icon.4bpp");
+    const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/normal.gbapal.lz");
+    const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/shiny.gbapal.lz");
+    const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/gen_2/ledian/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp");
+    const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/gen_2/ledian/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/backf.4bpp.lz");
 #endif //P_FAMILY_LEDYBA
 
 #if P_FAMILY_SPINARAK
-    const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/normal.gbapal.lz");
-    const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/shiny.gbapal.lz");
-    const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/icon.4bpp");
+    const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/normal.gbapal.lz");
+    const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/shiny.gbapal.lz");
+    const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/gen_2/spinarak/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp");
+    const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/gen_2/spinarak/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/shiny.gbapal.lz");
-    const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/icon.4bpp");
+    const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/normal.gbapal.lz");
+    const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/shiny.gbapal.lz");
+    const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/gen_2/ariados/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp");
+    const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/gen_2/ariados/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPINARAK
 
 #if P_FAMILY_CHINCHOU
-    const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/normal.gbapal.lz");
-    const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/shiny.gbapal.lz");
-    const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/icon.4bpp");
+    const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/normal.gbapal.lz");
+    const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/shiny.gbapal.lz");
+    const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/gen_2/chinchou/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp");
+    const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/gen_2/chinchou/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/shiny.gbapal.lz");
-    const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/icon.4bpp");
+    const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/normal.gbapal.lz");
+    const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/shiny.gbapal.lz");
+    const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/gen_2/lanturn/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp");
+    const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/gen_2/lanturn/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHINCHOU
 
 #if P_FAMILY_TOGEPI
-    const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front.4bpp.lz");
-    const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/normal.gbapal.lz");
-    const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/shiny.gbapal.lz");
-    const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/icon.4bpp");
+    const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/anim_front.4bpp.lz");
+    const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/normal.gbapal.lz");
+    const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/shiny.gbapal.lz");
+    const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/gen_2/togepi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp");
+    const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/gen_2/togepi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/back.4bpp.lz");
-    const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/shiny.gbapal.lz");
-    const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/icon.4bpp");
+    const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/anim_front.4bpp.lz");
+    const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/normal.gbapal.lz");
+    const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/back.4bpp.lz");
+    const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/shiny.gbapal.lz");
+    const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/gen_2/togetic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp");
+    const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/gen_2/togetic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/anim_front.4bpp.lz");
-    const u32 gMonPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/normal.gbapal.lz");
-    const u32 gMonBackPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/back.4bpp.lz");
-    const u32 gMonShinyPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/shiny.gbapal.lz");
-    const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/icon.4bpp");
+    const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/anim_front.4bpp.lz");
+    const u32 gMonPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/normal.gbapal.lz");
+    const u32 gMonBackPic_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/back.4bpp.lz");
+    const u32 gMonShinyPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/shiny.gbapal.lz");
+    const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/gen_4/togekiss/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/footprint.1bpp");
+    const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/gen_4/togekiss/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_TOGEPI
 
 #if P_FAMILY_NATU
-    const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/normal.gbapal.lz");
-    const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/shiny.gbapal.lz");
-    const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/natu/icon.4bpp");
+    const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/normal.gbapal.lz");
+    const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/shiny.gbapal.lz");
+    const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/gen_2/natu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp");
+    const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/gen_2/natu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/shiny.gbapal.lz");
-    const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/icon.4bpp");
+    const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/normal.gbapal.lz");
+    const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/shiny.gbapal.lz");
+    const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/gen_2/xatu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp");
+    const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/gen_2/xatu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/anim_frontf.4bpp.lz");
 #endif //P_FAMILY_NATU
 
 #if P_FAMILY_MAREEP
-    const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/normal.gbapal.lz");
-    const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/shiny.gbapal.lz");
-    const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/icon.4bpp");
+    const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/normal.gbapal.lz");
+    const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/shiny.gbapal.lz");
+    const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/gen_2/mareep/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp");
+    const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/gen_2/mareep/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/shiny.gbapal.lz");
-    const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/icon.4bpp");
+    const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/normal.gbapal.lz");
+    const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/shiny.gbapal.lz");
+    const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/gen_2/flaaffy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp");
+    const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/gen_2/flaaffy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/shiny.gbapal.lz");
-    const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/icon.4bpp");
+    const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/normal.gbapal.lz");
+    const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/shiny.gbapal.lz");
+    const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp");
+    const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/front.4bpp.lz");
-    const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/front.4bpp.lz");
+    const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MAREEP
 
 #if P_FAMILY_MARILL
 #if P_GEN_3_CROSS_EVOS
-    const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/anim_front.4bpp.lz");
-    const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/normal.gbapal.lz");
-    const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/shiny.gbapal.lz");
-    const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/icon.4bpp");
+    const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/normal.gbapal.lz");
+    const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/shiny.gbapal.lz");
+    const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/gen_3/azurill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp");
+    const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/gen_3/azurill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_3_CROSS_EVOS
 
-    const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz");
-    const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/normal.gbapal.lz");
-    const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/shiny.gbapal.lz");
-    const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/marill/icon.4bpp");
+    const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/normal.gbapal.lz");
+    const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/shiny.gbapal.lz");
+    const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/gen_2/marill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp");
+    const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/gen_2/marill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/shiny.gbapal.lz");
-    const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/icon.4bpp");
+    const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/normal.gbapal.lz");
+    const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/shiny.gbapal.lz");
+    const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/gen_2/azumarill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp");
+    const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/gen_2/azumarill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MARILL
 
 #if P_FAMILY_SUDOWOODO
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/normal.gbapal.lz");
-    const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz");
-    const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp");
+    const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/normal.gbapal.lz");
+    const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/shiny.gbapal.lz");
+    const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/gen_4/bonsly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp");
+    const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/gen_4/bonsly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/normal.gbapal.lz");
-    const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/shiny.gbapal.lz");
-    const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/icon.4bpp");
+    const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/normal.gbapal.lz");
+    const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/shiny.gbapal.lz");
+    const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/gen_2/sudowoodo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp");
+    const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/gen_2/sudowoodo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/backf.4bpp.lz");
 #endif //P_FAMILY_SUDOWOODO
 
 #if P_FAMILY_HOPPIP
-    const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/normal.gbapal.lz");
-    const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/shiny.gbapal.lz");
-    const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/icon.4bpp");
+    const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/normal.gbapal.lz");
+    const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/shiny.gbapal.lz");
+    const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/gen_2/hoppip/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp");
+    const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/gen_2/hoppip/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/shiny.gbapal.lz");
-    const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/icon.4bpp");
+    const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/normal.gbapal.lz");
+    const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/shiny.gbapal.lz");
+    const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/gen_2/skiploom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp");
+    const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/gen_2/skiploom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/shiny.gbapal.lz");
-    const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/icon.4bpp");
+    const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/normal.gbapal.lz");
+    const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/shiny.gbapal.lz");
+    const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/gen_2/jumpluff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp");
+    const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/gen_2/jumpluff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HOPPIP
 
 #if P_FAMILY_AIPOM
-    const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz");
-    const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/normal.gbapal.lz");
-    const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/shiny.gbapal.lz");
-    const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/icon.4bpp");
+    const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/normal.gbapal.lz");
+    const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/shiny.gbapal.lz");
+    const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/gen_2/aipom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp");
+    const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/gen_2/aipom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/normal.gbapal.lz");
-    const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/shiny.gbapal.lz");
-    const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp");
+    const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/normal.gbapal.lz");
+    const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/shiny.gbapal.lz");
+    const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/gen_4/ambipom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/footprint.1bpp");
+    const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/gen_4/ambipom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/backf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_AIPOM
 
 #if P_FAMILY_SUNKERN
-    const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/normal.gbapal.lz");
-    const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/shiny.gbapal.lz");
-    const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/icon.4bpp");
+    const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/normal.gbapal.lz");
+    const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/shiny.gbapal.lz");
+    const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/gen_2/sunkern/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp");
+    const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/gen_2/sunkern/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/shiny.gbapal.lz");
-    const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/icon.4bpp");
+    const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/normal.gbapal.lz");
+    const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/shiny.gbapal.lz");
+    const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/gen_2/sunflora/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp");
+    const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/gen_2/sunflora/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SUNKERN
 
 #if P_FAMILY_YANMA
-    const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz");
-    const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/normal.gbapal.lz");
-    const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/shiny.gbapal.lz");
-    const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/icon.4bpp");
+    const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/anim_front.4bpp.lz");
+    const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/normal.gbapal.lz");
+    const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/shiny.gbapal.lz");
+    const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/gen_2/yanma/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp");
+    const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/gen_2/yanma/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/anim_front.4bpp.lz");
-    const u32 gMonPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/normal.gbapal.lz");
-    const u32 gMonBackPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/shiny.gbapal.lz");
-    const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/icon.4bpp");
+    const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/anim_front.4bpp.lz");
+    const u32 gMonPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/normal.gbapal.lz");
+    const u32 gMonBackPic_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/shiny.gbapal.lz");
+    const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/gen_4/yanmega/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/footprint.1bpp");
+    const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/gen_4/yanmega/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_YANMA
 
 #if P_FAMILY_WOOPER
-    const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/normal.gbapal.lz");
-    const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/shiny.gbapal.lz");
-    const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/icon.4bpp");
+    const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/normal.gbapal.lz");
+    const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/shiny.gbapal.lz");
+    const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp");
+    const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz");
-    const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/normal.gbapal.lz");
-    const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/shiny.gbapal.lz");
-    const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/icon.4bpp");
+    const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/anim_front.4bpp.lz");
+    const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/normal.gbapal.lz");
+    const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/shiny.gbapal.lz");
+    const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/gen_2/quagsire/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp");
+    const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/gen_2/quagsire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/backf.4bpp.lz");
 
 #if P_PALDEAN_FORMS
-    const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/front.4bpp.lz");
-    const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/normal.gbapal.lz");
-    const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/back.4bpp.lz");
-    const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/shiny.gbapal.lz");
-    // const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldean/icon.4bpp");
+    const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/front.4bpp.lz");
+    const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/normal.gbapal.lz");
+    const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/back.4bpp.lz");
+    const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.gbapal.lz");
+    // const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/wooper_paldean/icon.4bpp");
 
-    const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/front.4bpp.lz");
-    const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/normal.gbapal.lz");
-    const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/shiny.gbapal.lz");
-    const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/icon.4bpp");
+    const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/front.4bpp.lz");
+    const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/normal.gbapal.lz");
+    const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/shiny.gbapal.lz");
+    const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/gen_9/clodsire/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp");
+    // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/gen_9/clodsire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_PALDEAN_FORMS
 #endif //P_FAMILY_WOOPER
 
 #if P_FAMILY_MURKROW
-    const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/normal.gbapal.lz");
-    const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/shiny.gbapal.lz");
-    const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/icon.4bpp");
+    const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/normal.gbapal.lz");
+    const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/shiny.gbapal.lz");
+    const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/gen_2/murkrow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp");
+    const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/gen_2/murkrow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/normal.gbapal.lz");
-    const u32 gMonBackPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/shiny.gbapal.lz");
-    const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/icon.4bpp");
+    const u32 gMonFrontPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/normal.gbapal.lz");
+    const u32 gMonBackPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/shiny.gbapal.lz");
+    const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/gen_4/honchkrow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/footprint.1bpp");
+    const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/gen_4/honchkrow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_MURKROW
 
 #if P_FAMILY_MISDREAVUS
-    const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz");
-    const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/normal.gbapal.lz");
-    const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/shiny.gbapal.lz");
-    const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp");
+    const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/normal.gbapal.lz");
+    const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/shiny.gbapal.lz");
+    const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/gen_2/misdreavus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp");
+    const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/gen_2/misdreavus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/normal.gbapal.lz");
-    const u32 gMonBackPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/shiny.gbapal.lz");
-    const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/icon.4bpp");
+    const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/normal.gbapal.lz");
+    const u32 gMonBackPic_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/shiny.gbapal.lz");
+    const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/gen_4/mismagius/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/footprint.1bpp");
+    const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/gen_4/mismagius/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_MISDREAVUS
 
 #if P_FAMILY_UNOWN
-    const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz");
-    const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz");
+    const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/gen_2/unown/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/gen_2/unown/shiny.gbapal.lz");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp");
+    const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/gen_2/unown/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back.4bpp.lz");
-    const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/icon.4bpp");
+    const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/gen_2/unown/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/gen_2/unown/back.4bpp.lz");
+    const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/gen_2/unown/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz");
-    const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp");
+    const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/gen_2/unown/b/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/gen_2/unown/b/back.4bpp.lz");
+    const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/gen_2/unown/b/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz");
-    const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp");
+    const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/gen_2/unown/c/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/gen_2/unown/c/back.4bpp.lz");
+    const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/gen_2/unown/c/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz");
-    const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp");
+    const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/gen_2/unown/d/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/gen_2/unown/d/back.4bpp.lz");
+    const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/gen_2/unown/d/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/back.4bpp.lz");
-    const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/e/icon.4bpp");
+    const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/gen_2/unown/e/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/gen_2/unown/e/back.4bpp.lz");
+    const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/gen_2/unown/e/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/back.4bpp.lz");
-    const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/f/icon.4bpp");
+    const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/gen_2/unown/f/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/gen_2/unown/f/back.4bpp.lz");
+    const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/gen_2/unown/f/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/back.4bpp.lz");
-    const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/g/icon.4bpp");
+    const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/gen_2/unown/g/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/gen_2/unown/g/back.4bpp.lz");
+    const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/gen_2/unown/g/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/back.4bpp.lz");
-    const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/h/icon.4bpp");
+    const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/gen_2/unown/h/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/gen_2/unown/h/back.4bpp.lz");
+    const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/gen_2/unown/h/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/back.4bpp.lz");
-    const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/i/icon.4bpp");
+    const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/gen_2/unown/i/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/gen_2/unown/i/back.4bpp.lz");
+    const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/gen_2/unown/i/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/back.4bpp.lz");
-    const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/j/icon.4bpp");
+    const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/j/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/j/back.4bpp.lz");
+    const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/j/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/back.4bpp.lz");
-    const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/k/icon.4bpp");
+    const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/gen_2/unown/k/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/gen_2/unown/k/back.4bpp.lz");
+    const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/gen_2/unown/k/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/back.4bpp.lz");
-    const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/l/icon.4bpp");
+    const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/gen_2/unown/l/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/gen_2/unown/l/back.4bpp.lz");
+    const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/gen_2/unown/l/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/back.4bpp.lz");
-    const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/m/icon.4bpp");
+    const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/gen_2/unown/m/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/gen_2/unown/m/back.4bpp.lz");
+    const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/gen_2/unown/m/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/back.4bpp.lz");
-    const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/n/icon.4bpp");
+    const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/gen_2/unown/n/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/gen_2/unown/n/back.4bpp.lz");
+    const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/gen_2/unown/n/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/back.4bpp.lz");
-    const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/o/icon.4bpp");
+    const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/gen_2/unown/o/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/gen_2/unown/o/back.4bpp.lz");
+    const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/gen_2/unown/o/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/back.4bpp.lz");
-    const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/p/icon.4bpp");
+    const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/gen_2/unown/p/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/gen_2/unown/p/back.4bpp.lz");
+    const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/gen_2/unown/p/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/back.4bpp.lz");
-    const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/q/icon.4bpp");
+    const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/q/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/q/back.4bpp.lz");
+    const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/q/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/back.4bpp.lz");
-    const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/r/icon.4bpp");
+    const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/gen_2/unown/r/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/gen_2/unown/r/back.4bpp.lz");
+    const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/gen_2/unown/r/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/back.4bpp.lz");
-    const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/s/icon.4bpp");
+    const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/gen_2/unown/s/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/gen_2/unown/s/back.4bpp.lz");
+    const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/gen_2/unown/s/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/back.4bpp.lz");
-    const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/t/icon.4bpp");
+    const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/gen_2/unown/t/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/gen_2/unown/t/back.4bpp.lz");
+    const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/gen_2/unown/t/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/back.4bpp.lz");
-    const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/u/icon.4bpp");
+    const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/gen_2/unown/u/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/gen_2/unown/u/back.4bpp.lz");
+    const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/gen_2/unown/u/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/back.4bpp.lz");
-    const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/v/icon.4bpp");
+    const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/gen_2/unown/v/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/gen_2/unown/v/back.4bpp.lz");
+    const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/gen_2/unown/v/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/back.4bpp.lz");
-    const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/w/icon.4bpp");
+    const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/gen_2/unown/w/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/gen_2/unown/w/back.4bpp.lz");
+    const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/gen_2/unown/w/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/back.4bpp.lz");
-    const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/x/icon.4bpp");
+    const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/gen_2/unown/x/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/gen_2/unown/x/back.4bpp.lz");
+    const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/gen_2/unown/x/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/back.4bpp.lz");
-    const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/y/icon.4bpp");
+    const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/gen_2/unown/y/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/gen_2/unown/y/back.4bpp.lz");
+    const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/gen_2/unown/y/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/back.4bpp.lz");
-    const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/z/icon.4bpp");
+    const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/z/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/z/back.4bpp.lz");
+    const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/z/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/back.4bpp.lz");
-    const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/exclamation_mark/icon.4bpp");
+    const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/exclamation_mark/back.4bpp.lz");
+    const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/gen_2/unown/exclamation_mark/icon.4bpp");
 
-    const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/anim_front.4bpp.lz");
-    const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/back.4bpp.lz");
-    const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/question_mark/icon.4bpp");
+    const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/question_mark/anim_front.4bpp.lz");
+    const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/question_mark/back.4bpp.lz");
+    const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/gen_2/unown/question_mark/icon.4bpp");
 #endif //P_FAMILY_UNOWN
 
 #if P_FAMILY_WOBBUFFET
 #if P_GEN_3_CROSS_EVOS
-    const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/normal.gbapal.lz");
-    const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/shiny.gbapal.lz");
-    const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/icon.4bpp");
+    const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/normal.gbapal.lz");
+    const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/shiny.gbapal.lz");
+    const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/gen_3/wynaut/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp");
+    const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/gen_3/wynaut/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_3_CROSS_EVOS
 
-    const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/normal.gbapal.lz");
-    const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/shiny.gbapal.lz");
-    const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp");
+    const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/normal.gbapal.lz");
+    const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/shiny.gbapal.lz");
+    const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp");
+    const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/backf.4bpp.lz");
 #if P_CUSTOM_GENDER_DIFF_ICONS
-    const u8 gMonIcon_WobbuffetF[] = INCBIN_U8("graphics/pokemon/wobbuffet/iconf.4bpp");
+    const u8 gMonIcon_WobbuffetF[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/iconf.4bpp");
 #endif
 #endif //P_FAMILY_WOBBUFFET
 
 #if P_FAMILY_GIRAFARIG
-    const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz");
-    const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/normal.gbapal.lz");
-    const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz");
-    const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/shiny.gbapal.lz");
-    const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp");
+    const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/anim_front.4bpp.lz");
+    const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/normal.gbapal.lz");
+    const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/back.4bpp.lz");
+    const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/shiny.gbapal.lz");
+    const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/gen_2/girafarig/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp");
+    const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/gen_2/girafarig/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/backf.4bpp.lz");
 
 #if P_GEN_9_CROSS_EVOS
-    const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/front.4bpp.lz");
-    const u32 gMonPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/normal.gbapal.lz");
-    const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/back.4bpp.lz");
-    const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/shiny.gbapal.lz");
-    const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp");
+    const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/front.4bpp.lz");
+    const u32 gMonPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/normal.gbapal.lz");
+    const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/back.4bpp.lz");
+    const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/shiny.gbapal.lz");
+    const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/gen_9/farigiraf/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp");
+    // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/gen_9/farigiraf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_GIRAFARIG
 
 #if P_FAMILY_PINECO
-    const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/normal.gbapal.lz");
-    const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/shiny.gbapal.lz");
-    const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp");
+    const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/normal.gbapal.lz");
+    const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/shiny.gbapal.lz");
+    const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/gen_2/pineco/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp");
+    const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/gen_2/pineco/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz");
-    const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/shiny.gbapal.lz");
-    const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp");
+    const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/anim_front.4bpp.lz");
+    const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/normal.gbapal.lz");
+    const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/back.4bpp.lz");
+    const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/shiny.gbapal.lz");
+    const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/gen_2/forretress/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp");
+    const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/gen_2/forretress/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PINECO
 
 #if P_FAMILY_DUNSPARCE
-    const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/normal.gbapal.lz");
-    const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/shiny.gbapal.lz");
-    const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/icon.4bpp");
+    const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/normal.gbapal.lz");
+    const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/shiny.gbapal.lz");
+    const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/gen_2/dunsparce/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp");
+    const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/gen_2/dunsparce/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_9_CROSS_EVOS
-    const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz");
-    const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/shiny.gbapal.lz");
-    const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp");
+    const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/shiny.gbapal.lz");
+    const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/gen_9/dudunsparce/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp");
+    // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/gen_9/dudunsparce/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz");
-    const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz");
+    const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/front.4bpp.lz");
+    const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/back.4bpp.lz");
 
-    const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/front.4bpp.lz");
-    const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/back.4bpp.lz");
+    const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/three_segment/front.4bpp.lz");
+    const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/three_segment/back.4bpp.lz");
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_DUNSPARCE
 
 #if P_FAMILY_GLIGAR
-    const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/normal.gbapal.lz");
-    const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/shiny.gbapal.lz");
-    const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/icon.4bpp");
+    const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/normal.gbapal.lz");
+    const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/shiny.gbapal.lz");
+    const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gen_2/gligar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp");
+    const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gen_2/gligar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/normal.gbapal.lz");
-    const u32 gMonBackPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/shiny.gbapal.lz");
-    const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/icon.4bpp");
+    const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/normal.gbapal.lz");
+    const u32 gMonBackPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/shiny.gbapal.lz");
+    const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gen_4/gliscor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/footprint.1bpp");
+    const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gen_4/gliscor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_GLIGAR
 
 #if P_FAMILY_SNUBBULL
-    const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz");
-    const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/normal.gbapal.lz");
-    const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/shiny.gbapal.lz");
-    const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/icon.4bpp");
+    const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/anim_front.4bpp.lz");
+    const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/normal.gbapal.lz");
+    const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/shiny.gbapal.lz");
+    const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/gen_2/snubbull/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp");
+    const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/gen_2/snubbull/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz");
-    const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/shiny.gbapal.lz");
-    const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/icon.4bpp");
+    const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/anim_front.4bpp.lz");
+    const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/normal.gbapal.lz");
+    const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/back.4bpp.lz");
+    const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/shiny.gbapal.lz");
+    const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/gen_2/granbull/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp");
+    const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/gen_2/granbull/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SNUBBULL
 
 #if P_FAMILY_QWILFISH
-    const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/normal.gbapal.lz");
-    const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/shiny.gbapal.lz");
-    const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/icon.4bpp");
+    const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/normal.gbapal.lz");
+    const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/shiny.gbapal.lz");
+    const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp");
+    const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/hisuian/icon.4bpp");
 
-    const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz");
-    const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz");
-    const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz");
-    const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz");
-    const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
+    const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/front.4bpp.lz");
+    const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/normal.gbapal.lz");
+    const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/back.4bpp.lz");
+    const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/shiny.gbapal.lz");
+    const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/gen_8/overqwil/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp");
+    //const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/gen_8/overqwil/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_QWILFISH
 
 #if P_FAMILY_SHUCKLE
-    const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/normal.gbapal.lz");
-    const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/shiny.gbapal.lz");
-    const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/icon.4bpp");
+    const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/normal.gbapal.lz");
+    const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/shiny.gbapal.lz");
+    const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/gen_2/shuckle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp");
+    const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/gen_2/shuckle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHUCKLE
 
 #if P_FAMILY_HERACROSS
-    const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz");
-    const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/normal.gbapal.lz");
-    const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz");
-    const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/shiny.gbapal.lz");
-    const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/icon.4bpp");
+    const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/anim_front.4bpp.lz");
+    const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/normal.gbapal.lz");
+    const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/back.4bpp.lz");
+    const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/shiny.gbapal.lz");
+    const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp");
+    const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/front.4bpp.lz");
-    const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/front.4bpp.lz");
+    const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_HERACROSS
 
 #if P_FAMILY_SNEASEL
-    const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/normal.gbapal.lz");
-    const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/shiny.gbapal.lz");
-    const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/icon.4bpp");
+    const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/normal.gbapal.lz");
+    const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/shiny.gbapal.lz");
+    const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp");
+    const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/anim_front.4bpp.lz");
-    const u32 gMonPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/normal.gbapal.lz");
-    const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/shiny.gbapal.lz");
-    const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/icon.4bpp");
+    const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/normal.gbapal.lz");
+    const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/shiny.gbapal.lz");
+    const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/gen_4/weavile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/footprint.1bpp");
+    const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/gen_4/weavile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/backf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/hisuian/icon.4bpp");
 
-    const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/frontf.4bpp.lz");
-    const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/backf.4bpp.lz");
+    const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/frontf.4bpp.lz");
+    const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
-    const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
-    const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
-    const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
+    const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/front.4bpp.lz");
+    const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/normal.gbapal.lz");
+    const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/shiny.gbapal.lz");
+    const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/gen_8/sneasler/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp");
+    //const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/gen_8/sneasler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_SNEASEL
 
 #if P_FAMILY_TEDDIURSA
-    const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz");
-    const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/normal.gbapal.lz");
-    const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz");
-    const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/shiny.gbapal.lz");
-    const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/icon.4bpp");
+    const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/anim_front.4bpp.lz");
+    const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/normal.gbapal.lz");
+    const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/back.4bpp.lz");
+    const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/shiny.gbapal.lz");
+    const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/gen_2/teddiursa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp");
+    const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/gen_2/teddiursa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/shiny.gbapal.lz");
-    const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/icon.4bpp");
+    const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/normal.gbapal.lz");
+    const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/shiny.gbapal.lz");
+    const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/gen_2/ursaring/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp");
+    const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/gen_2/ursaring/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/backf.4bpp.lz");
 
 #if P_GEN_8_CROSS_EVOS
-    const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
-    const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
-    const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
-    const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp");
+    const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/front.4bpp.lz");
+    const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/normal.gbapal.lz");
+    const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/shiny.gbapal.lz");
+    const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp");
+    //const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/front.4bpp.lz");
+    const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.gbapal.lz");
+    const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.gbapal.lz");
+    // const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/bloodmoon/icon.4bpp");
 #endif //P_GEN_8_CROSS_EVOS
 #endif //P_FAMILY_TEDDIURSA
 
 #if P_FAMILY_SLUGMA
-    const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz");
-    const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/normal.gbapal.lz");
-    const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/shiny.gbapal.lz");
-    const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/icon.4bpp");
+    const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/normal.gbapal.lz");
+    const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/shiny.gbapal.lz");
+    const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/gen_2/slugma/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp");
+    const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/gen_2/slugma/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/shiny.gbapal.lz");
-    const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/icon.4bpp");
+    const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/normal.gbapal.lz");
+    const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/shiny.gbapal.lz");
+    const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/gen_2/magcargo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp");
+    const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/gen_2/magcargo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SLUGMA
 
 #if P_FAMILY_SWINUB
-    const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz");
-    const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/normal.gbapal.lz");
-    const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/shiny.gbapal.lz");
-    const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/icon.4bpp");
+    const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/normal.gbapal.lz");
+    const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/shiny.gbapal.lz");
+    const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/gen_2/swinub/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp");
+    const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/gen_2/swinub/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/shiny.gbapal.lz");
-    const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/icon.4bpp");
+    const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/normal.gbapal.lz");
+    const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/shiny.gbapal.lz");
+    const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/gen_2/piloswine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp");
+    const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/gen_2/piloswine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/normal.gbapal.lz");
-    const u32 gMonBackPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/shiny.gbapal.lz");
-    const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/icon.4bpp");
+    const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/normal.gbapal.lz");
+    const u32 gMonBackPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/shiny.gbapal.lz");
+    const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/gen_4/mamoswine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/footprint.1bpp");
+    const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/gen_4/mamoswine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/anim_frontf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_SWINUB
 
 #if P_FAMILY_CORSOLA
-    const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz");
-    const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/normal.gbapal.lz");
-    const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz");
-    const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/shiny.gbapal.lz");
-    const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/icon.4bpp");
+    const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/anim_front.4bpp.lz");
+    const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/normal.gbapal.lz");
+    const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/back.4bpp.lz");
+    const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/shiny.gbapal.lz");
+    const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp");
+    const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz");
-    const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp");
+    const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/front.4bpp.lz");
+    const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz");
-    const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz");
-    const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz");
-    const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/icon.4bpp");
+    const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/front.4bpp.lz");
+    const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/normal.gbapal.lz");
+    const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/shiny.gbapal.lz");
+    const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/gen_8/cursola/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/footprint.1bpp");
+    const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/gen_8/cursola/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_CORSOLA
 
 #if P_FAMILY_REMORAID
-    const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz");
-    const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/normal.gbapal.lz");
-    const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz");
-    const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/shiny.gbapal.lz");
-    const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/icon.4bpp");
+    const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/anim_front.4bpp.lz");
+    const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/normal.gbapal.lz");
+    const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/back.4bpp.lz");
+    const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/shiny.gbapal.lz");
+    const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/gen_2/remoraid/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp");
+    const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/gen_2/remoraid/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz");
-    const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/shiny.gbapal.lz");
-    const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/icon.4bpp");
+    const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/anim_front.4bpp.lz");
+    const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/normal.gbapal.lz");
+    const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/back.4bpp.lz");
+    const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/shiny.gbapal.lz");
+    const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/gen_2/octillery/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp");
+    const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/gen_2/octillery/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/backf.4bpp.lz");
 #endif //P_FAMILY_REMORAID
 
 #if P_FAMILY_DELIBIRD
-    const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz");
-    const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/normal.gbapal.lz");
-    const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz");
-    const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/shiny.gbapal.lz");
-    const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/icon.4bpp");
+    const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/anim_front.4bpp.lz");
+    const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/normal.gbapal.lz");
+    const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/back.4bpp.lz");
+    const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/shiny.gbapal.lz");
+    const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/gen_2/delibird/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp");
+    const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/gen_2/delibird/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DELIBIRD
 
 #if P_FAMILY_MANTINE
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/normal.gbapal.lz");
-    const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/shiny.gbapal.lz");
-    const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/icon.4bpp");
+    const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/normal.gbapal.lz");
+    const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/shiny.gbapal.lz");
+    const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/gen_4/mantyke/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/footprint.1bpp");
+    const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/gen_4/mantyke/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/normal.gbapal.lz");
-    const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/shiny.gbapal.lz");
-    const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/icon.4bpp");
+    const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/normal.gbapal.lz");
+    const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/shiny.gbapal.lz");
+    const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/gen_2/mantine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp");
+    const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/gen_2/mantine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MANTINE
 
 #if P_FAMILY_SKARMORY
-    const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz");
-    const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/normal.gbapal.lz");
-    const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/shiny.gbapal.lz");
-    const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/icon.4bpp");
+    const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/normal.gbapal.lz");
+    const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/shiny.gbapal.lz");
+    const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/gen_2/skarmory/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp");
+    const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/gen_2/skarmory/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKARMORY
 
 #if P_FAMILY_HOUNDOUR
-    const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz");
-    const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/normal.gbapal.lz");
-    const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz");
-    const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/shiny.gbapal.lz");
-    const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/icon.4bpp");
+    const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/anim_front.4bpp.lz");
+    const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/normal.gbapal.lz");
+    const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/back.4bpp.lz");
+    const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/shiny.gbapal.lz");
+    const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/gen_2/houndour/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp");
+    const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/gen_2/houndour/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/shiny.gbapal.lz");
-    const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/icon.4bpp");
+    const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/normal.gbapal.lz");
+    const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/shiny.gbapal.lz");
+    const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp");
+    const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/front.4bpp.lz");
-    const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/front.4bpp.lz");
+    const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_HOUNDOUR
 
 #if P_FAMILY_PHANPY
-    const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/normal.gbapal.lz");
-    const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/shiny.gbapal.lz");
-    const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/icon.4bpp");
+    const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/normal.gbapal.lz");
+    const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/shiny.gbapal.lz");
+    const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/gen_2/phanpy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp");
+    const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/gen_2/phanpy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz");
-    const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shiny.gbapal.lz");
-    const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp");
+    const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/anim_front.4bpp.lz");
+    const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/normal.gbapal.lz");
+    const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/back.4bpp.lz");
+    const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/shiny.gbapal.lz");
+    const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/gen_2/donphan/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp");
+    const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/gen_2/donphan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/backf.4bpp.lz");
 #endif //P_FAMILY_PHANPY
 
 #if P_FAMILY_STANTLER
-    const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz");
-    const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz");
-    const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/shiny.gbapal.lz");
-    const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/icon.4bpp");
+    const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/anim_front.4bpp.lz");
+    const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/normal.gbapal.lz");
+    const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/shiny.gbapal.lz");
+    const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/gen_2/stantler/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp");
+    const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/gen_2/stantler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_8_CROSS_EVOS
-    const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz");
-    const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz");
-    const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz");
-    const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp");
+    const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/front.4bpp.lz");
+    const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/normal.gbapal.lz");
+    const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/shiny.gbapal.lz");
+    const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/gen_8/wyrdeer/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp");
+    //const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/gen_8/wyrdeer/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_8_CROSS_EVOS
 #endif //P_FAMILY_STANTLER
 
 #if P_FAMILY_SMEARGLE
-    const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/normal.gbapal.lz");
-    const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/shiny.gbapal.lz");
-    const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/icon.4bpp");
+    const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/normal.gbapal.lz");
+    const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/shiny.gbapal.lz");
+    const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/gen_2/smeargle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp");
+    const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/gen_2/smeargle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SMEARGLE
 
 #if P_FAMILY_MILTANK
-    const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/anim_front.4bpp.lz");
-    const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/normal.gbapal.lz");
-    const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/back.4bpp.lz");
-    const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/shiny.gbapal.lz");
-    const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/icon.4bpp");
+    const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/anim_front.4bpp.lz");
+    const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/normal.gbapal.lz");
+    const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/back.4bpp.lz");
+    const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/shiny.gbapal.lz");
+    const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/gen_2/miltank/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp");
+    const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/gen_2/miltank/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MILTANK
 
 #if P_FAMILY_RAIKOU
-    const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/anim_front.4bpp.lz");
-    const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/normal.gbapal.lz");
-    const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/back.4bpp.lz");
-    const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/shiny.gbapal.lz");
-    const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/icon.4bpp");
+    const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/anim_front.4bpp.lz");
+    const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/normal.gbapal.lz");
+    const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/back.4bpp.lz");
+    const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/shiny.gbapal.lz");
+    const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/gen_2/raikou/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp");
+    const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/gen_2/raikou/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_RAIKOU
 
 #if P_FAMILY_ENTEI
-    const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/anim_front.4bpp.lz");
-    const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/normal.gbapal.lz");
-    const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/back.4bpp.lz");
-    const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/shiny.gbapal.lz");
-    const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/entei/icon.4bpp");
+    const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/anim_front.4bpp.lz");
+    const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/normal.gbapal.lz");
+    const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/back.4bpp.lz");
+    const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/shiny.gbapal.lz");
+    const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/gen_2/entei/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp");
+    const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/gen_2/entei/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ENTEI
 
 #if P_FAMILY_SUICUNE
-    const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/anim_front.4bpp.lz");
-    const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/normal.gbapal.lz");
-    const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/back.4bpp.lz");
-    const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/shiny.gbapal.lz");
-    const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/icon.4bpp");
+    const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/anim_front.4bpp.lz");
+    const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/normal.gbapal.lz");
+    const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/back.4bpp.lz");
+    const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/shiny.gbapal.lz");
+    const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/gen_2/suicune/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp");
+    const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/gen_2/suicune/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SUICUNE
 
 #if P_FAMILY_LARVITAR
-    const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/anim_front.4bpp.lz");
-    const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/normal.gbapal.lz");
-    const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/shiny.gbapal.lz");
-    const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/icon.4bpp");
+    const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/normal.gbapal.lz");
+    const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/shiny.gbapal.lz");
+    const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/gen_2/larvitar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp");
+    const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/gen_2/larvitar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/shiny.gbapal.lz");
-    const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/icon.4bpp");
+    const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/normal.gbapal.lz");
+    const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/shiny.gbapal.lz");
+    const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/gen_2/pupitar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp");
+    const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/gen_2/pupitar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/shiny.gbapal.lz");
-    const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/icon.4bpp");
+    const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/normal.gbapal.lz");
+    const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/shiny.gbapal.lz");
+    const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp");
+    const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/front.4bpp.lz");
-    const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/front.4bpp.lz");
+    const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_LARVITAR
 
 #if P_FAMILY_LUGIA
-    const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/normal.gbapal.lz");
-    const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/shiny.gbapal.lz");
-    const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/icon.4bpp");
+    const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/normal.gbapal.lz");
+    const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/shiny.gbapal.lz");
+    const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/gen_2/lugia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp");
+    const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/gen_2/lugia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LUGIA
 
 #if P_FAMILY_HO_OH
-    const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz");
-    const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/normal.gbapal.lz");
-    const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/back.4bpp.lz");
-    const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/shiny.gbapal.lz");
-    const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/icon.4bpp");
+    const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/anim_front.4bpp.lz");
+    const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/normal.gbapal.lz");
+    const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/back.4bpp.lz");
+    const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/shiny.gbapal.lz");
+    const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/gen_2/ho_oh/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp");
+    const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/gen_2/ho_oh/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HO_OH
 
 #if P_FAMILY_CELEBI
-    const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz");
-    const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/normal.gbapal.lz");
-    const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.gbapal.lz");
-    const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp");
+    const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/anim_front.4bpp.lz");
+    const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/normal.gbapal.lz");
+    const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/shiny.gbapal.lz");
+    const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/gen_2/celebi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp");
+    const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/gen_2/celebi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CELEBI
 
 #if P_FAMILY_TREECKO
-    const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz");
-    const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/normal.gbapal.lz");
-    const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp.lz");
-    const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/shiny.gbapal.lz");
-    const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/icon.4bpp");
+    const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/anim_front.4bpp.lz");
+    const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/normal.gbapal.lz");
+    const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/back.4bpp.lz");
+    const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/shiny.gbapal.lz");
+    const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/gen_3/treecko/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp");
+    const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/gen_3/treecko/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/shiny.gbapal.lz");
-    const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/icon.4bpp");
+    const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/normal.gbapal.lz");
+    const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/shiny.gbapal.lz");
+    const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/gen_3/grovyle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp");
+    const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/gen_3/grovyle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/shiny.gbapal.lz");
-    const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/icon.4bpp");
+    const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/normal.gbapal.lz");
+    const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/shiny.gbapal.lz");
+    const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp");
+    const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/front.4bpp.lz");
-    const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/front.4bpp.lz");
+    const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_TREECKO
 
 #if P_FAMILY_TORCHIC
-    const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz");
-    const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/normal.gbapal.lz");
-    const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz");
-    const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/shiny.gbapal.lz");
-    const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/icon.4bpp");
+    const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/anim_front.4bpp.lz");
+    const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/normal.gbapal.lz");
+    const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/back.4bpp.lz");
+    const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/shiny.gbapal.lz");
+    const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/gen_3/torchic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp");
+    const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/gen_3/torchic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz");
+    const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz");
-    const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/normal.gbapal.lz");
-    const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz");
-    const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/shiny.gbapal.lz");
-    const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/icon.4bpp");
+    const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/anim_front.4bpp.lz");
+    const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/normal.gbapal.lz");
+    const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/back.4bpp.lz");
+    const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/shiny.gbapal.lz");
+    const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/gen_3/combusken/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp");
+    const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/gen_3/combusken/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz");
-    const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/normal.gbapal.lz");
-    const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/shiny.gbapal.lz");
-    const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/icon.4bpp");
+    const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/anim_front.4bpp.lz");
+    const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/normal.gbapal.lz");
+    const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/shiny.gbapal.lz");
+    const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp");
+    const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/front.4bpp.lz");
-    const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/front.4bpp.lz");
+    const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_TORCHIC
 
 #if P_FAMILY_MUDKIP
-    const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/normal.gbapal.lz");
-    const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/shiny.gbapal.lz");
-    const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/icon.4bpp");
+    const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/normal.gbapal.lz");
+    const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/shiny.gbapal.lz");
+    const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/gen_3/mudkip/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp");
+    const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/gen_3/mudkip/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/shiny.gbapal.lz");
-    const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/icon.4bpp");
+    const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/normal.gbapal.lz");
+    const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/shiny.gbapal.lz");
+    const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/gen_3/marshtomp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp");
+    const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/gen_3/marshtomp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/shiny.gbapal.lz");
-    const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/icon.4bpp");
+    const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/normal.gbapal.lz");
+    const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/shiny.gbapal.lz");
+    const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp");
+    const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/front.4bpp.lz");
-    const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/front.4bpp.lz");
+    const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MUDKIP
 
 #if P_FAMILY_POOCHYENA
-    const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/anim_front.4bpp.lz");
-    const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/normal.gbapal.lz");
-    const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/shiny.gbapal.lz");
-    const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/icon.4bpp");
+    const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/anim_front.4bpp.lz");
+    const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/normal.gbapal.lz");
+    const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/shiny.gbapal.lz");
+    const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/gen_3/poochyena/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp");
+    const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/gen_3/poochyena/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/shiny.gbapal.lz");
-    const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/icon.4bpp");
+    const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/normal.gbapal.lz");
+    const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/shiny.gbapal.lz");
+    const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/gen_3/mightyena/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp");
+    const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/gen_3/mightyena/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_POOCHYENA
 
 #if P_FAMILY_ZIGZAGOON
-    const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/normal.gbapal.lz");
-    const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/shiny.gbapal.lz");
-    const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/icon.4bpp");
+    const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/normal.gbapal.lz");
+    const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/shiny.gbapal.lz");
+    const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp");
+    const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp.lz");
-    const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/shiny.gbapal.lz");
-    const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/icon.4bpp");
+    const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/anim_front.4bpp.lz");
+    const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/normal.gbapal.lz");
+    const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/back.4bpp.lz");
+    const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/shiny.gbapal.lz");
+    const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp");
+    const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz");
-    const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp");
+    const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/front.4bpp.lz");
+    const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/front.4bpp.lz");
-    const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp");
+    const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/front.4bpp.lz");
+    const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/front.4bpp.lz");
-    const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/normal.gbapal.lz");
-    const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/shiny.gbapal.lz");
-    const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/icon.4bpp");
+    const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/front.4bpp.lz");
+    const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/normal.gbapal.lz");
+    const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/shiny.gbapal.lz");
+    const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/gen_8/obstagoon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/footprint.1bpp");
+    const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/gen_8/obstagoon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_ZIGZAGOON
 
 #if P_FAMILY_WURMPLE
-    const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/normal.gbapal.lz");
-    const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/shiny.gbapal.lz");
-    const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/icon.4bpp");
+    const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/normal.gbapal.lz");
+    const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/shiny.gbapal.lz");
+    const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/gen_3/wurmple/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp");
+    const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/gen_3/wurmple/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/shiny.gbapal.lz");
-    const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/icon.4bpp");
+    const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/normal.gbapal.lz");
+    const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/shiny.gbapal.lz");
+    const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/gen_3/silcoon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp");
+    const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/gen_3/silcoon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/shiny.gbapal.lz");
-    const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/icon.4bpp");
+    const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/normal.gbapal.lz");
+    const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/shiny.gbapal.lz");
+    const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/gen_3/beautifly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp");
+    const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/gen_3/beautifly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/normal.gbapal.lz");
-    const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/shiny.gbapal.lz");
-    const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/icon.4bpp");
+    const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/normal.gbapal.lz");
+    const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/shiny.gbapal.lz");
+    const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/gen_3/cascoon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp");
+    const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/gen_3/cascoon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/shiny.gbapal.lz");
-    const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/icon.4bpp");
+    const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/normal.gbapal.lz");
+    const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/shiny.gbapal.lz");
+    const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/gen_3/dustox/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp");
+    const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/gen_3/dustox/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/backf.4bpp.lz");
 #endif //P_FAMILY_WURMPLE
 
 #if P_FAMILY_LOTAD
-    const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/normal.gbapal.lz");
-    const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/shiny.gbapal.lz");
-    const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/icon.4bpp");
+    const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/normal.gbapal.lz");
+    const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/shiny.gbapal.lz");
+    const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/gen_3/lotad/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp");
+    const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/gen_3/lotad/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/shiny.gbapal.lz");
-    const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/icon.4bpp");
+    const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/normal.gbapal.lz");
+    const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/shiny.gbapal.lz");
+    const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/gen_3/lombre/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp");
+    const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/gen_3/lombre/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/shiny.gbapal.lz");
-    const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/icon.4bpp");
+    const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/normal.gbapal.lz");
+    const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/shiny.gbapal.lz");
+    const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/gen_3/ludicolo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp");
+    const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/gen_3/ludicolo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/backf.4bpp.lz");
 #endif //P_FAMILY_LOTAD
 
 #if P_FAMILY_SEEDOT
-    const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz");
-    const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/normal.gbapal.lz");
-    const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/shiny.gbapal.lz");
-    const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/icon.4bpp");
+    const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/normal.gbapal.lz");
+    const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/shiny.gbapal.lz");
+    const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/gen_3/seedot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp");
+    const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/gen_3/seedot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/shiny.gbapal.lz");
-    const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/icon.4bpp");
+    const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/normal.gbapal.lz");
+    const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/shiny.gbapal.lz");
+    const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/gen_3/nuzleaf/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp");
+    const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/gen_3/nuzleaf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/normal.gbapal.lz");
-    const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/shiny.gbapal.lz");
-    const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/icon.4bpp");
+    const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/normal.gbapal.lz");
+    const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/shiny.gbapal.lz");
+    const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/gen_3/shiftry/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp");
+    const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/gen_3/shiftry/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/backf.4bpp.lz");
 #endif //P_FAMILY_SEEDOT
 
 #if P_FAMILY_TAILLOW
-    const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/normal.gbapal.lz");
-    const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/shiny.gbapal.lz");
-    const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/icon.4bpp");
+    const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/normal.gbapal.lz");
+    const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/shiny.gbapal.lz");
+    const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/gen_3/taillow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp");
+    const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/gen_3/taillow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/shiny.gbapal.lz");
-    const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/icon.4bpp");
+    const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/normal.gbapal.lz");
+    const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/shiny.gbapal.lz");
+    const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/gen_3/swellow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp");
+    const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/gen_3/swellow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAILLOW
 
 #if P_FAMILY_WINGULL
-    const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/normal.gbapal.lz");
-    const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/shiny.gbapal.lz");
-    const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/icon.4bpp");
+    const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/normal.gbapal.lz");
+    const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/shiny.gbapal.lz");
+    const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/gen_3/wingull/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp");
+    const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/gen_3/wingull/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/shiny.gbapal.lz");
-    const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/icon.4bpp");
+    const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/normal.gbapal.lz");
+    const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/shiny.gbapal.lz");
+    const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/gen_3/pelipper/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp");
+    const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/gen_3/pelipper/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WINGULL
 
 #if P_FAMILY_RALTS
-    const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/normal.gbapal.lz");
-    const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/shiny.gbapal.lz");
-    const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/icon.4bpp");
+    const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/normal.gbapal.lz");
+    const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/shiny.gbapal.lz");
+    const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/gen_3/ralts/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp");
+    const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/gen_3/ralts/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/shiny.gbapal.lz");
-    const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/icon.4bpp");
+    const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/normal.gbapal.lz");
+    const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/shiny.gbapal.lz");
+    const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/gen_3/kirlia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp");
+    const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/gen_3/kirlia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/shiny.gbapal.lz");
-    const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/icon.4bpp");
+    const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/normal.gbapal.lz");
+    const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/shiny.gbapal.lz");
+    const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp");
+    const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/front.4bpp.lz");
-    const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/front.4bpp.lz");
+    const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/normal.gbapal.lz");
-    const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/shiny.gbapal.lz");
-    const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/icon.4bpp");
+    const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/normal.gbapal.lz");
+    const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/shiny.gbapal.lz");
+    const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/footprint.1bpp");
+    const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz");
-    const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/front.4bpp.lz");
+    const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_RALTS
 
 #if P_FAMILY_SURSKIT
-    const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/anim_front.4bpp.lz");
-    const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/normal.gbapal.lz");
-    const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/back.4bpp.lz");
-    const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/shiny.gbapal.lz");
-    const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/icon.4bpp");
+    const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/anim_front.4bpp.lz");
+    const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/normal.gbapal.lz");
+    const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/back.4bpp.lz");
+    const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/shiny.gbapal.lz");
+    const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/gen_3/surskit/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp");
+    const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/gen_3/surskit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/back.4bpp.lz");
-    const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/shiny.gbapal.lz");
-    const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/icon.4bpp");
+    const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/anim_front.4bpp.lz");
+    const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/normal.gbapal.lz");
+    const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/back.4bpp.lz");
+    const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/shiny.gbapal.lz");
+    const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/gen_3/masquerain/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp");
+    const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/gen_3/masquerain/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SURSKIT
 
 #if P_FAMILY_SHROOMISH
-    const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/normal.gbapal.lz");
-    const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/shiny.gbapal.lz");
-    const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/icon.4bpp");
+    const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/normal.gbapal.lz");
+    const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/shiny.gbapal.lz");
+    const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/gen_3/shroomish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp");
+    const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/gen_3/shroomish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/shiny.gbapal.lz");
-    const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/icon.4bpp");
+    const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/normal.gbapal.lz");
+    const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/shiny.gbapal.lz");
+    const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/gen_3/breloom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp");
+    const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/gen_3/breloom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHROOMISH
 
 #if P_FAMILY_SLAKOTH
-    const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/anim_front.4bpp.lz");
-    const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/normal.gbapal.lz");
-    const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/shiny.gbapal.lz");
-    const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/icon.4bpp");
+    const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/normal.gbapal.lz");
+    const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/shiny.gbapal.lz");
+    const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/gen_3/slakoth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp");
+    const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/gen_3/slakoth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/shiny.gbapal.lz");
-    const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/icon.4bpp");
+    const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/normal.gbapal.lz");
+    const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/shiny.gbapal.lz");
+    const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/gen_3/vigoroth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp");
+    const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/gen_3/vigoroth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/shiny.gbapal.lz");
-    const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/icon.4bpp");
+    const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/normal.gbapal.lz");
+    const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/shiny.gbapal.lz");
+    const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/gen_3/slaking/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp");
+    const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/gen_3/slaking/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SLAKOTH
 
 #if P_FAMILY_NINCADA
-    const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/anim_front.4bpp.lz");
-    const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/normal.gbapal.lz");
-    const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/shiny.gbapal.lz");
-    const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/icon.4bpp");
+    const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/normal.gbapal.lz");
+    const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/shiny.gbapal.lz");
+    const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/gen_3/nincada/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp");
+    const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/gen_3/nincada/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/shiny.gbapal.lz");
-    const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/icon.4bpp");
+    const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/normal.gbapal.lz");
+    const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/shiny.gbapal.lz");
+    const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/gen_3/ninjask/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp");
+    const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/gen_3/ninjask/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/shiny.gbapal.lz");
-    const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/icon.4bpp");
+    const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/normal.gbapal.lz");
+    const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/shiny.gbapal.lz");
+    const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/gen_3/shedinja/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp");
+    const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/gen_3/shedinja/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NINCADA
 
 #if P_FAMILY_WHISMUR
-    const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/anim_front.4bpp.lz");
-    const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/normal.gbapal.lz");
-    const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/shiny.gbapal.lz");
-    const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/icon.4bpp");
+    const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/anim_front.4bpp.lz");
+    const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/normal.gbapal.lz");
+    const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/shiny.gbapal.lz");
+    const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/gen_3/whismur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp");
+    const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/gen_3/whismur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/back.4bpp.lz");
-    const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/shiny.gbapal.lz");
-    const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/icon.4bpp");
+    const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/anim_front.4bpp.lz");
+    const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/normal.gbapal.lz");
+    const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/back.4bpp.lz");
+    const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/shiny.gbapal.lz");
+    const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/gen_3/loudred/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp");
+    const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/gen_3/loudred/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/back.4bpp.lz");
-    const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/shiny.gbapal.lz");
-    const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/icon.4bpp");
+    const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/anim_front.4bpp.lz");
+    const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/normal.gbapal.lz");
+    const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/back.4bpp.lz");
+    const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/shiny.gbapal.lz");
+    const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/gen_3/exploud/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp");
+    const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/gen_3/exploud/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WHISMUR
 
 #if P_FAMILY_MAKUHITA
-    const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/anim_front.4bpp.lz");
-    const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/normal.gbapal.lz");
-    const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/back.4bpp.lz");
-    const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/shiny.gbapal.lz");
-    const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/icon.4bpp");
+    const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/anim_front.4bpp.lz");
+    const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/normal.gbapal.lz");
+    const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/back.4bpp.lz");
+    const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/shiny.gbapal.lz");
+    const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/gen_3/makuhita/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp");
+    const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/gen_3/makuhita/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/shiny.gbapal.lz");
-    const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/icon.4bpp");
+    const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/normal.gbapal.lz");
+    const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/shiny.gbapal.lz");
+    const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/gen_3/hariyama/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp");
+    const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/gen_3/hariyama/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MAKUHITA
 
 #if P_FAMILY_NOSEPASS
-    const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/anim_front.4bpp.lz");
-    const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/normal.gbapal.lz");
-    const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/shiny.gbapal.lz");
-    const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/icon.4bpp");
+    const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/anim_front.4bpp.lz");
+    const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/normal.gbapal.lz");
+    const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/shiny.gbapal.lz");
+    const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/gen_3/nosepass/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp");
+    const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/gen_3/nosepass/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz");
-    const u32 gMonPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/normal.gbapal.lz");
-    const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/back.4bpp.lz");
-    const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/shiny.gbapal.lz");
-    const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/icon.4bpp");
+    const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/anim_front.4bpp.lz");
+    const u32 gMonPalette_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/normal.gbapal.lz");
+    const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/back.4bpp.lz");
+    const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/shiny.gbapal.lz");
+    const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/gen_4/probopass/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/footprint.1bpp");
+    const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/gen_4/probopass/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_NOSEPASS
 
 #if P_FAMILY_SKITTY
-    const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/anim_front.4bpp.lz");
-    const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/normal.gbapal.lz");
-    const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/shiny.gbapal.lz");
-    const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/icon.4bpp");
+    const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/normal.gbapal.lz");
+    const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/shiny.gbapal.lz");
+    const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/gen_3/skitty/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp");
+    const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/gen_3/skitty/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/back.4bpp.lz");
-    const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/shiny.gbapal.lz");
-    const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/icon.4bpp");
+    const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/anim_front.4bpp.lz");
+    const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/normal.gbapal.lz");
+    const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/back.4bpp.lz");
+    const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/shiny.gbapal.lz");
+    const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/gen_3/delcatty/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp");
+    const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/gen_3/delcatty/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKITTY
 
 #if P_FAMILY_SABLEYE
-    const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/normal.gbapal.lz");
-    const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/shiny.gbapal.lz");
-    const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/icon.4bpp");
+    const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/normal.gbapal.lz");
+    const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/shiny.gbapal.lz");
+    const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp");
+    const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/front.4bpp.lz");
-    const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/front.4bpp.lz");
+    const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_SABLEYE
 
 #if P_FAMILY_MAWILE
-    const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/normal.gbapal.lz");
-    const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/shiny.gbapal.lz");
-    const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/icon.4bpp");
+    const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/normal.gbapal.lz");
+    const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/shiny.gbapal.lz");
+    const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp");
+    const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/front.4bpp.lz");
-    const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/front.4bpp.lz");
+    const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MAWILE
 
 #if P_FAMILY_ARON
-    const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bpp.lz");
-    const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/normal.gbapal.lz");
-    const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/shiny.gbapal.lz");
-    const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/aron/icon.4bpp");
+    const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/normal.gbapal.lz");
+    const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/shiny.gbapal.lz");
+    const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/gen_3/aron/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp");
+    const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/gen_3/aron/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/shiny.gbapal.lz");
-    const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/icon.4bpp");
+    const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/normal.gbapal.lz");
+    const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/shiny.gbapal.lz");
+    const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/gen_3/lairon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp");
+    const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/gen_3/lairon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/shiny.gbapal.lz");
-    const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/icon.4bpp");
+    const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/normal.gbapal.lz");
+    const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/shiny.gbapal.lz");
+    const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp");
+    const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/front.4bpp.lz");
-    const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/front.4bpp.lz");
+    const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_ARON
 
 #if P_FAMILY_MEDITITE
-    const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz");
-    const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/normal.gbapal.lz");
-    const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/shiny.gbapal.lz");
-    const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/icon.4bpp");
+    const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/normal.gbapal.lz");
+    const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/shiny.gbapal.lz");
+    const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/gen_3/meditite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp");
+    const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/gen_3/meditite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz");
-    const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/normal.gbapal.lz");
-    const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz");
-    const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/shiny.gbapal.lz");
-    const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/icon.4bpp");
+    const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/anim_front.4bpp.lz");
+    const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/normal.gbapal.lz");
+    const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/back.4bpp.lz");
+    const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/shiny.gbapal.lz");
+    const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp");
+    const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/front.4bpp.lz");
-    const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/front.4bpp.lz");
+    const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_MEDITITE
 
 #if P_FAMILY_ELECTRIKE
-    const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz");
-    const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/normal.gbapal.lz");
-    const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz");
-    const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/shiny.gbapal.lz");
-    const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/icon.4bpp");
+    const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/anim_front.4bpp.lz");
+    const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/normal.gbapal.lz");
+    const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/back.4bpp.lz");
+    const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/shiny.gbapal.lz");
+    const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/gen_3/electrike/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp");
+    const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/gen_3/electrike/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz");
-    const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/shiny.gbapal.lz");
-    const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/icon.4bpp");
+    const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/anim_front.4bpp.lz");
+    const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/normal.gbapal.lz");
+    const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/back.4bpp.lz");
+    const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/shiny.gbapal.lz");
+    const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp");
+    const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/front.4bpp.lz");
-    const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/front.4bpp.lz");
+    const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_ELECTRIKE
 
 #if P_FAMILY_PLUSLE
-    const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/normal.gbapal.lz");
-    const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/shiny.gbapal.lz");
-    const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/icon.4bpp");
+    const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/normal.gbapal.lz");
+    const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/shiny.gbapal.lz");
+    const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/gen_3/plusle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp");
+    const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/gen_3/plusle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PLUSLE
 
 #if P_FAMILY_MINUN
-    const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4bpp.lz");
-    const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/normal.gbapal.lz");
-    const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz");
-    const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/shiny.gbapal.lz");
-    const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/minun/icon.4bpp");
+    const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/anim_front.4bpp.lz");
+    const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/normal.gbapal.lz");
+    const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/back.4bpp.lz");
+    const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/shiny.gbapal.lz");
+    const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/gen_3/minun/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp");
+    const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/gen_3/minun/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MINUN
 
 #if P_FAMILY_VOLBEAT_ILLUMISE
-    const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/normal.gbapal.lz");
-    const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/shiny.gbapal.lz");
-    const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/icon.4bpp");
+    const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/normal.gbapal.lz");
+    const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/shiny.gbapal.lz");
+    const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/gen_3/volbeat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp");
+    const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/gen_3/volbeat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz");
-    const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/shiny.gbapal.lz");
-    const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/icon.4bpp");
+    const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/anim_front.4bpp.lz");
+    const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/normal.gbapal.lz");
+    const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/back.4bpp.lz");
+    const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/shiny.gbapal.lz");
+    const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/gen_3/illumise/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp");
+    const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/gen_3/illumise/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VOLBEAT_ILLUMISE
 
 #if P_FAMILY_ROSELIA
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/anim_front.4bpp.lz");
-    const u32 gMonPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/normal.gbapal.lz");
-    const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/back.4bpp.lz");
-    const u32 gMonShinyPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/shiny.gbapal.lz");
-    const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/budew/icon.4bpp");
+    const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/anim_front.4bpp.lz");
+    const u32 gMonPalette_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/normal.gbapal.lz");
+    const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/back.4bpp.lz");
+    const u32 gMonShinyPalette_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/shiny.gbapal.lz");
+    const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/gen_4/budew/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/budew/footprint.1bpp");
+    const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/gen_4/budew/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz");
-    const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/normal.gbapal.lz");
-    const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/shiny.gbapal.lz");
-    const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/icon.4bpp");
+    const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/normal.gbapal.lz");
+    const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/shiny.gbapal.lz");
+    const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/gen_3/roselia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp");
+    const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/gen_3/roselia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/backf.4bpp.lz");
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/anim_front.4bpp.lz");
-    const u32 gMonPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/normal.gbapal.lz");
-    const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/back.4bpp.lz");
-    const u32 gMonShinyPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/shiny.gbapal.lz");
-    const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/icon.4bpp");
+    const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/anim_front.4bpp.lz");
+    const u32 gMonPalette_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/normal.gbapal.lz");
+    const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/back.4bpp.lz");
+    const u32 gMonShinyPalette_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/shiny.gbapal.lz");
+    const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/gen_4/roserade/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/footprint.1bpp");
+    const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/gen_4/roserade/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/backf.4bpp.lz");
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_ROSELIA
 
 #if P_FAMILY_GULPIN
-    const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/normal.gbapal.lz");
-    const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/shiny.gbapal.lz");
-    const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/icon.4bpp");
+    const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/normal.gbapal.lz");
+    const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/shiny.gbapal.lz");
+    const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gen_3/gulpin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp");
+    const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gen_3/gulpin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz");
-    const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/normal.gbapal.lz");
-    const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/shiny.gbapal.lz");
-    const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/icon.4bpp");
+    const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/normal.gbapal.lz");
+    const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/shiny.gbapal.lz");
+    const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/gen_3/swalot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp");
+    const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/gen_3/swalot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/backf.4bpp.lz");
 #endif //P_FAMILY_GULPIN
 
 #if P_FAMILY_CARVANHA
-    const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz");
-    const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/normal.gbapal.lz");
-    const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz");
-    const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/shiny.gbapal.lz");
-    const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/icon.4bpp");
+    const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/anim_front.4bpp.lz");
+    const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/normal.gbapal.lz");
+    const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/back.4bpp.lz");
+    const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/shiny.gbapal.lz");
+    const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/gen_3/carvanha/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp");
+    const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/gen_3/carvanha/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/shiny.gbapal.lz");
-    const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/icon.4bpp");
+    const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/normal.gbapal.lz");
+    const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/shiny.gbapal.lz");
+    const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp");
+    const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/front.4bpp.lz");
-    const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/front.4bpp.lz");
+    const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_CARVANHA
 
 #if P_FAMILY_WAILMER
-    const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/normal.gbapal.lz");
-    const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/shiny.gbapal.lz");
-    const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/icon.4bpp");
+    const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/normal.gbapal.lz");
+    const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/shiny.gbapal.lz");
+    const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/gen_3/wailmer/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp");
+    const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/gen_3/wailmer/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/shiny.gbapal.lz");
-    const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/icon.4bpp");
+    const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/normal.gbapal.lz");
+    const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/shiny.gbapal.lz");
+    const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/gen_3/wailord/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp");
+    const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/gen_3/wailord/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WAILMER
 
 #if P_FAMILY_NUMEL
-    const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/normal.gbapal.lz");
-    const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/shiny.gbapal.lz");
-    const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/numel/icon.4bpp");
+    const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/normal.gbapal.lz");
+    const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/shiny.gbapal.lz");
+    const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/gen_3/numel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp");
+    const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/gen_3/numel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/gen_3/numel/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/gen_3/numel/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz");
-    const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/normal.gbapal.lz");
-    const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/shiny.gbapal.lz");
-    const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/icon.4bpp");
+    const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/anim_front.4bpp.lz");
+    const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/normal.gbapal.lz");
+    const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/shiny.gbapal.lz");
+    const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp");
+    const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/backf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/front.4bpp.lz");
-    const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/front.4bpp.lz");
+    const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_NUMEL
 
 #if P_FAMILY_TORKOAL
-    const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz");
-    const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/normal.gbapal.lz");
-    const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/shiny.gbapal.lz");
-    const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/icon.4bpp");
+    const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/anim_front.4bpp.lz");
+    const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/normal.gbapal.lz");
+    const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/shiny.gbapal.lz");
+    const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/gen_3/torkoal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp");
+    const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/gen_3/torkoal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TORKOAL
 
 #if P_FAMILY_SPOINK
-    const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/normal.gbapal.lz");
-    const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/shiny.gbapal.lz");
-    const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/icon.4bpp");
+    const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/normal.gbapal.lz");
+    const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/shiny.gbapal.lz");
+    const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/gen_3/spoink/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp");
+    const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/gen_3/spoink/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/shiny.gbapal.lz");
-    const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/icon.4bpp");
+    const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/anim_front.4bpp.lz");
+    const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/normal.gbapal.lz");
+    const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/shiny.gbapal.lz");
+    const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/gen_3/grumpig/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp");
+    const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/gen_3/grumpig/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPOINK
 
 #if P_FAMILY_SPINDA
-    const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/normal.gbapal.lz");
-    const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/shiny.gbapal.lz");
-    const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp");
+    const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/normal.gbapal.lz");
+    const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/shiny.gbapal.lz");
+    const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/gen_3/spinda/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp");
+    const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/gen_3/spinda/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPINDA
 
 #if P_FAMILY_TRAPINCH
-    const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/anim_front.4bpp.lz");
-    const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/normal.gbapal.lz");
-    const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/back.4bpp.lz");
-    const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/shiny.gbapal.lz");
-    const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/icon.4bpp");
+    const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/anim_front.4bpp.lz");
+    const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/normal.gbapal.lz");
+    const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/back.4bpp.lz");
+    const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/shiny.gbapal.lz");
+    const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/gen_3/trapinch/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp");
+    const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/gen_3/trapinch/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/shiny.gbapal.lz");
-    const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/icon.4bpp");
+    const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/normal.gbapal.lz");
+    const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/shiny.gbapal.lz");
+    const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/gen_3/vibrava/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp");
+    const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/gen_3/vibrava/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/shiny.gbapal.lz");
-    const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/icon.4bpp");
+    const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/normal.gbapal.lz");
+    const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/shiny.gbapal.lz");
+    const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/gen_3/flygon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp");
+    const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/gen_3/flygon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TRAPINCH
 
 #if P_FAMILY_CACNEA
-    const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/normal.gbapal.lz");
-    const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/shiny.gbapal.lz");
-    const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/icon.4bpp");
+    const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/normal.gbapal.lz");
+    const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/shiny.gbapal.lz");
+    const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/gen_3/cacnea/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp");
+    const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/gen_3/cacnea/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/shiny.gbapal.lz");
-    const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/icon.4bpp");
+    const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/normal.gbapal.lz");
+    const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/shiny.gbapal.lz");
+    const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/gen_3/cacturne/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp");
+    const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/gen_3/cacturne/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/anim_frontf.4bpp.lz");
 #endif //P_FAMILY_CACNEA
 
 #if P_FAMILY_SWABLU
-    const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/normal.gbapal.lz");
-    const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/shiny.gbapal.lz");
-    const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/icon.4bpp");
+    const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/normal.gbapal.lz");
+    const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/shiny.gbapal.lz");
+    const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/gen_3/swablu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp");
+    const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/gen_3/swablu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/back.4bpp.lz");
-    const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/shiny.gbapal.lz");
-    const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/icon.4bpp");
+    const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/anim_front.4bpp.lz");
+    const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/normal.gbapal.lz");
+    const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/back.4bpp.lz");
+    const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/shiny.gbapal.lz");
+    const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp");
+    const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/front.4bpp.lz");
-    const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/front.4bpp.lz");
+    const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_SWABLU
 
 #if P_FAMILY_ZANGOOSE
-    const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/normal.gbapal.lz");
-    const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/shiny.gbapal.lz");
-    const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/icon.4bpp");
+    const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/normal.gbapal.lz");
+    const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/shiny.gbapal.lz");
+    const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/gen_3/zangoose/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp");
+    const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/gen_3/zangoose/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ZANGOOSE
 
 #if P_FAMILY_SEVIPER
-    const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/anim_front.4bpp.lz");
-    const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/normal.gbapal.lz");
-    const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/shiny.gbapal.lz");
-    const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/icon.4bpp");
+    const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/normal.gbapal.lz");
+    const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/shiny.gbapal.lz");
+    const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/gen_3/seviper/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp");
+    const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/gen_3/seviper/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SEVIPER
 
 #if P_FAMILY_LUNATONE
-    const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/normal.gbapal.lz");
-    const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/shiny.gbapal.lz");
-    const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/icon.4bpp");
+    const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/normal.gbapal.lz");
+    const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/shiny.gbapal.lz");
+    const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/gen_3/lunatone/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp");
+    const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/gen_3/lunatone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LUNATONE
 
 #if P_FAMILY_SOLROCK
-    const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/anim_front.4bpp.lz");
-    const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/normal.gbapal.lz");
-    const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/back.4bpp.lz");
-    const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/shiny.gbapal.lz");
-    const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/icon.4bpp");
+    const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/anim_front.4bpp.lz");
+    const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/normal.gbapal.lz");
+    const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/back.4bpp.lz");
+    const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/shiny.gbapal.lz");
+    const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/gen_3/solrock/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp");
+    const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/gen_3/solrock/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SOLROCK
 
 #if P_FAMILY_BARBOACH
-    const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/anim_front.4bpp.lz");
-    const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/normal.gbapal.lz");
-    const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/back.4bpp.lz");
-    const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/shiny.gbapal.lz");
-    const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/icon.4bpp");
+    const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/anim_front.4bpp.lz");
+    const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/normal.gbapal.lz");
+    const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/back.4bpp.lz");
+    const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/shiny.gbapal.lz");
+    const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/gen_3/barboach/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp");
+    const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/gen_3/barboach/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/back.4bpp.lz");
-    const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/shiny.gbapal.lz");
-    const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/icon.4bpp");
+    const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/anim_front.4bpp.lz");
+    const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/normal.gbapal.lz");
+    const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/back.4bpp.lz");
+    const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/shiny.gbapal.lz");
+    const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/gen_3/whiscash/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp");
+    const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/gen_3/whiscash/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BARBOACH
 
 #if P_FAMILY_CORPHISH
-    const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/normal.gbapal.lz");
-    const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/shiny.gbapal.lz");
-    const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/icon.4bpp");
+    const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/normal.gbapal.lz");
+    const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/shiny.gbapal.lz");
+    const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/gen_3/corphish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp");
+    const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/gen_3/corphish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/shiny.gbapal.lz");
-    const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/icon.4bpp");
+    const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/anim_front.4bpp.lz");
+    const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/normal.gbapal.lz");
+    const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/shiny.gbapal.lz");
+    const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/gen_3/crawdaunt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp");
+    const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/gen_3/crawdaunt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CORPHISH
 
 #if P_FAMILY_BALTOY
-    const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/normal.gbapal.lz");
-    const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/shiny.gbapal.lz");
-    const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/icon.4bpp");
+    const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/normal.gbapal.lz");
+    const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/shiny.gbapal.lz");
+    const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/gen_3/baltoy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp");
+    const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/gen_3/baltoy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/back.4bpp.lz");
-    const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/shiny.gbapal.lz");
-    const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/icon.4bpp");
+    const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/anim_front.4bpp.lz");
+    const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/normal.gbapal.lz");
+    const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/back.4bpp.lz");
+    const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/shiny.gbapal.lz");
+    const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/gen_3/claydol/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp");
+    const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/gen_3/claydol/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BALTOY
 
 #if P_FAMILY_LILEEP
-    const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/normal.gbapal.lz");
-    const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/shiny.gbapal.lz");
-    const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/icon.4bpp");
+    const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/normal.gbapal.lz");
+    const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/shiny.gbapal.lz");
+    const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/gen_3/lileep/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp");
+    const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/gen_3/lileep/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/shiny.gbapal.lz");
-    const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/icon.4bpp");
+    const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/normal.gbapal.lz");
+    const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/shiny.gbapal.lz");
+    const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/gen_3/cradily/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp");
+    const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/gen_3/cradily/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LILEEP
 
 #if P_FAMILY_ANORITH
-    const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_front.4bpp.lz");
-    const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/normal.gbapal.lz");
-    const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp.lz");
-    const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shiny.gbapal.lz");
-    const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp");
+    const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/anim_front.4bpp.lz");
+    const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/normal.gbapal.lz");
+    const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/back.4bpp.lz");
+    const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/shiny.gbapal.lz");
+    const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/gen_3/anorith/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp");
+    const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/gen_3/anorith/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz");
-    const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp");
+    const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/normal.gbapal.lz");
+    const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/shiny.gbapal.lz");
+    const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/gen_3/armaldo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp");
+    const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/gen_3/armaldo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ANORITH
 
 #if P_FAMILY_FEEBAS
-    const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz");
-    const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/normal.gbapal.lz");
-    const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz");
-    const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz");
-    const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp");
+    const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/anim_front.4bpp.lz");
+    const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/normal.gbapal.lz");
+    const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/back.4bpp.lz");
+    const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/shiny.gbapal.lz");
+    const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/gen_3/feebas/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp");
+    const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/gen_3/feebas/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz");
-    const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz");
-    const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp");
+    const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/anim_front.4bpp.lz");
+    const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/normal.gbapal.lz");
+    const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/back.4bpp.lz");
+    const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/shiny.gbapal.lz");
+    const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/gen_3/milotic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp");
+    const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/gen_3/milotic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/backf.4bpp.lz");
 #endif //P_FAMILY_FEEBAS
 
 #if P_FAMILY_CASTFORM
-    const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz");
-    const u32 gMonPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz");
-    const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz");
-    const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz");
-    const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp");
+    const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/anim_front.4bpp.lz");
+    const u32 gMonPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/normal.gbapal.lz");
+    const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/back.4bpp.lz");
+    const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/shiny.gbapal.lz");
+    const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/gen_3/castform/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp");
+    const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/gen_3/castform/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.lz");
-    const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz");
-    const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/back.4bpp.lz");
-    const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz");
-    const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/castform/sunny/icon.4bpp");
+    const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/anim_front.4bpp.lz");
+    const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/normal.gbapal.lz");
+    const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/back.4bpp.lz");
+    const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/shiny.gbapal.lz");
+    const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/gen_3/castform/sunny/icon.4bpp");
 
-    const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/anim_front.4bpp.lz");
-    const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz");
-    const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/back.4bpp.lz");
-    const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz");
-    const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/castform/rainy/icon.4bpp");
+    const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/anim_front.4bpp.lz");
+    const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/normal.gbapal.lz");
+    const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/back.4bpp.lz");
+    const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/shiny.gbapal.lz");
+    const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/gen_3/castform/rainy/icon.4bpp");
 
-    const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/anim_front.4bpp.lz");
-    const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz");
-    const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/anim_front.4bpp.lz");
+    const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/normal.gbapal.lz");
+    const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/back.4bpp.lz");
+    const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/shiny.gbapal.lz");
+    const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/gen_3/castform/snowy/icon.4bpp");
 #endif //P_FAMILY_CASTFORM
 
 #if P_FAMILY_KECLEON
-    const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/normal.gbapal.lz");
-    const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz");
-    const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp");
+    const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/normal.gbapal.lz");
+    const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/shiny.gbapal.lz");
+    const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/gen_3/kecleon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp");
+    const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/gen_3/kecleon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KECLEON
 
 #if P_FAMILY_SHUPPET
-    const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/normal.gbapal.lz");
-    const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz");
-    const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp");
+    const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/normal.gbapal.lz");
+    const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/shiny.gbapal.lz");
+    const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/gen_3/shuppet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp");
+    const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/gen_3/shuppet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz");
-    const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz");
-    const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp");
+    const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/anim_front.4bpp.lz");
+    const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/normal.gbapal.lz");
+    const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/back.4bpp.lz");
+    const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/shiny.gbapal.lz");
+    const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/gen_3/banette/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp");
+    const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/gen_3/banette/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/front.4bpp.lz");
-    const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/front.4bpp.lz");
+    const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/gen_3/banette/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_SHUPPET
 
 #if P_FAMILY_DUSKULL
-    const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/anim_front.4bpp.lz");
-    const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/normal.gbapal.lz");
-    const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/back.4bpp.lz");
-    const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/shiny.gbapal.lz");
-    const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/icon.4bpp");
+    const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/anim_front.4bpp.lz");
+    const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/normal.gbapal.lz");
+    const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/back.4bpp.lz");
+    const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/shiny.gbapal.lz");
+    const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/gen_3/duskull/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp");
+    const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/gen_3/duskull/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/shiny.gbapal.lz");
-    const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/icon.4bpp");
+    const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/normal.gbapal.lz");
+    const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/shiny.gbapal.lz");
+    const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/gen_3/dusclops/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp");
+    const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/gen_3/dusclops/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/normal.gbapal.lz");
-    const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/shiny.gbapal.lz");
-    const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/icon.4bpp");
+    const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/normal.gbapal.lz");
+    const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/shiny.gbapal.lz");
+    const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/gen_4/dusknoir/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/footprint.1bpp");
+    const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/gen_4/dusknoir/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_DUSKULL
 
 #if P_FAMILY_TROPIUS
-    const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/normal.gbapal.lz");
-    const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/shiny.gbapal.lz");
-    const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/icon.4bpp");
+    const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/normal.gbapal.lz");
+    const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/shiny.gbapal.lz");
+    const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/gen_3/tropius/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp");
+    const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/gen_3/tropius/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TROPIUS
 
 #if P_FAMILY_CHIMECHO
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/normal.gbapal.lz");
-    const u32 gMonBackPic_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/shiny.gbapal.lz");
-    const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/icon.4bpp");
+    const u32 gMonFrontPic_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/normal.gbapal.lz");
+    const u32 gMonBackPic_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/shiny.gbapal.lz");
+    const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/gen_4/chingling/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/footprint.1bpp");
+    const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/gen_4/chingling/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 
-    const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/normal.gbapal.lz");
-    const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/shiny.gbapal.lz");
-    const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/icon.4bpp");
+    const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/normal.gbapal.lz");
+    const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/shiny.gbapal.lz");
+    const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/gen_3/chimecho/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp");
+    const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/gen_3/chimecho/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHIMECHO
 
 #if P_FAMILY_ABSOL
-    const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/anim_front.4bpp.lz");
-    const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/normal.gbapal.lz");
-    const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/back.4bpp.lz");
-    const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/shiny.gbapal.lz");
-    const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/absol/icon.4bpp");
+    const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/anim_front.4bpp.lz");
+    const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/normal.gbapal.lz");
+    const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/back.4bpp.lz");
+    const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/shiny.gbapal.lz");
+    const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/gen_3/absol/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp");
+    const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/gen_3/absol/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/front.4bpp.lz");
-    const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/front.4bpp.lz");
+    const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/gen_3/absol/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_ABSOL
 
 #if P_FAMILY_SNORUNT
-    const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/anim_front.4bpp.lz");
-    const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/normal.gbapal.lz");
-    const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/shiny.gbapal.lz");
-    const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/icon.4bpp");
+    const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/anim_front.4bpp.lz");
+    const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/normal.gbapal.lz");
+    const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/shiny.gbapal.lz");
+    const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/gen_3/snorunt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp");
+    const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/gen_3/snorunt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/shiny.gbapal.lz");
-    const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/icon.4bpp");
+    const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/normal.gbapal.lz");
+    const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/shiny.gbapal.lz");
+    const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp");
+    const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/front.4bpp.lz");
-    const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/front.4bpp.lz");
+    const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 
 #if P_GEN_4_CROSS_EVOS
-    const u32 gMonFrontPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/anim_front.4bpp.lz");
-    const u32 gMonPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/normal.gbapal.lz");
-    const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/back.4bpp.lz");
-    const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/shiny.gbapal.lz");
-    const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/icon.4bpp");
+    const u32 gMonFrontPic_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/anim_front.4bpp.lz");
+    const u32 gMonPalette_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/normal.gbapal.lz");
+    const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/back.4bpp.lz");
+    const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/shiny.gbapal.lz");
+    const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/gen_4/froslass/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/footprint.1bpp");
+    const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/gen_4/froslass/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_4_CROSS_EVOS
 #endif //P_FAMILY_SNORUNT
 
 #if P_FAMILY_SPHEAL
-    const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/normal.gbapal.lz");
-    const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/shiny.gbapal.lz");
-    const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/icon.4bpp");
+    const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/normal.gbapal.lz");
+    const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/shiny.gbapal.lz");
+    const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/gen_3/spheal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp");
+    const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/gen_3/spheal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/shiny.gbapal.lz");
-    const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/icon.4bpp");
+    const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/normal.gbapal.lz");
+    const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/shiny.gbapal.lz");
+    const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/gen_3/sealeo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp");
+    const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/gen_3/sealeo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/back.4bpp.lz");
-    const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/shiny.gbapal.lz");
-    const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/icon.4bpp");
+    const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/anim_front.4bpp.lz");
+    const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/normal.gbapal.lz");
+    const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/back.4bpp.lz");
+    const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/shiny.gbapal.lz");
+    const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/gen_3/walrein/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp");
+    const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/gen_3/walrein/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPHEAL
 
 #if P_FAMILY_CLAMPERL
-    const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_front.4bpp.lz");
-    const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/normal.gbapal.lz");
-    const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/shiny.gbapal.lz");
-    const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/icon.4bpp");
+    const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/anim_front.4bpp.lz");
+    const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/normal.gbapal.lz");
+    const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/shiny.gbapal.lz");
+    const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/gen_3/clamperl/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp");
+    const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/gen_3/clamperl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz");
-    const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/shiny.gbapal.lz");
-    const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/icon.4bpp");
+    const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/anim_front.4bpp.lz");
+    const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/normal.gbapal.lz");
+    const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/back.4bpp.lz");
+    const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/shiny.gbapal.lz");
+    const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/gen_3/huntail/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp");
+    const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/gen_3/huntail/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/shiny.gbapal.lz");
-    const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/icon.4bpp");
+    const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/normal.gbapal.lz");
+    const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/shiny.gbapal.lz");
+    const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gen_3/gorebyss/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp");
+    const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gen_3/gorebyss/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CLAMPERL
 
 #if P_FAMILY_RELICANTH
-    const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz");
-    const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/normal.gbapal.lz");
-    const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/shiny.gbapal.lz");
-    const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/icon.4bpp");
+    const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/anim_front.4bpp.lz");
+    const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/normal.gbapal.lz");
+    const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/shiny.gbapal.lz");
+    const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/gen_3/relicanth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp");
+    const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/gen_3/relicanth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/backf.4bpp.lz");
 #endif //P_FAMILY_RELICANTH
 
 #if P_FAMILY_LUVDISC
-    const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz");
-    const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/normal.gbapal.lz");
-    const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz");
-    const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/shiny.gbapal.lz");
-    const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/icon.4bpp");
+    const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/anim_front.4bpp.lz");
+    const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/normal.gbapal.lz");
+    const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/back.4bpp.lz");
+    const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/shiny.gbapal.lz");
+    const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/gen_3/luvdisc/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp");
+    const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/gen_3/luvdisc/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LUVDISC
 
 #if P_FAMILY_BAGON
-    const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/normal.gbapal.lz");
-    const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/shiny.gbapal.lz");
-    const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/icon.4bpp");
+    const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/normal.gbapal.lz");
+    const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/shiny.gbapal.lz");
+    const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/gen_3/bagon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp");
+    const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/gen_3/bagon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/shiny.gbapal.lz");
-    const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/icon.4bpp");
+    const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/normal.gbapal.lz");
+    const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/shiny.gbapal.lz");
+    const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/gen_3/shelgon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp");
+    const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/gen_3/shelgon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/back.4bpp.lz");
-    const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/shiny.gbapal.lz");
-    const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/icon.4bpp");
+    const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/anim_front.4bpp.lz");
+    const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/normal.gbapal.lz");
+    const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/back.4bpp.lz");
+    const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/shiny.gbapal.lz");
+    const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp");
+    const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/front.4bpp.lz");
-    const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/front.4bpp.lz");
+    const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_BAGON
 
 #if P_FAMILY_BELDUM
-    const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/anim_front.4bpp.lz");
-    const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/normal.gbapal.lz");
-    const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/back.4bpp.lz");
-    const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/shiny.gbapal.lz");
-    const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/icon.4bpp");
+    const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/anim_front.4bpp.lz");
+    const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/normal.gbapal.lz");
+    const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/back.4bpp.lz");
+    const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/shiny.gbapal.lz");
+    const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/gen_3/beldum/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp");
+    const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/gen_3/beldum/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/back.4bpp.lz");
-    const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/shiny.gbapal.lz");
-    const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/metang/icon.4bpp");
+    const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/anim_front.4bpp.lz");
+    const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/normal.gbapal.lz");
+    const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/back.4bpp.lz");
+    const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/shiny.gbapal.lz");
+    const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/gen_3/metang/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp");
+    const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/gen_3/metang/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/back.4bpp.lz");
-    const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/shiny.gbapal.lz");
-    const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/icon.4bpp");
+    const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/anim_front.4bpp.lz");
+    const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/normal.gbapal.lz");
+    const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/back.4bpp.lz");
+    const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/shiny.gbapal.lz");
+    const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp");
+    const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz");
-    const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/front.4bpp.lz");
+    const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_BELDUM
 
 #if P_FAMILY_REGIROCK
-    const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/anim_front.4bpp.lz");
-    const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/normal.gbapal.lz");
-    const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/back.4bpp.lz");
-    const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/shiny.gbapal.lz");
-    const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/icon.4bpp");
+    const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/anim_front.4bpp.lz");
+    const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/normal.gbapal.lz");
+    const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/back.4bpp.lz");
+    const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/shiny.gbapal.lz");
+    const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/gen_3/regirock/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp");
+    const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/gen_3/regirock/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGIROCK
 
 #if P_FAMILY_REGICE
-    const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/anim_front.4bpp.lz");
-    const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/normal.gbapal.lz");
-    const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/back.4bpp.lz");
-    const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/shiny.gbapal.lz");
-    const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/regice/icon.4bpp");
+    const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/anim_front.4bpp.lz");
+    const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/normal.gbapal.lz");
+    const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/back.4bpp.lz");
+    const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/shiny.gbapal.lz");
+    const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/gen_3/regice/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp");
+    const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/gen_3/regice/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGICE
 
 #if P_FAMILY_REGISTEEL
-    const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/normal.gbapal.lz");
-    const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/shiny.gbapal.lz");
-    const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/icon.4bpp");
+    const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/normal.gbapal.lz");
+    const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/shiny.gbapal.lz");
+    const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/gen_3/registeel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp");
+    const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/gen_3/registeel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGISTEEL
 
 #if P_FAMILY_LATIAS
-    const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/anim_front.4bpp.lz");
-    const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/normal.gbapal.lz");
-    const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/back.4bpp.lz");
-    const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/shiny.gbapal.lz");
-    const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/latias/icon.4bpp");
+    const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/anim_front.4bpp.lz");
+    const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/normal.gbapal.lz");
+    const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/back.4bpp.lz");
+    const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/shiny.gbapal.lz");
+    const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/gen_3/latias/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp");
+    const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/gen_3/latias/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz");
-    const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/front.4bpp.lz");
+    const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/gen_3/latias/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_LATIAS
 
 #if P_FAMILY_LATIOS
-    const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/anim_front.4bpp.lz");
-    const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/normal.gbapal.lz");
-    const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/back.4bpp.lz");
-    const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/shiny.gbapal.lz");
-    const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/latios/icon.4bpp");
+    const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/anim_front.4bpp.lz");
+    const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/normal.gbapal.lz");
+    const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/back.4bpp.lz");
+    const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/shiny.gbapal.lz");
+    const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/gen_3/latios/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp");
+    const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/gen_3/latios/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz");
-    const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/front.4bpp.lz");
+    const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/gen_3/latios/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_LATIOS
 
 #if P_FAMILY_KYOGRE
-    const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/normal.gbapal.lz");
-    const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny.gbapal.lz");
-    const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp");
+    const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/normal.gbapal.lz");
+    const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/shiny.gbapal.lz");
+    const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp");
+    const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_PRIMAL_REVERSIONS
-    const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz");
-    const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/front.4bpp.lz");
+    const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/normal.gbapal.lz");
+    const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/back.4bpp.lz");
+    const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/shiny.gbapal.lz");
+    const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/primal/icon.4bpp");
 #endif //P_PRIMAL_REVERSIONS
 #endif //P_FAMILY_KYOGRE
 
 #if P_FAMILY_GROUDON
-    const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gbapal.lz");
-    const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz");
-    const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp");
+    const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/normal.gbapal.lz");
+    const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/shiny.gbapal.lz");
+    const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp");
+    const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_PRIMAL_REVERSIONS
-    const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz");
-    const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/front.4bpp.lz");
+    const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/normal.gbapal.lz");
+    const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/back.4bpp.lz");
+    const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/shiny.gbapal.lz");
+    const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/primal/icon.4bpp");
 #endif //P_PRIMAL_REVERSIONS
 #endif //P_FAMILY_GROUDON
 
 #if P_FAMILY_RAYQUAZA
-    const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz");
-    const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz");
-    const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp");
+    const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/normal.gbapal.lz");
+    const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/shiny.gbapal.lz");
+    const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp");
+    const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz");
-    const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/front.4bpp.lz");
+    const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_RAYQUAZA
 
 #if P_FAMILY_JIRACHI
-    const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz");
-    const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz");
-    const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz");
-    const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp");
+    const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/normal.gbapal.lz");
+    const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/shiny.gbapal.lz");
+    const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/gen_3/jirachi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp");
+    const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/gen_3/jirachi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_JIRACHI
 
 #if P_FAMILY_DEOXYS
-    const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz");
-    const u32 gMonPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz");
-    const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz");
-    const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz");
-    const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp");
+    const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/anim_front.4bpp.lz");
+    const u32 gMonPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/normal.gbapal.lz");
+    const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/back.4bpp.lz");
+    const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/shiny.gbapal.lz");
+    const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp");
+    const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz");
-    const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz");
-    const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz");
-    const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz");
-    const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp");
+    const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/anim_front.4bpp.lz");
+    const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/normal.gbapal.lz");
+    const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/back.4bpp.lz");
+    const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/shiny.gbapal.lz");
+    const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/attack/icon.4bpp");
 
-    const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz");
-    const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz");
-    const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz");
-    const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz");
-    const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp");
+    const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/anim_front.4bpp.lz");
+    const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/normal.gbapal.lz");
+    const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/back.4bpp.lz");
+    const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/shiny.gbapal.lz");
+    const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/defense/icon.4bpp");
 
-    const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz");
-    const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz");
-    const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/anim_front.4bpp.lz");
+    const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/normal.gbapal.lz");
+    const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/back.4bpp.lz");
+    const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/shiny.gbapal.lz");
+    const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/speed/icon.4bpp");
 #endif //P_FAMILY_DEOXYS
 
 #if P_FAMILY_TURTWIG
-    const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz");
-    const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz");
-    const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz");
-    const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz");
-    const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp");
+    const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/anim_front.4bpp.lz");
+    const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/normal.gbapal.lz");
+    const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/back.4bpp.lz");
+    const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/shiny.gbapal.lz");
+    const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/gen_4/turtwig/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp");
+    const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/gen_4/turtwig/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz");
-    const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp");
+    const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/normal.gbapal.lz");
+    const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/shiny.gbapal.lz");
+    const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/gen_4/grotle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp");
+    const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/gen_4/grotle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz");
-    const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp");
+    const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/normal.gbapal.lz");
+    const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/shiny.gbapal.lz");
+    const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/gen_4/torterra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp");
+    const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/gen_4/torterra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TURTWIG
 
 #if P_FAMILY_CHIMCHAR
-    const u32 gMonFrontPic_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/normal.gbapal.lz");
-    const u32 gMonBackPic_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/shiny.gbapal.lz");
-    const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/icon.4bpp");
+    const u32 gMonFrontPic_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/normal.gbapal.lz");
+    const u32 gMonBackPic_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/shiny.gbapal.lz");
+    const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/gen_4/chimchar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/footprint.1bpp");
+    const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/gen_4/chimchar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/back.4bpp.lz");
-    const u32 gMonShinyPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/shiny.gbapal.lz");
-    const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/icon.4bpp");
+    const u32 gMonFrontPic_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/anim_front.4bpp.lz");
+    const u32 gMonPalette_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/normal.gbapal.lz");
+    const u32 gMonBackPic_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/back.4bpp.lz");
+    const u32 gMonShinyPalette_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/shiny.gbapal.lz");
+    const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/gen_4/monferno/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/footprint.1bpp");
+    const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/gen_4/monferno/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/back.4bpp.lz");
-    const u32 gMonShinyPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/shiny.gbapal.lz");
-    const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/icon.4bpp");
+    const u32 gMonFrontPic_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/anim_front.4bpp.lz");
+    const u32 gMonPalette_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/normal.gbapal.lz");
+    const u32 gMonBackPic_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/back.4bpp.lz");
+    const u32 gMonShinyPalette_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/shiny.gbapal.lz");
+    const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/gen_4/infernape/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/footprint.1bpp");
+    const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/gen_4/infernape/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHIMCHAR
 
 #if P_FAMILY_PIPLUP
-    const u32 gMonFrontPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/anim_front.4bpp.lz");
-    const u32 gMonPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/normal.gbapal.lz");
-    const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/back.4bpp.lz");
-    const u32 gMonShinyPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/shiny.gbapal.lz");
-    const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/icon.4bpp");
+    const u32 gMonFrontPic_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/anim_front.4bpp.lz");
+    const u32 gMonPalette_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/normal.gbapal.lz");
+    const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/back.4bpp.lz");
+    const u32 gMonShinyPalette_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/shiny.gbapal.lz");
+    const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/gen_4/piplup/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/footprint.1bpp");
+    const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/gen_4/piplup/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/back.4bpp.lz");
-    const u32 gMonShinyPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/shiny.gbapal.lz");
-    const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/icon.4bpp");
+    const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/anim_front.4bpp.lz");
+    const u32 gMonPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/normal.gbapal.lz");
+    const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/back.4bpp.lz");
+    const u32 gMonShinyPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/shiny.gbapal.lz");
+    const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/gen_4/prinplup/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/footprint.1bpp");
+    const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/gen_4/prinplup/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/shiny.gbapal.lz");
-    const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/icon.4bpp");
+    const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/normal.gbapal.lz");
+    const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/shiny.gbapal.lz");
+    const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/gen_4/empoleon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/footprint.1bpp");
+    const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/gen_4/empoleon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PIPLUP
 
 #if P_FAMILY_STARLY
-    const u32 gMonFrontPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/anim_front.4bpp.lz");
-    const u32 gMonPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/normal.gbapal.lz");
-    const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/shiny.gbapal.lz");
-    const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/starly/icon.4bpp");
+    const u32 gMonFrontPic_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/normal.gbapal.lz");
+    const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/shiny.gbapal.lz");
+    const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/gen_4/starly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/starly/footprint.1bpp");
+    const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/gen_4/starly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/gen_4/starly/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/gen_4/starly/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/anim_front.4bpp.lz");
-    const u32 gMonPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/normal.gbapal.lz");
-    const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/shiny.gbapal.lz");
-    const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/icon.4bpp");
+    const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/normal.gbapal.lz");
+    const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/shiny.gbapal.lz");
+    const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/gen_4/staravia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/footprint.1bpp");
+    const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/gen_4/staravia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/back.4bpp.lz");
 
-    const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/anim_front.4bpp.lz");
-    const u32 gMonPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/normal.gbapal.lz");
-    const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/shiny.gbapal.lz");
-    const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/icon.4bpp");
+    const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/normal.gbapal.lz");
+    const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/shiny.gbapal.lz");
+    const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/gen_4/staraptor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/footprint.1bpp");
+    const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/gen_4/staraptor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/anim_frontf.4bpp.lz");
 #endif //P_FAMILY_STARLY
 
 #if P_FAMILY_BIDOOF
-    const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/normal.gbapal.lz");
-    const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/shiny.gbapal.lz");
-    const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/icon.4bpp");
+    const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/normal.gbapal.lz");
+    const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/shiny.gbapal.lz");
+    const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/gen_4/bidoof/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/footprint.1bpp");
+    const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/gen_4/bidoof/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/normal.gbapal.lz");
-    const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/shiny.gbapal.lz");
-    const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/icon.4bpp");
+    const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/normal.gbapal.lz");
+    const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/shiny.gbapal.lz");
+    const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/gen_4/bibarel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/footprint.1bpp");
+    const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/gen_4/bibarel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/anim_frontf.4bpp.lz");
 #endif //P_FAMILY_BIDOOF
 
 #if P_FAMILY_KRICKETOT
-    const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/normal.gbapal.lz");
-    const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/shiny.gbapal.lz");
-    const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/icon.4bpp");
+    const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/normal.gbapal.lz");
+    const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/shiny.gbapal.lz");
+    const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/gen_4/kricketot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/footprint.1bpp");
+    const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/gen_4/kricketot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/normal.gbapal.lz");
-    const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/shiny.gbapal.lz");
-    const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/icon.4bpp");
+    const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/normal.gbapal.lz");
+    const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/shiny.gbapal.lz");
+    const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/gen_4/kricketune/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/footprint.1bpp");
+    const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/gen_4/kricketune/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/backf.4bpp.lz");
 #endif //P_FAMILY_KRICKETOT
 
 #if P_FAMILY_SHINX
-    const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/normal.gbapal.lz");
-    const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/shiny.gbapal.lz");
-    const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/icon.4bpp");
+    const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/normal.gbapal.lz");
+    const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/shiny.gbapal.lz");
+    const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/gen_4/shinx/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/footprint.1bpp");
+    const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/gen_4/shinx/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/anim_front.4bpp.lz");
-    const u32 gMonPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/normal.gbapal.lz");
-    const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/back.4bpp.lz");
-    const u32 gMonShinyPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/shiny.gbapal.lz");
-    const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/icon.4bpp");
+    const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/anim_front.4bpp.lz");
+    const u32 gMonPalette_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/normal.gbapal.lz");
+    const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/back.4bpp.lz");
+    const u32 gMonShinyPalette_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/shiny.gbapal.lz");
+    const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/gen_4/luxio/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/footprint.1bpp");
+    const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/gen_4/luxio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/anim_front.4bpp.lz");
-    const u32 gMonPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/normal.gbapal.lz");
-    const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/back.4bpp.lz");
-    const u32 gMonShinyPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/shiny.gbapal.lz");
-    const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/icon.4bpp");
+    const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/anim_front.4bpp.lz");
+    const u32 gMonPalette_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/normal.gbapal.lz");
+    const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/back.4bpp.lz");
+    const u32 gMonShinyPalette_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/shiny.gbapal.lz");
+    const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/gen_4/luxray/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/footprint.1bpp");
+    const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/gen_4/luxray/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/backf.4bpp.lz");
 #endif //P_FAMILY_SHINX
 
 #if P_FAMILY_CRANIDOS
-    const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/normal.gbapal.lz");
-    const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/shiny.gbapal.lz");
-    const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp");
+    const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/normal.gbapal.lz");
+    const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/shiny.gbapal.lz");
+    const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/gen_4/cranidos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/footprint.1bpp");
+    const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/gen_4/cranidos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz");
-    const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp");
+    const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/normal.gbapal.lz");
+    const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/shiny.gbapal.lz");
+    const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/gen_4/rampardos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/footprint.1bpp");
+    const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/gen_4/rampardos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CRANIDOS
 
 #if P_FAMILY_SHIELDON
-    const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/normal.gbapal.lz");
-    const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz");
-    const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp");
+    const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/normal.gbapal.lz");
+    const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/shiny.gbapal.lz");
+    const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/gen_4/shieldon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/footprint.1bpp");
+    const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/gen_4/shieldon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz");
-    const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp");
+    const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/normal.gbapal.lz");
+    const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/shiny.gbapal.lz");
+    const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/gen_4/bastiodon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/footprint.1bpp");
+    const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/gen_4/bastiodon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHIELDON
 
 #if P_FAMILY_BURMY
-    const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz");
-    const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
-    const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz");
-    const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
-    const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp");
+    const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/anim_front.4bpp.lz");
+    const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/normal.gbapal.lz");
+    const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/back.4bpp.lz");
+    const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/shiny.gbapal.lz");
+    const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/plant/footprint.1bpp");
+    const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/plant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz");
-    const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz");
-    const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz");
-    const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz");
-    const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp");
+    const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.4bpp.lz");
+    const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/normal.gbapal.lz");
+    const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/back.4bpp.lz");
+    const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.gbapal.lz");
+    const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/sandy_cloak/icon.4bpp");
 
-    const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz");
-    const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz");
-    const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz");
-    const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz");
-    const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp");
+    const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.4bpp.lz");
+    const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/normal.gbapal.lz");
+    const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/back.4bpp.lz");
+    const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/shiny.gbapal.lz");
+    const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/trash_cloak/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz");
-    const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
-    const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp");
+    const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/anim_front.4bpp.lz");
+    const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/normal.gbapal.lz");
+    const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/back.4bpp.lz");
+    const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/shiny.gbapal.lz");
+    const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/plant/footprint.1bpp");
+    const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/plant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz");
-    const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz");
-    const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz");
-    const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz");
-    const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp");
+    const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.4bpp.lz");
+    const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.gbapal.lz");
+    const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/back.4bpp.lz");
+    const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.gbapal.lz");
+    const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.4bpp");
 
-    const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/anim_front.4bpp.lz");
-    const u32 gMonPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/normal.gbapal.lz");
-    const u32 gMonBackPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/back.4bpp.lz");
-    const u32 gMonShinyPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/shiny.gbapal.lz");
-    const u8 gMonIcon_WormadamTrashCloak[] = INCBIN_U8("graphics/pokemon/wormadam/trash_cloak/icon.4bpp");
+    const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.4bpp.lz");
+    const u32 gMonPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/normal.gbapal.lz");
+    const u32 gMonBackPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/back.4bpp.lz");
+    const u32 gMonShinyPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.gbapal.lz");
+    const u8 gMonIcon_WormadamTrashCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/trash_cloak/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz");
-    const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp");
+    const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/normal.gbapal.lz");
+    const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/shiny.gbapal.lz");
+    const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/gen_4/mothim/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/footprint.1bpp");
+    const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/gen_4/mothim/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BURMY
 
 #if P_FAMILY_COMBEE
-    const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz");
-    const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz");
-    const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp");
+    const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/normal.gbapal.lz");
+    const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/shiny.gbapal.lz");
+    const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/gen_4/combee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/combee/footprint.1bpp");
+    const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/gen_4/combee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz");
-    const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz");
+    const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/gen_4/combee/normalf.gbapal.lz");
+    const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/gen_4/combee/shinyf.gbapal.lz");
 
-    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");
-    const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz");
-    const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp");
+    const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/normal.gbapal.lz");
+    const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/shiny.gbapal.lz");
+    const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/gen_4/vespiquen/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/footprint.1bpp");
+    const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/gen_4/vespiquen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_COMBEE
 
 #if P_FAMILY_PACHIRISU
-    const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/normal.gbapal.lz");
-    const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/shiny.gbapal.lz");
-    const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp");
+    const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/normal.gbapal.lz");
+    const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/shiny.gbapal.lz");
+    const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/gen_4/pachirisu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/footprint.1bpp");
+    const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/gen_4/pachirisu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/anim_frontf.4bpp.lz");
 #endif //P_FAMILY_PACHIRISU
 
 #if P_FAMILY_BUIZEL
-    const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz");
-    const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz");
-    const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp");
+    const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/normal.gbapal.lz");
+    const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/shiny.gbapal.lz");
+    const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/gen_4/buizel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/footprint.1bpp");
+    const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/gen_4/buizel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz");
+    const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz");
-    const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/normal.gbapal.lz");
-    const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/shiny.gbapal.lz");
-    const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp");
+    const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/anim_front.4bpp.lz");
+    const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/normal.gbapal.lz");
+    const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/shiny.gbapal.lz");
+    const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/gen_4/floatzel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/footprint.1bpp");
+    const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/gen_4/floatzel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz");
+    const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/backf.4bpp.lz");
 #endif //P_FAMILY_BUIZEL
 
 #if P_FAMILY_CHERUBI
-    const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/normal.gbapal.lz");
-    const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/shiny.gbapal.lz");
-    const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp");
+    const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/normal.gbapal.lz");
+    const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/shiny.gbapal.lz");
+    const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/gen_4/cherubi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/footprint.1bpp");
+    const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/gen_4/cherubi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/back.4bpp.lz");
-    const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/shiny.gbapal.lz");
-    const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp");
+    const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/anim_front.4bpp.lz");
+    const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/normal.gbapal.lz");
+    const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/back.4bpp.lz");
+    const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/shiny.gbapal.lz");
+    const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/footprint.1bpp");
+    const u8 gMonFootprint_Cherrim[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/anim_front.4bpp.lz");
-    const u32 gMonPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/normal.gbapal.lz");
-    const u32 gMonBackPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/anim_front.4bpp.lz");
+    const u32 gMonPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/normal.gbapal.lz");
+    const u32 gMonBackPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/back.4bpp.lz");
+    const u32 gMonShinyPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/shiny.gbapal.lz");
+    const u8 gMonIcon_CherrimSunshine[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/sunshine/icon.4bpp");
 #endif //P_FAMILY_CHERUBI
 
 #if P_FAMILY_SHELLOS
-    const u32 gMonFrontPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/anim_front.4bpp.lz");
-    const u32 gMonPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/normal.gbapal.lz");
-    const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz");
-    const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/shiny.gbapal.lz");
-    const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/shellos/icon.4bpp");
+    const u32 gMonFrontPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/anim_front.4bpp.lz");
+    const u32 gMonPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/normal.gbapal.lz");
+    const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/back.4bpp.lz");
+    const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/shiny.gbapal.lz");
+    const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/shellos/footprint.1bpp");
+    const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/anim_front.4bpp.lz");
-    const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/normal.gbapal.lz");
-    const u32 gMonBackPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/back.4bpp.lz");
-    const u32 gMonShinyPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/shiny.gbapal.lz");
-    const u8 gMonIcon_ShellosEastSea[] = INCBIN_U8("graphics/pokemon/shellos/east_sea/icon.4bpp");
+    const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/anim_front.4bpp.lz");
+    const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/normal.gbapal.lz");
+    const u32 gMonBackPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/back.4bpp.lz");
+    const u32 gMonShinyPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/shiny.gbapal.lz");
+    const u8 gMonIcon_ShellosEastSea[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/east_sea/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz");
-    const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/shiny.gbapal.lz");
-    const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gastrodon/icon.4bpp");
+    const u32 gMonFrontPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/anim_front.4bpp.lz");
+    const u32 gMonPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/normal.gbapal.lz");
+    const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/back.4bpp.lz");
+    const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/shiny.gbapal.lz");
+    const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodon/footprint.1bpp");
+    const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/anim_front.4bpp.lz");
-    const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/normal.gbapal.lz");
-    const u32 gMonBackPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/back.4bpp.lz");
-    const u32 gMonShinyPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/shiny.gbapal.lz");
-    const u8 gMonIcon_GastrodonEastSea[] = INCBIN_U8("graphics/pokemon/gastrodon/east_sea/icon.4bpp");
+    const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.4bpp.lz");
+    const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/normal.gbapal.lz");
+    const u32 gMonBackPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/back.4bpp.lz");
+    const u32 gMonShinyPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/shiny.gbapal.lz");
+    const u8 gMonIcon_GastrodonEastSea[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/east_sea/icon.4bpp");
 #endif //P_FAMILY_SHELLOS
 
 #if P_FAMILY_DRIFLOON
-    const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/normal.gbapal.lz");
-    const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/shiny.gbapal.lz");
-    const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/icon.4bpp");
+    const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/normal.gbapal.lz");
+    const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/shiny.gbapal.lz");
+    const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/gen_4/drifloon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/footprint.1bpp");
+    const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/gen_4/drifloon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/shiny.gbapal.lz");
-    const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/icon.4bpp");
+    const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/normal.gbapal.lz");
+    const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/shiny.gbapal.lz");
+    const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/gen_4/drifblim/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/footprint.1bpp");
+    const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/gen_4/drifblim/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRIFLOON
 
 #if P_FAMILY_BUNEARY
-    const u32 gMonFrontPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/anim_front.4bpp.lz");
-    const u32 gMonPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/normal.gbapal.lz");
-    const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/back.4bpp.lz");
-    const u32 gMonShinyPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/shiny.gbapal.lz");
-    const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/icon.4bpp");
+    const u32 gMonFrontPic_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/anim_front.4bpp.lz");
+    const u32 gMonPalette_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/normal.gbapal.lz");
+    const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/back.4bpp.lz");
+    const u32 gMonShinyPalette_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/shiny.gbapal.lz");
+    const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/gen_4/buneary/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/footprint.1bpp");
+    const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/gen_4/buneary/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/shiny.gbapal.lz");
-    const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/icon.4bpp");
+    const u32 gMonFrontPic_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/normal.gbapal.lz");
+    const u32 gMonBackPic_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/shiny.gbapal.lz");
+    const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/footprint.1bpp");
-#endif //P_FOOTPRINTS
-
+    const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/footprint.1bpp");
+#endif //P_FOOTPRINTS	
+	
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz");
-    const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/front.4bpp.lz");
+    const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_BUNEARY
 
 #if P_FAMILY_GLAMEOW
-    const u32 gMonFrontPic_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/normal.gbapal.lz");
-    const u32 gMonBackPic_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/shiny.gbapal.lz");
-    const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/icon.4bpp");
+    const u32 gMonFrontPic_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/normal.gbapal.lz");
+    const u32 gMonBackPic_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/shiny.gbapal.lz");
+    const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/gen_4/glameow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/footprint.1bpp");
+    const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/gen_4/glameow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/shiny.gbapal.lz");
-    const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/icon.4bpp");
+    const u32 gMonFrontPic_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/normal.gbapal.lz");
+    const u32 gMonBackPic_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/shiny.gbapal.lz");
+    const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/gen_4/purugly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/footprint.1bpp");
+    const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/gen_4/purugly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GLAMEOW
 
 #if P_FAMILY_STUNKY
-    const u32 gMonFrontPic_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/anim_front.4bpp.lz");
-    const u32 gMonPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/normal.gbapal.lz");
-    const u32 gMonBackPic_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/shiny.gbapal.lz");
-    const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/icon.4bpp");
+    const u32 gMonFrontPic_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/anim_front.4bpp.lz");
+    const u32 gMonPalette_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/normal.gbapal.lz");
+    const u32 gMonBackPic_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/shiny.gbapal.lz");
+    const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/gen_4/stunky/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/footprint.1bpp");
+    const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/gen_4/stunky/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/shiny.gbapal.lz");
-    const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp");
+    const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/normal.gbapal.lz");
+    const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/shiny.gbapal.lz");
+    const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/gen_4/skuntank/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footprint.1bpp");
+    const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/gen_4/skuntank/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_STUNKY
 
 #if P_FAMILY_BRONZOR
-    const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/normal.gbapal.lz");
-    const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz");
-    const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp");
+    const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/normal.gbapal.lz");
+    const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/shiny.gbapal.lz");
+    const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/gen_4/bronzor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp");
+    const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/gen_4/bronzor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz");
-    const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp");
+    const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/normal.gbapal.lz");
+    const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/shiny.gbapal.lz");
+    const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/gen_4/bronzong/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp");
+    const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/gen_4/bronzong/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BRONZOR
 
 #if P_FAMILY_CHATOT
-    const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/normal.gbapal.lz");
-    const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz");
-    const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp");
+    const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/normal.gbapal.lz");
+    const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/shiny.gbapal.lz");
+    const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/gen_4/chatot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp");
+    const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/gen_4/chatot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHATOT
 
 #if P_FAMILY_SPIRITOMB
-    const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/normal.gbapal.lz");
-    const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz");
-    const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp");
+    const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/normal.gbapal.lz");
+    const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/shiny.gbapal.lz");
+    const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/gen_4/spiritomb/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp");
+    const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/gen_4/spiritomb/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPIRITOMB
 
 #if P_FAMILY_GIBLE
-    const u32 gMonFrontPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/normal.gbapal.lz");
-    const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/shiny.gbapal.lz");
-    const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gible/icon.4bpp");
+    const u32 gMonFrontPic_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/normal.gbapal.lz");
+    const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/shiny.gbapal.lz");
+    const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gen_4/gible/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gible/footprint.1bpp");
+    const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gen_4/gible/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gen_4/gible/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gen_4/gible/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/normal.gbapal.lz");
-    const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/shiny.gbapal.lz");
-    const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/icon.4bpp");
+    const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/normal.gbapal.lz");
+    const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/shiny.gbapal.lz");
+    const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gen_4/gabite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/footprint.1bpp");
+    const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gen_4/gabite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/anim_front.4bpp.lz");
-    const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/normal.gbapal.lz");
-    const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/shiny.gbapal.lz");
-    const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/icon.4bpp");
+    const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/normal.gbapal.lz");
+    const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/shiny.gbapal.lz");
+    const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/footprint.1bpp");
+    const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/anim_frontf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/front.4bpp.lz");
-    const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/front.4bpp.lz");
+    const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_GIBLE
 
 #if P_FAMILY_RIOLU
-    const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz");
-    const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/normal.gbapal.lz");
-    const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz");
-    const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp");
+    const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/anim_front.4bpp.lz");
+    const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/normal.gbapal.lz");
+    const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/shiny.gbapal.lz");
+    const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/gen_4/riolu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/footprint.1bpp");
+    const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/gen_4/riolu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz");
-    const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp");
+    const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/normal.gbapal.lz");
+    const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/shiny.gbapal.lz");
+    const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/footprint.1bpp");
+    const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz");
-    const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/front.4bpp.lz");
+    const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_RIOLU
 
 #if P_FAMILY_HIPPOPOTAS
-    const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/normal.gbapal.lz");
-    const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz");
-    const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp");
+    const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/normal.gbapal.lz");
+    const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/shiny.gbapal.lz");
+    const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/footprint.1bpp");
+    const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz");
-    const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz");
+    const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/normalf.gbapal.lz");
+    const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/shinyf.gbapal.lz");
 #if P_CUSTOM_GENDER_DIFF_ICONS
-    const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/iconf.4bpp");
+    const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/iconf.4bpp");
 #endif
 
-    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");
-    const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz");
-    const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp");
+    const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/normal.gbapal.lz");
+    const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/shiny.gbapal.lz");
+    const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/footprint.1bpp");
+    const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz");
-    const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz");
+    const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/normalf.gbapal.lz");
+    const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/shinyf.gbapal.lz");
 #if P_CUSTOM_GENDER_DIFF_ICONS
-    const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/iconf.4bpp");
+    const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/iconf.4bpp");
 #endif
 #endif //P_FAMILY_HIPPOPOTAS
 
 #if P_FAMILY_SKORUPI
-    const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz");
-    const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/normal.gbapal.lz");
-    const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz");
-    const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp");
+    const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/normal.gbapal.lz");
+    const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/shiny.gbapal.lz");
+    const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/gen_4/skorupi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/footprint.1bpp");
+    const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/gen_4/skorupi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz");
-    const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp");
+    const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/normal.gbapal.lz");
+    const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/shiny.gbapal.lz");
+    const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/gen_4/drapion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/footprint.1bpp");
+    const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/gen_4/drapion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKORUPI
 
 #if P_FAMILY_CROAGUNK
-    const u32 gMonFrontPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/anim_front.4bpp.lz");
-    const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/normal.gbapal.lz");
-    const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz");
-    const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp");
+    const u32 gMonFrontPic_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/normal.gbapal.lz");
+    const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/shiny.gbapal.lz");
+    const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/gen_4/croagunk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/footprint.1bpp");
+    const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/gen_4/croagunk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_front.4bpp.lz");
-    const u32 gMonPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/normal.gbapal.lz");
-    const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/shiny.gbapal.lz");
-    const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/icon.4bpp");
+    const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/anim_front.4bpp.lz");
+    const u32 gMonPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/normal.gbapal.lz");
+    const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/shiny.gbapal.lz");
+    const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/gen_4/toxicroak/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/footprint.1bpp");
+    const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/gen_4/toxicroak/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/backf.4bpp.lz");
 #endif //P_FAMILY_CROAGUNK
 
 #if P_FAMILY_CARNIVINE
-    const u32 gMonFrontPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/anim_front.4bpp.lz");
-    const u32 gMonPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/normal.gbapal.lz");
-    const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/shiny.gbapal.lz");
-    const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/icon.4bpp");
+    const u32 gMonFrontPic_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/normal.gbapal.lz");
+    const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/shiny.gbapal.lz");
+    const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/gen_4/carnivine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/footprint.1bpp");
+    const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/gen_4/carnivine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CARNIVINE
 
 #if P_FAMILY_FINNEON
-    const u32 gMonFrontPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/normal.gbapal.lz");
-    const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/shiny.gbapal.lz");
-    const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/icon.4bpp");
+    const u32 gMonFrontPic_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/normal.gbapal.lz");
+    const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/shiny.gbapal.lz");
+    const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/gen_4/finneon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/footprint.1bpp");
+    const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/gen_4/finneon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/normal.gbapal.lz");
-    const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/shiny.gbapal.lz");
-    const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/icon.4bpp");
+    const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/normal.gbapal.lz");
+    const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/shiny.gbapal.lz");
+    const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/gen_4/lumineon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/footprint.1bpp");
+    const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/gen_4/lumineon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/backf.4bpp.lz");
 #endif //P_FAMILY_FINNEON
 
 #if P_FAMILY_SNOVER
-    const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/anim_front.4bpp.lz");
-    const u32 gMonPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/normal.gbapal.lz");
-    const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/shiny.gbapal.lz");
-    const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/snover/icon.4bpp");
+    const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/anim_front.4bpp.lz");
+    const u32 gMonPalette_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/normal.gbapal.lz");
+    const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/shiny.gbapal.lz");
+    const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/gen_4/snover/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/snover/footprint.1bpp");
+    const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/gen_4/snover/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/gen_4/snover/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/gen_4/snover/backf.4bpp.lz");
 
-    const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/normal.gbapal.lz");
-    const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/shiny.gbapal.lz");
-    const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/icon.4bpp");
+    const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/normal.gbapal.lz");
+    const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/shiny.gbapal.lz");
+    const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/footprint.1bpp");
+    const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz");
+    const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/anim_frontf.4bpp.lz");
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz");
-    const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/front.4bpp.lz");
+    const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_SNOVER
 
 #if P_FAMILY_ROTOM
-    const u32 gMonFrontPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/normal.gbapal.lz");
-    const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/shiny.gbapal.lz");
-    const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/icon.4bpp");
+    const u32 gMonFrontPic_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/normal.gbapal.lz");
+    const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/shiny.gbapal.lz");
+    const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/normal/footprint.1bpp");
+    const u8 gMonFootprint_Rotom[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/normal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/anim_front.4bpp.lz");
-    const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/normal.gbapal.lz");
-    const u32 gMonBackPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/back.4bpp.lz");
-    const u32 gMonShinyPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/shiny.gbapal.lz");
-    const u8 gMonIcon_RotomHeat[] = INCBIN_U8("graphics/pokemon/rotom/heat/icon.4bpp");
+    const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/anim_front.4bpp.lz");
+    const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/normal.gbapal.lz");
+    const u32 gMonBackPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/back.4bpp.lz");
+    const u32 gMonShinyPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/shiny.gbapal.lz");
+    const u8 gMonIcon_RotomHeat[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/heat/icon.4bpp");
 
-    const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/anim_front.4bpp.lz");
-    const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/normal.gbapal.lz");
-    const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/back.4bpp.lz");
-    const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/shiny.gbapal.lz");
-    const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/rotom/wash/icon.4bpp");
+    const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/anim_front.4bpp.lz");
+    const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/normal.gbapal.lz");
+    const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/back.4bpp.lz");
+    const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/shiny.gbapal.lz");
+    const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/wash/icon.4bpp");
 
-    const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/anim_front.4bpp.lz");
-    const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/normal.gbapal.lz");
-    const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/back.4bpp.lz");
-    const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/shiny.gbapal.lz");
-    const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/rotom/frost/icon.4bpp");
+    const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/anim_front.4bpp.lz");
+    const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/normal.gbapal.lz");
+    const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/back.4bpp.lz");
+    const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/shiny.gbapal.lz");
+    const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/frost/icon.4bpp");
 
-    const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/anim_front.4bpp.lz");
-    const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/normal.gbapal.lz");
-    const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/back.4bpp.lz");
-    const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/shiny.gbapal.lz");
-    const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/rotom/fan/icon.4bpp");
+    const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/anim_front.4bpp.lz");
+    const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/normal.gbapal.lz");
+    const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/back.4bpp.lz");
+    const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/shiny.gbapal.lz");
+    const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/fan/icon.4bpp");
 
-    const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/anim_front.4bpp.lz");
-    const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/normal.gbapal.lz");
-    const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/anim_front.4bpp.lz");
+    const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/normal.gbapal.lz");
+    const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/back.4bpp.lz");
+    const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/shiny.gbapal.lz");
+    const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/mow/icon.4bpp");
 #endif //P_FAMILY_ROTOM
 
 #if P_FAMILY_UXIE
-    const u32 gMonFrontPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/anim_front.4bpp.lz");
-    const u32 gMonPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/normal.gbapal.lz");
-    const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/shiny.gbapal.lz");
-    const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/icon.4bpp");
+    const u32 gMonFrontPic_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/normal.gbapal.lz");
+    const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/shiny.gbapal.lz");
+    const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/gen_4/uxie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/footprint.1bpp");
+    const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/gen_4/uxie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_UXIE
 
 #if P_FAMILY_MESPRIT
-    const u32 gMonFrontPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/normal.gbapal.lz");
-    const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/shiny.gbapal.lz");
-    const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/icon.4bpp");
+    const u32 gMonFrontPic_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/normal.gbapal.lz");
+    const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/shiny.gbapal.lz");
+    const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/gen_4/mesprit/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/footprint.1bpp");
+    const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/gen_4/mesprit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MESPRIT
 
 #if P_FAMILY_AZELF
-    const u32 gMonFrontPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/anim_front.4bpp.lz");
-    const u32 gMonPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/normal.gbapal.lz");
-    const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/back.4bpp.lz");
-    const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/shiny.gbapal.lz");
-    const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/icon.4bpp");
+    const u32 gMonFrontPic_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/anim_front.4bpp.lz");
+    const u32 gMonPalette_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/normal.gbapal.lz");
+    const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/back.4bpp.lz");
+    const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/shiny.gbapal.lz");
+    const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/gen_4/azelf/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/footprint.1bpp");
+    const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/gen_4/azelf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_AZELF
 
 #if P_FAMILY_DIALGA
-    const u32 gMonFrontPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/normal.gbapal.lz");
-    const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/shiny.gbapal.lz");
-    const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/icon.4bpp");
+    const u32 gMonFrontPic_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/normal.gbapal.lz");
+    const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/shiny.gbapal.lz");
+    const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/footprint.1bpp");
+    const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/front.4bpp.lz");
+    const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/normal.gbapal.lz");
+    const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/back.4bpp.lz");
+    const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/shiny.gbapal.lz");
+    const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/origin/icon.4bpp");
 #endif //P_FAMILY_DIALGA
 
 #if P_FAMILY_PALKIA
-    const u32 gMonFrontPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/anim_front.4bpp.lz");
-    const u32 gMonPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/normal.gbapal.lz");
-    const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/shiny.gbapal.lz");
-    const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/icon.4bpp");
+    const u32 gMonFrontPic_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/normal.gbapal.lz");
+    const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/shiny.gbapal.lz");
+    const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/footprint.1bpp");
+    const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/front.4bpp.lz");
+    const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/normal.gbapal.lz");
+    const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/back.4bpp.lz");
+    const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/shiny.gbapal.lz");
+    const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/origin/icon.4bpp");
 #endif //P_FAMILY_PALKIA
 
 #if P_FAMILY_HEATRAN
-    const u32 gMonFrontPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/anim_front.4bpp.lz");
-    const u32 gMonPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/normal.gbapal.lz");
-    const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/back.4bpp.lz");
-    const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/shiny.gbapal.lz");
-    const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/icon.4bpp");
+    const u32 gMonFrontPic_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/anim_front.4bpp.lz");
+    const u32 gMonPalette_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/normal.gbapal.lz");
+    const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/back.4bpp.lz");
+    const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/shiny.gbapal.lz");
+    const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/gen_4/heatran/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/footprint.1bpp");
+    const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/gen_4/heatran/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HEATRAN
 
 #if P_FAMILY_REGIGIGAS
-    const u32 gMonFrontPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/anim_front.4bpp.lz");
-    const u32 gMonPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/normal.gbapal.lz");
-    const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/back.4bpp.lz");
-    const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/shiny.gbapal.lz");
-    const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/icon.4bpp");
+    const u32 gMonFrontPic_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/anim_front.4bpp.lz");
+    const u32 gMonPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/normal.gbapal.lz");
+    const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/back.4bpp.lz");
+    const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/shiny.gbapal.lz");
+    const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/gen_4/regigigas/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/footprint.1bpp");
+    const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/gen_4/regigigas/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGIGIGAS
 
 #if P_FAMILY_GIRATINA
-    const u32 gMonFrontPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/anim_front.4bpp.lz");
-    const u32 gMonPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/normal.gbapal.lz");
-    const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/back.4bpp.lz");
-    const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/shiny.gbapal.lz");
-    const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp");
+    const u32 gMonFrontPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/anim_front.4bpp.lz");
+    const u32 gMonPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/normal.gbapal.lz");
+    const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/back.4bpp.lz");
+    const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/shiny.gbapal.lz");
+    const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Giratina[] = INCBIN_U8("graphics/pokemon/giratina/footprint.1bpp");
+    const u8 gMonFootprint_Giratina[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz");
-    const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/shiny.gbapal.lz");
-    const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/icon.4bpp");
+    const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/anim_front.4bpp.lz");
+    const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/normal.gbapal.lz");
+    const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/back.4bpp.lz");
+    const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/shiny.gbapal.lz");
+    const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/origin/icon.4bpp");
 #endif //P_FAMILY_GIRATINA
 
 #if P_FAMILY_CRESSELIA
-    const u32 gMonFrontPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/normal.gbapal.lz");
-    const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/shiny.gbapal.lz");
-    const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/icon.4bpp");
+    const u32 gMonFrontPic_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/normal.gbapal.lz");
+    const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/shiny.gbapal.lz");
+    const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/gen_4/cresselia/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/footprint.1bpp");
+    const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/gen_4/cresselia/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CRESSELIA
 
 #if P_FAMILY_MANAPHY
-    const u32 gMonFrontPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/anim_front.4bpp.lz");
-    const u32 gMonPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/normal.gbapal.lz");
-    const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/back.4bpp.lz");
-    const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/shiny.gbapal.lz");
-    const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/phione/icon.4bpp");
+    const u32 gMonFrontPic_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/anim_front.4bpp.lz");
+    const u32 gMonPalette_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/normal.gbapal.lz");
+    const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/back.4bpp.lz");
+    const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/shiny.gbapal.lz");
+    const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/gen_4/phione/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/phione/footprint.1bpp");
+    const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/gen_4/phione/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/shiny.gbapal.lz");
-    const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp");
+    const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/normal.gbapal.lz");
+    const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/shiny.gbapal.lz");
+    const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/gen_4/manaphy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/footprint.1bpp");
+    const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/gen_4/manaphy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MANAPHY
 
 #if P_FAMILY_DARKRAI
-    const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/anim_front.4bpp.lz");
-    const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gbapal.lz");
-    const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/back.4bpp.lz");
-    const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz");
-    const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp");
+    const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/anim_front.4bpp.lz");
+    const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/normal.gbapal.lz");
+    const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/back.4bpp.lz");
+    const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/shiny.gbapal.lz");
+    const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/gen_4/darkrai/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp");
+    const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/gen_4/darkrai/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DARKRAI
 
 #if P_FAMILY_SHAYMIN
-    const u32 gMonFrontPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz");
-    const u32 gMonPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/normal.gbapal.lz");
-    const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz");
-    const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz");
-    const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp");
+    const u32 gMonFrontPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/anim_front.4bpp.lz");
+    const u32 gMonPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/normal.gbapal.lz");
+    const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/back.4bpp.lz");
+    const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/shiny.gbapal.lz");
+    const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp");
+    const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/anim_front.4bpp.lz");
+    const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/normal.gbapal.lz");
+    const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/back.4bpp.lz");
+    const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/shiny.gbapal.lz");
+    const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/sky/icon.4bpp");
 #endif //P_FAMILY_SHAYMIN
 
 #if P_FAMILY_ARCEUS
-    const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/anim_front.4bpp.lz");
-    const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/back.4bpp.lz");
-    const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp");
+    const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/anim_front.4bpp.lz");
+    const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/back.4bpp.lz");
+    const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/gen_4/arceus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/footprint.1bpp");
+    const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/gen_4/arceus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fighting/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fighting/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/flying/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/flying/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/poison/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/poison/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ground/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ground/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/rock/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/rock/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/bug/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/bug/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ghost/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ghost/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/steel/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/steel/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fire/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fire/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/water/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/water/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/grass/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/grass/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/electric/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/electric/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/psychic/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/psychic/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ice/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ice/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dragon/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dragon/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dark/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dark/shiny.gbapal.lz");
 
-    const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/shiny.gbapal.lz");
+    const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fairy/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fairy/shiny.gbapal.lz");
 #endif //P_FAMILY_ARCEUS
 
 #if P_FAMILY_VICTINI
-    const u32 gMonFrontPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/anim_front.4bpp.lz");
-    const u32 gMonPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/normal.gbapal.lz");
-    const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/back.4bpp.lz");
-    const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/shiny.gbapal.lz");
-    const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/victini/icon.4bpp");
+    const u32 gMonFrontPic_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/anim_front.4bpp.lz");
+    const u32 gMonPalette_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/normal.gbapal.lz");
+    const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/back.4bpp.lz");
+    const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/shiny.gbapal.lz");
+    const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/gen_5/victini/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp");
+    const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/gen_5/victini/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VICTINI
 
 #if P_FAMILY_SNIVY
-    const u32 gMonFrontPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/normal.gbapal.lz");
-    const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/shiny.gbapal.lz");
-    const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp");
+    const u32 gMonFrontPic_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/normal.gbapal.lz");
+    const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/shiny.gbapal.lz");
+    const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/gen_5/snivy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp");
+    const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/gen_5/snivy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/back.4bpp.lz");
-    const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/shiny.gbapal.lz");
-    const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/servine/icon.4bpp");
+    const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/anim_front.4bpp.lz");
+    const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/normal.gbapal.lz");
+    const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/back.4bpp.lz");
+    const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/shiny.gbapal.lz");
+    const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/gen_5/servine/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/footprint.1bpp");
+    const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/gen_5/servine/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/back.4bpp.lz");
-    const u32 gMonShinyPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/shiny.gbapal.lz");
-    const u8 gMonIcon_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/icon.4bpp");
+    const u32 gMonFrontPic_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/anim_front.4bpp.lz");
+    const u32 gMonPalette_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/normal.gbapal.lz");
+    const u32 gMonBackPic_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/back.4bpp.lz");
+    const u32 gMonShinyPalette_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/shiny.gbapal.lz");
+    const u8 gMonIcon_Serperior[] = INCBIN_U8("graphics/pokemon/gen_5/serperior/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/footprint.1bpp");
+    const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/gen_5/serperior/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SNIVY
 
 #if P_FAMILY_TEPIG
-    const u32 gMonFrontPic_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/normal.gbapal.lz");
-    const u32 gMonBackPic_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/shiny.gbapal.lz");
-    const u8 gMonIcon_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/icon.4bpp");
+    const u32 gMonFrontPic_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/normal.gbapal.lz");
+    const u32 gMonBackPic_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/shiny.gbapal.lz");
+    const u8 gMonIcon_Tepig[] = INCBIN_U8("graphics/pokemon/gen_5/tepig/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/footprint.1bpp");
+    const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/gen_5/tepig/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/shiny.gbapal.lz");
-    const u8 gMonIcon_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/icon.4bpp");
+    const u32 gMonFrontPic_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/normal.gbapal.lz");
+    const u32 gMonBackPic_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/shiny.gbapal.lz");
+    const u8 gMonIcon_Pignite[] = INCBIN_U8("graphics/pokemon/gen_5/pignite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/footprint.1bpp");
+    const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/gen_5/pignite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/shiny.gbapal.lz");
-    const u8 gMonIcon_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/icon.4bpp");
+    const u32 gMonFrontPic_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/normal.gbapal.lz");
+    const u32 gMonBackPic_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/shiny.gbapal.lz");
+    const u8 gMonIcon_Emboar[] = INCBIN_U8("graphics/pokemon/gen_5/emboar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/footprint.1bpp");
+    const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/gen_5/emboar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TEPIG
 
 #if P_FAMILY_OSHAWOTT
-    const u32 gMonFrontPic_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/anim_front.4bpp.lz");
-    const u32 gMonPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/normal.gbapal.lz");
-    const u32 gMonBackPic_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/back.4bpp.lz");
-    const u32 gMonShinyPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/shiny.gbapal.lz");
-    const u8 gMonIcon_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/icon.4bpp");
+    const u32 gMonFrontPic_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/anim_front.4bpp.lz");
+    const u32 gMonPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/normal.gbapal.lz");
+    const u32 gMonBackPic_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/back.4bpp.lz");
+    const u32 gMonShinyPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/shiny.gbapal.lz");
+    const u8 gMonIcon_Oshawott[] = INCBIN_U8("graphics/pokemon/gen_5/oshawott/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/footprint.1bpp");
+    const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/gen_5/oshawott/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/shiny.gbapal.lz");
-    const u8 gMonIcon_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/icon.4bpp");
+    const u32 gMonFrontPic_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/normal.gbapal.lz");
+    const u32 gMonBackPic_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/shiny.gbapal.lz");
+    const u8 gMonIcon_Dewott[] = INCBIN_U8("graphics/pokemon/gen_5/dewott/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/footprint.1bpp");
+    const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/gen_5/dewott/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/back.4bpp.lz");
-    const u32 gMonShinyPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/shiny.gbapal.lz");
-    const u8 gMonIcon_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/icon.4bpp");
+    const u32 gMonFrontPic_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/anim_front.4bpp.lz");
+    const u32 gMonPalette_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/normal.gbapal.lz");
+    const u32 gMonBackPic_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/back.4bpp.lz");
+    const u32 gMonShinyPalette_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/shiny.gbapal.lz");
+    const u8 gMonIcon_Samurott[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/footprint.1bpp");
+    const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_OSHAWOTT
 
 #if P_FAMILY_PATRAT
-    const u32 gMonFrontPic_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/normal.gbapal.lz");
-    const u32 gMonBackPic_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/shiny.gbapal.lz");
-    const u8 gMonIcon_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/icon.4bpp");
+    const u32 gMonFrontPic_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/normal.gbapal.lz");
+    const u32 gMonBackPic_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/shiny.gbapal.lz");
+    const u8 gMonIcon_Patrat[] = INCBIN_U8("graphics/pokemon/gen_5/patrat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/footprint.1bpp");
+    const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/gen_5/patrat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/back.4bpp.lz");
-    const u32 gMonShinyPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/shiny.gbapal.lz");
-    const u8 gMonIcon_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/icon.4bpp");
+    const u32 gMonFrontPic_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/anim_front.4bpp.lz");
+    const u32 gMonPalette_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/normal.gbapal.lz");
+    const u32 gMonBackPic_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/back.4bpp.lz");
+    const u32 gMonShinyPalette_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/shiny.gbapal.lz");
+    const u8 gMonIcon_Watchog[] = INCBIN_U8("graphics/pokemon/gen_5/watchog/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/footprint.1bpp");
+    const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/gen_5/watchog/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PATRAT
 
 #if P_FAMILY_LILLIPUP
-    const u32 gMonFrontPic_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/anim_front.4bpp.lz");
-    const u32 gMonPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/normal.gbapal.lz");
-    const u32 gMonBackPic_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/shiny.gbapal.lz");
-    const u8 gMonIcon_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/icon.4bpp");
+    const u32 gMonFrontPic_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/normal.gbapal.lz");
+    const u32 gMonBackPic_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/shiny.gbapal.lz");
+    const u8 gMonIcon_Lillipup[] = INCBIN_U8("graphics/pokemon/gen_5/lillipup/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/footprint.1bpp");
+    const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/gen_5/lillipup/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/shiny.gbapal.lz");
-    const u8 gMonIcon_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/icon.4bpp");
+    const u32 gMonFrontPic_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/anim_front.4bpp.lz");
+    const u32 gMonPalette_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/normal.gbapal.lz");
+    const u32 gMonBackPic_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/shiny.gbapal.lz");
+    const u8 gMonIcon_Herdier[] = INCBIN_U8("graphics/pokemon/gen_5/herdier/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/footprint.1bpp");
+    const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/gen_5/herdier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/shiny.gbapal.lz");
-    const u8 gMonIcon_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/icon.4bpp");
+    const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/anim_front.4bpp.lz");
+    const u32 gMonPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/normal.gbapal.lz");
+    const u32 gMonBackPic_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/shiny.gbapal.lz");
+    const u8 gMonIcon_Stoutland[] = INCBIN_U8("graphics/pokemon/gen_5/stoutland/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/footprint.1bpp");
+    const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/gen_5/stoutland/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LILLIPUP
 
 #if P_FAMILY_PURRLOIN
-    const u32 gMonFrontPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/normal.gbapal.lz");
-    const u32 gMonBackPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/shiny.gbapal.lz");
-    const u8 gMonIcon_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/icon.4bpp");
+    const u32 gMonFrontPic_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/normal.gbapal.lz");
+    const u32 gMonBackPic_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/shiny.gbapal.lz");
+    const u8 gMonIcon_Purrloin[] = INCBIN_U8("graphics/pokemon/gen_5/purrloin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/footprint.1bpp");
+    const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/gen_5/purrloin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/back.4bpp.lz");
-    const u32 gMonShinyPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/shiny.gbapal.lz");
-    const u8 gMonIcon_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/icon.4bpp");
+    const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/anim_front.4bpp.lz");
+    const u32 gMonPalette_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/normal.gbapal.lz");
+    const u32 gMonBackPic_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/back.4bpp.lz");
+    const u32 gMonShinyPalette_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/shiny.gbapal.lz");
+    const u8 gMonIcon_Liepard[] = INCBIN_U8("graphics/pokemon/gen_5/liepard/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/footprint.1bpp");
+    const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/gen_5/liepard/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PURRLOIN
 
 #if P_FAMILY_PANSAGE
-    const u32 gMonFrontPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/normal.gbapal.lz");
-    const u32 gMonBackPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/shiny.gbapal.lz");
-    const u8 gMonIcon_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/icon.4bpp");
+    const u32 gMonFrontPic_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/normal.gbapal.lz");
+    const u32 gMonBackPic_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/shiny.gbapal.lz");
+    const u8 gMonIcon_Pansage[] = INCBIN_U8("graphics/pokemon/gen_5/pansage/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/footprint.1bpp");
+    const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/gen_5/pansage/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/back.4bpp.lz");
-    const u32 gMonShinyPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/shiny.gbapal.lz");
-    const u8 gMonIcon_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/icon.4bpp");
+    const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/anim_front.4bpp.lz");
+    const u32 gMonPalette_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/normal.gbapal.lz");
+    const u32 gMonBackPic_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/back.4bpp.lz");
+    const u32 gMonShinyPalette_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/shiny.gbapal.lz");
+    const u8 gMonIcon_Simisage[] = INCBIN_U8("graphics/pokemon/gen_5/simisage/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/footprint.1bpp");
+    const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/gen_5/simisage/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PANSAGE
 
 #if P_FAMILY_PANSEAR
-    const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/normal.gbapal.lz");
-    const u32 gMonBackPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/shiny.gbapal.lz");
-    const u8 gMonIcon_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/icon.4bpp");
+    const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/normal.gbapal.lz");
+    const u32 gMonBackPic_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/shiny.gbapal.lz");
+    const u8 gMonIcon_Pansear[] = INCBIN_U8("graphics/pokemon/gen_5/pansear/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/footprint.1bpp");
+    const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/gen_5/pansear/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/back.4bpp.lz");
-    const u32 gMonShinyPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/shiny.gbapal.lz");
-    const u8 gMonIcon_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/icon.4bpp");
+    const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/anim_front.4bpp.lz");
+    const u32 gMonPalette_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/normal.gbapal.lz");
+    const u32 gMonBackPic_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/back.4bpp.lz");
+    const u32 gMonShinyPalette_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/shiny.gbapal.lz");
+    const u8 gMonIcon_Simisear[] = INCBIN_U8("graphics/pokemon/gen_5/simisear/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/footprint.1bpp");
+    const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/gen_5/simisear/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PANSEAR
 
 #if P_FAMILY_PANPOUR
-    const u32 gMonFrontPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/anim_front.4bpp.lz");
-    const u32 gMonPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/normal.gbapal.lz");
-    const u32 gMonBackPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/back.4bpp.lz");
-    const u32 gMonShinyPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/shiny.gbapal.lz");
-    const u8 gMonIcon_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/icon.4bpp");
+    const u32 gMonFrontPic_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/anim_front.4bpp.lz");
+    const u32 gMonPalette_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/normal.gbapal.lz");
+    const u32 gMonBackPic_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/back.4bpp.lz");
+    const u32 gMonShinyPalette_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/shiny.gbapal.lz");
+    const u8 gMonIcon_Panpour[] = INCBIN_U8("graphics/pokemon/gen_5/panpour/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/footprint.1bpp");
+    const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/gen_5/panpour/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/back.4bpp.lz");
-    const u32 gMonShinyPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/shiny.gbapal.lz");
-    const u8 gMonIcon_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/icon.4bpp");
+    const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/anim_front.4bpp.lz");
+    const u32 gMonPalette_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/normal.gbapal.lz");
+    const u32 gMonBackPic_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/back.4bpp.lz");
+    const u32 gMonShinyPalette_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/shiny.gbapal.lz");
+    const u8 gMonIcon_Simipour[] = INCBIN_U8("graphics/pokemon/gen_5/simipour/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/footprint.1bpp");
+    const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/gen_5/simipour/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PANPOUR
 
 #if P_FAMILY_MUNNA
-    const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/anim_front.4bpp.lz");
-    const u32 gMonPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/normal.gbapal.lz");
-    const u32 gMonBackPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/shiny.gbapal.lz");
-    const u8 gMonIcon_Munna[] = INCBIN_U8("graphics/pokemon/munna/icon.4bpp");
+    const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/anim_front.4bpp.lz");
+    const u32 gMonPalette_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/normal.gbapal.lz");
+    const u32 gMonBackPic_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/shiny.gbapal.lz");
+    const u8 gMonIcon_Munna[] = INCBIN_U8("graphics/pokemon/gen_5/munna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/munna/footprint.1bpp");
+    const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/gen_5/munna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/shiny.gbapal.lz");
-    const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/icon.4bpp");
+    const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/anim_front.4bpp.lz");
+    const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/normal.gbapal.lz");
+    const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/shiny.gbapal.lz");
+    const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/gen_5/musharna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/footprint.1bpp");
+    const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/gen_5/musharna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MUNNA
 
 #if P_FAMILY_PIDOVE
-    const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/normal.gbapal.lz");
-    const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/shiny.gbapal.lz");
-    const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/icon.4bpp");
+    const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/normal.gbapal.lz");
+    const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/shiny.gbapal.lz");
+    const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/gen_5/pidove/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/footprint.1bpp");
+    const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/gen_5/pidove/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/shiny.gbapal.lz");
-    const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/icon.4bpp");
+    const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/normal.gbapal.lz");
+    const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/shiny.gbapal.lz");
+    const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/gen_5/tranquill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/footprint.1bpp");
+    const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/gen_5/tranquill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/shiny.gbapal.lz");
-    const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/icon.4bpp");
+    const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/anim_front.4bpp.lz");
+    const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/normal.gbapal.lz");
+    const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/shiny.gbapal.lz");
+    const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/footprint.1bpp");
+    const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/anim_frontf.4bpp.lz");
+    const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/normalf.gbapal.lz");
+    const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/backf.4bpp.lz");
+    const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/shinyf.gbapal.lz");
+    const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/iconf.4bpp");
 #endif //P_FAMILY_PIDOVE
 
 #if P_FAMILY_BLITZLE
-    const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/normal.gbapal.lz");
-    const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/shiny.gbapal.lz");
-    const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/icon.4bpp");
+    const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/normal.gbapal.lz");
+    const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/shiny.gbapal.lz");
+    const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/gen_5/blitzle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/footprint.1bpp");
+    const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/gen_5/blitzle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/shiny.gbapal.lz");
-    const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/icon.4bpp");
+    const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/normal.gbapal.lz");
+    const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/shiny.gbapal.lz");
+    const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/gen_5/zebstrika/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/footprint.1bpp");
+    const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/gen_5/zebstrika/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BLITZLE
 
 #if P_FAMILY_ROGGENROLA
-    const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/anim_front.4bpp.lz");
-    const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/normal.gbapal.lz");
-    const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/back.4bpp.lz");
-    const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/shiny.gbapal.lz");
-    const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/icon.4bpp");
+    const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/anim_front.4bpp.lz");
+    const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/normal.gbapal.lz");
+    const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/back.4bpp.lz");
+    const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/shiny.gbapal.lz");
+    const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/gen_5/roggenrola/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/footprint.1bpp");
+    const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/gen_5/roggenrola/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/back.4bpp.lz");
-    const u32 gMonShinyPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/shiny.gbapal.lz");
-    const u8 gMonIcon_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/icon.4bpp");
+    const u32 gMonFrontPic_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/anim_front.4bpp.lz");
+    const u32 gMonPalette_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/normal.gbapal.lz");
+    const u32 gMonBackPic_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/back.4bpp.lz");
+    const u32 gMonShinyPalette_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/shiny.gbapal.lz");
+    const u8 gMonIcon_Boldore[] = INCBIN_U8("graphics/pokemon/gen_5/boldore/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/footprint.1bpp");
+    const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/gen_5/boldore/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/shiny.gbapal.lz");
-    const u8 gMonIcon_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/icon.4bpp");
+    const u32 gMonFrontPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/normal.gbapal.lz");
+    const u32 gMonBackPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/shiny.gbapal.lz");
+    const u8 gMonIcon_Gigalith[] = INCBIN_U8("graphics/pokemon/gen_5/gigalith/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/footprint.1bpp");
+    const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gen_5/gigalith/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ROGGENROLA
 
 #if P_FAMILY_WOOBAT
-    const u32 gMonFrontPic_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/normal.gbapal.lz");
-    const u32 gMonBackPic_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/shiny.gbapal.lz");
-    const u8 gMonIcon_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/icon.4bpp");
+    const u32 gMonFrontPic_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/normal.gbapal.lz");
+    const u32 gMonBackPic_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/shiny.gbapal.lz");
+    const u8 gMonIcon_Woobat[] = INCBIN_U8("graphics/pokemon/gen_5/woobat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/footprint.1bpp");
+    const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/gen_5/woobat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/shiny.gbapal.lz");
-    const u8 gMonIcon_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/icon.4bpp");
+    const u32 gMonFrontPic_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/normal.gbapal.lz");
+    const u32 gMonBackPic_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/shiny.gbapal.lz");
+    const u8 gMonIcon_Swoobat[] = INCBIN_U8("graphics/pokemon/gen_5/swoobat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/footprint.1bpp");
+    const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/gen_5/swoobat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WOOBAT
 
 #if P_FAMILY_DRILBUR
-    const u32 gMonFrontPic_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/anim_front.4bpp.lz");
-    const u32 gMonPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/normal.gbapal.lz");
-    const u32 gMonBackPic_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/shiny.gbapal.lz");
-    const u8 gMonIcon_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/icon.4bpp");
+    const u32 gMonFrontPic_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/normal.gbapal.lz");
+    const u32 gMonBackPic_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/shiny.gbapal.lz");
+    const u8 gMonIcon_Drilbur[] = INCBIN_U8("graphics/pokemon/gen_5/drilbur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/footprint.1bpp");
+    const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/gen_5/drilbur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/back.4bpp.lz");
-    const u32 gMonShinyPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/shiny.gbapal.lz");
-    const u8 gMonIcon_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/icon.4bpp");
+    const u32 gMonFrontPic_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/anim_front.4bpp.lz");
+    const u32 gMonPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/normal.gbapal.lz");
+    const u32 gMonBackPic_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/back.4bpp.lz");
+    const u32 gMonShinyPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/shiny.gbapal.lz");
+    const u8 gMonIcon_Excadrill[] = INCBIN_U8("graphics/pokemon/gen_5/excadrill/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/footprint.1bpp");
+    const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/gen_5/excadrill/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRILBUR
 
 #if P_FAMILY_AUDINO
-    const u32 gMonFrontPic_Audino[] = INCBIN_U32("graphics/pokemon/audino/anim_front.4bpp.lz");
-    const u32 gMonPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/normal.gbapal.lz");
-    const u32 gMonBackPic_Audino[] = INCBIN_U32("graphics/pokemon/audino/back.4bpp.lz");
-    const u32 gMonShinyPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/shiny.gbapal.lz");
-    const u8 gMonIcon_Audino[] = INCBIN_U8("graphics/pokemon/audino/icon.4bpp");
+    const u32 gMonFrontPic_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/anim_front.4bpp.lz");
+    const u32 gMonPalette_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/normal.gbapal.lz");
+    const u32 gMonBackPic_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/back.4bpp.lz");
+    const u32 gMonShinyPalette_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/shiny.gbapal.lz");
+    const u8 gMonIcon_Audino[] = INCBIN_U8("graphics/pokemon/gen_5/audino/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/audino/footprint.1bpp");
+    const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/gen_5/audino/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz");
-    const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/front.4bpp.lz");
+    const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/gen_5/audino/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_AUDINO
 
 #if P_FAMILY_TIMBURR
-    const u32 gMonFrontPic_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/anim_front.4bpp.lz");
-    const u32 gMonPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/normal.gbapal.lz");
-    const u32 gMonBackPic_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/back.4bpp.lz");
-    const u32 gMonShinyPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/shiny.gbapal.lz");
-    const u8 gMonIcon_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/icon.4bpp");
+    const u32 gMonFrontPic_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/anim_front.4bpp.lz");
+    const u32 gMonPalette_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/normal.gbapal.lz");
+    const u32 gMonBackPic_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/back.4bpp.lz");
+    const u32 gMonShinyPalette_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/shiny.gbapal.lz");
+    const u8 gMonIcon_Timburr[] = INCBIN_U8("graphics/pokemon/gen_5/timburr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/footprint.1bpp");
+    const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/gen_5/timburr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/shiny.gbapal.lz");
-    const u8 gMonIcon_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/icon.4bpp");
+    const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/normal.gbapal.lz");
+    const u32 gMonBackPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/shiny.gbapal.lz");
+    const u8 gMonIcon_Gurdurr[] = INCBIN_U8("graphics/pokemon/gen_5/gurdurr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/footprint.1bpp");
+    const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gen_5/gurdurr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/back.4bpp.lz");
-    const u32 gMonShinyPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/shiny.gbapal.lz");
-    const u8 gMonIcon_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/icon.4bpp");
+    const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/anim_front.4bpp.lz");
+    const u32 gMonPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/normal.gbapal.lz");
+    const u32 gMonBackPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/back.4bpp.lz");
+    const u32 gMonShinyPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/shiny.gbapal.lz");
+    const u8 gMonIcon_Conkeldurr[] = INCBIN_U8("graphics/pokemon/gen_5/conkeldurr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/footprint.1bpp");
+    const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/gen_5/conkeldurr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TIMBURR
 
 #if P_FAMILY_TYMPOLE
-    const u32 gMonFrontPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/normal.gbapal.lz");
-    const u32 gMonBackPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/shiny.gbapal.lz");
-    const u8 gMonIcon_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/icon.4bpp");
+    const u32 gMonFrontPic_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/normal.gbapal.lz");
+    const u32 gMonBackPic_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/shiny.gbapal.lz");
+    const u8 gMonIcon_Tympole[] = INCBIN_U8("graphics/pokemon/gen_5/tympole/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/footprint.1bpp");
+    const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/gen_5/tympole/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/back.4bpp.lz");
-    const u32 gMonShinyPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/shiny.gbapal.lz");
-    const u8 gMonIcon_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/icon.4bpp");
+    const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/anim_front.4bpp.lz");
+    const u32 gMonPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/normal.gbapal.lz");
+    const u32 gMonBackPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/back.4bpp.lz");
+    const u32 gMonShinyPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/shiny.gbapal.lz");
+    const u8 gMonIcon_Palpitoad[] = INCBIN_U8("graphics/pokemon/gen_5/palpitoad/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/footprint.1bpp");
+    const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/gen_5/palpitoad/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/back.4bpp.lz");
-    const u32 gMonShinyPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/shiny.gbapal.lz");
-    const u8 gMonIcon_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/icon.4bpp");
+    const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/anim_front.4bpp.lz");
+    const u32 gMonPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/normal.gbapal.lz");
+    const u32 gMonBackPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/back.4bpp.lz");
+    const u32 gMonShinyPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/shiny.gbapal.lz");
+    const u8 gMonIcon_Seismitoad[] = INCBIN_U8("graphics/pokemon/gen_5/seismitoad/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/footprint.1bpp");
+    const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/gen_5/seismitoad/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TYMPOLE
 
 #if P_FAMILY_THROH
-    const u32 gMonFrontPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/anim_front.4bpp.lz");
-    const u32 gMonPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/normal.gbapal.lz");
-    const u32 gMonBackPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/back.4bpp.lz");
-    const u32 gMonShinyPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/shiny.gbapal.lz");
-    const u8 gMonIcon_Throh[] = INCBIN_U8("graphics/pokemon/throh/icon.4bpp");
+    const u32 gMonFrontPic_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/anim_front.4bpp.lz");
+    const u32 gMonPalette_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/normal.gbapal.lz");
+    const u32 gMonBackPic_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/back.4bpp.lz");
+    const u32 gMonShinyPalette_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/shiny.gbapal.lz");
+    const u8 gMonIcon_Throh[] = INCBIN_U8("graphics/pokemon/gen_5/throh/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/throh/footprint.1bpp");
+    const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/gen_5/throh/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_THROH
 
 #if P_FAMILY_SAWK
-    const u32 gMonFrontPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/normal.gbapal.lz");
-    const u32 gMonBackPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/shiny.gbapal.lz");
-    const u8 gMonIcon_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/icon.4bpp");
+    const u32 gMonFrontPic_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/normal.gbapal.lz");
+    const u32 gMonBackPic_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/shiny.gbapal.lz");
+    const u8 gMonIcon_Sawk[] = INCBIN_U8("graphics/pokemon/gen_5/sawk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/footprint.1bpp");
+    const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/gen_5/sawk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SAWK
 
 #if P_FAMILY_SEWADDLE
-    const u32 gMonFrontPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/normal.gbapal.lz");
-    const u32 gMonBackPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/shiny.gbapal.lz");
-    const u8 gMonIcon_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/icon.4bpp");
+    const u32 gMonFrontPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/normal.gbapal.lz");
+    const u32 gMonBackPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/shiny.gbapal.lz");
+    const u8 gMonIcon_Sewaddle[] = INCBIN_U8("graphics/pokemon/gen_5/sewaddle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/footprint.1bpp");
+    const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/gen_5/sewaddle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/shiny.gbapal.lz");
-    const u8 gMonIcon_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/icon.4bpp");
+    const u32 gMonFrontPic_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/normal.gbapal.lz");
+    const u32 gMonBackPic_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/shiny.gbapal.lz");
+    const u8 gMonIcon_Swadloon[] = INCBIN_U8("graphics/pokemon/gen_5/swadloon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/footprint.1bpp");
+    const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/gen_5/swadloon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/back.4bpp.lz");
-    const u32 gMonShinyPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/shiny.gbapal.lz");
-    const u8 gMonIcon_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/icon.4bpp");
+    const u32 gMonFrontPic_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/anim_front.4bpp.lz");
+    const u32 gMonPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/normal.gbapal.lz");
+    const u32 gMonBackPic_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/back.4bpp.lz");
+    const u32 gMonShinyPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/shiny.gbapal.lz");
+    const u8 gMonIcon_Leavanny[] = INCBIN_U8("graphics/pokemon/gen_5/leavanny/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/footprint.1bpp");
+    const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/gen_5/leavanny/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SEWADDLE
 
 #if P_FAMILY_VENIPEDE
-    const u32 gMonFrontPic_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/anim_front.4bpp.lz");
-    const u32 gMonPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/normal.gbapal.lz");
-    const u32 gMonBackPic_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/back.4bpp.lz");
-    const u32 gMonShinyPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/shiny.gbapal.lz");
-    const u8 gMonIcon_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/icon.4bpp");
+    const u32 gMonFrontPic_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/anim_front.4bpp.lz");
+    const u32 gMonPalette_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/normal.gbapal.lz");
+    const u32 gMonBackPic_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/back.4bpp.lz");
+    const u32 gMonShinyPalette_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/shiny.gbapal.lz");
+    const u8 gMonIcon_Venipede[] = INCBIN_U8("graphics/pokemon/gen_5/venipede/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/footprint.1bpp");
+    const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/gen_5/venipede/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/back.4bpp.lz");
-    const u32 gMonShinyPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/shiny.gbapal.lz");
-    const u8 gMonIcon_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/icon.4bpp");
+    const u32 gMonFrontPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/anim_front.4bpp.lz");
+    const u32 gMonPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/normal.gbapal.lz");
+    const u32 gMonBackPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/back.4bpp.lz");
+    const u32 gMonShinyPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/shiny.gbapal.lz");
+    const u8 gMonIcon_Whirlipede[] = INCBIN_U8("graphics/pokemon/gen_5/whirlipede/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/footprint.1bpp");
+    const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/gen_5/whirlipede/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/shiny.gbapal.lz");
-    const u8 gMonIcon_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/icon.4bpp");
+    const u32 gMonFrontPic_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/normal.gbapal.lz");
+    const u32 gMonBackPic_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/shiny.gbapal.lz");
+    const u8 gMonIcon_Scolipede[] = INCBIN_U8("graphics/pokemon/gen_5/scolipede/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/footprint.1bpp");
+    const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/gen_5/scolipede/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VENIPEDE
 
 #if P_FAMILY_COTTONEE
-    const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/normal.gbapal.lz");
-    const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/shiny.gbapal.lz");
-    const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/icon.4bpp");
+    const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/normal.gbapal.lz");
+    const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/shiny.gbapal.lz");
+    const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/gen_5/cottonee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/footprint.1bpp");
+    const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/gen_5/cottonee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/back.4bpp.lz");
-    const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/shiny.gbapal.lz");
-    const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/icon.4bpp");
+    const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/anim_front.4bpp.lz");
+    const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/normal.gbapal.lz");
+    const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/back.4bpp.lz");
+    const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/shiny.gbapal.lz");
+    const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/gen_5/whimsicott/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/footprint.1bpp");
+    const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/gen_5/whimsicott/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_COTTONEE
 
 #if P_FAMILY_PETILIL
-    const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/anim_front.4bpp.lz");
-    const u32 gMonPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/normal.gbapal.lz");
-    const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/back.4bpp.lz");
-    const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/shiny.gbapal.lz");
-    const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/icon.4bpp");
+    const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/anim_front.4bpp.lz");
+    const u32 gMonPalette_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/normal.gbapal.lz");
+    const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/back.4bpp.lz");
+    const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/shiny.gbapal.lz");
+    const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/gen_5/petilil/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/footprint.1bpp");
+    const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/gen_5/petilil/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/shiny.gbapal.lz");
-    const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/icon.4bpp");
+    const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/normal.gbapal.lz");
+    const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/shiny.gbapal.lz");
+    const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/footprint.1bpp");
+    const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_PETILIL
 
 #if P_FAMILY_BASCULIN
-    const u32 gMonFrontPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/anim_front.4bpp.lz");
-    const u32 gMonPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/normal.gbapal.lz");
-    const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/back.4bpp.lz");
-    const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/shiny.gbapal.lz");
-    const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/basculin/icon.4bpp");
+    const u32 gMonFrontPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/anim_front.4bpp.lz");
+    const u32 gMonPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/normal.gbapal.lz");
+    const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/back.4bpp.lz");
+    const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/shiny.gbapal.lz");
+    const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Basculin[] = INCBIN_U8("graphics/pokemon/basculin/footprint.1bpp");
+    const u8 gMonFootprint_Basculin[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz");
-    const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz");
-    const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/back.4bpp.lz");
-    const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/shiny.gbapal.lz");
-    const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp");
+    const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/front.4bpp.lz");
+    const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/normal.gbapal.lz");
+    const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/back.4bpp.lz");
+    const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/shiny.gbapal.lz");
+    const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/blue_striped/icon.4bpp");
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/front.4bpp.lz");
-    const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/normal.gbapal.lz");
-    const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/front.4bpp.lz");
+    const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/normal.gbapal.lz");
+    const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/back.4bpp.lz");
+    const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/shiny.gbapal.lz");
+    const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/white_striped/icon.4bpp");
 
-    const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
-    const u32 gMonPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
-    const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
-    const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
-    const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp");
+    const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/front.4bpp.lz");
+    const u32 gMonPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/normal.gbapal.lz");
+    const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/back.4bpp.lz");
+    const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/shiny.gbapal.lz");
+    const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp");
+    //const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz");
-    const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz");
-    const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz");
-    const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz");
-    const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp");
+    const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/front.4bpp.lz");
+    const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/normal.gbapal.lz");
+    const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/back.4bpp.lz");
+    const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/shiny.gbapal.lz");
+    const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/female/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_BASCULIN
 
 #if P_FAMILY_SANDILE
-    const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/normal.gbapal.lz");
-    const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/shiny.gbapal.lz");
-    const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/icon.4bpp");
+    const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/normal.gbapal.lz");
+    const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/shiny.gbapal.lz");
+    const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/gen_5/sandile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/footprint.1bpp");
+    const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/gen_5/sandile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/back.4bpp.lz");
-    const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/shiny.gbapal.lz");
-    const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/icon.4bpp");
+    const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/anim_front.4bpp.lz");
+    const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/normal.gbapal.lz");
+    const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/back.4bpp.lz");
+    const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/shiny.gbapal.lz");
+    const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/gen_5/krokorok/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/footprint.1bpp");
+    const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/gen_5/krokorok/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/shiny.gbapal.lz");
-    const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/icon.4bpp");
+    const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/normal.gbapal.lz");
+    const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/shiny.gbapal.lz");
+    const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/gen_5/krookodile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/footprint.1bpp");
+    const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/gen_5/krookodile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SANDILE
 
 #if P_FAMILY_DARUMAKA
-    const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/anim_front.4bpp.lz");
-    const u32 gMonPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/normal.gbapal.lz");
-    const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/back.4bpp.lz");
-    const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/shiny.gbapal.lz");
-    const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/icon.4bpp");
+    const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/anim_front.4bpp.lz");
+    const u32 gMonPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/normal.gbapal.lz");
+    const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/back.4bpp.lz");
+    const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/shiny.gbapal.lz");
+    const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/footprint.1bpp");
+    const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz");
-    const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz");
-    const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz");
-    const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz");
-    const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp");
+    const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/anim_front.4bpp.lz");
+    const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/normal.gbapal.lz");
+    const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/back.4bpp.lz");
+    const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/shiny.gbapal.lz");
+    const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/footprint.1bpp");
+    const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz");
-    const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz");
-    const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz");
-    const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz");
-    const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp");
+    const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.4bpp.lz");
+    const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/normal.gbapal.lz");
+    const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/back.4bpp.lz");
+    const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.gbapal.lz");
+    const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/zen_mode/icon.4bpp");
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/front.4bpp.lz");
-    const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp");
+    const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/front.4bpp.lz");
+    const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz");
-    const u32 gMonPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_DarmanitanGalarianStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp");
+    const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/front.4bpp.lz");
+    const u32 gMonPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_DarmanitanGalarianStandardMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz");
-    const u32 gMonPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp");
+    const u32 gMonFrontPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.4bpp.lz");
+    const u32 gMonPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_DARUMAKA
 
 #if P_FAMILY_MARACTUS
-    const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/anim_front.4bpp.lz");
-    const u32 gMonPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/normal.gbapal.lz");
-    const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/shiny.gbapal.lz");
-    const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/icon.4bpp");
+    const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/normal.gbapal.lz");
+    const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/shiny.gbapal.lz");
+    const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/gen_5/maractus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/footprint.1bpp");
+    const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/gen_5/maractus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MARACTUS
 
 #if P_FAMILY_DWEBBLE
-    const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/normal.gbapal.lz");
-    const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/shiny.gbapal.lz");
-    const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/icon.4bpp");
+    const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/normal.gbapal.lz");
+    const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/shiny.gbapal.lz");
+    const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/gen_5/dwebble/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/footprint.1bpp");
+    const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/gen_5/dwebble/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/shiny.gbapal.lz");
-    const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/icon.4bpp");
+    const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/normal.gbapal.lz");
+    const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/shiny.gbapal.lz");
+    const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/gen_5/crustle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/footprint.1bpp");
+    const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/gen_5/crustle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DWEBBLE
 
 #if P_FAMILY_SCRAGGY
-    const u32 gMonFrontPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/normal.gbapal.lz");
-    const u32 gMonBackPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/shiny.gbapal.lz");
-    const u8 gMonIcon_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/icon.4bpp");
+    const u32 gMonFrontPic_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/normal.gbapal.lz");
+    const u32 gMonBackPic_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/shiny.gbapal.lz");
+    const u8 gMonIcon_Scraggy[] = INCBIN_U8("graphics/pokemon/gen_5/scraggy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/footprint.1bpp");
+    const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/gen_5/scraggy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/shiny.gbapal.lz");
-    const u8 gMonIcon_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/icon.4bpp");
+    const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/normal.gbapal.lz");
+    const u32 gMonBackPic_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/shiny.gbapal.lz");
+    const u8 gMonIcon_Scrafty[] = INCBIN_U8("graphics/pokemon/gen_5/scrafty/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/footprint.1bpp");
+    const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/gen_5/scrafty/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SCRAGGY
 
 #if P_FAMILY_SIGILYPH
-    const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/normal.gbapal.lz");
-    const u32 gMonBackPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/shiny.gbapal.lz");
-    const u8 gMonIcon_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/icon.4bpp");
+    const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/normal.gbapal.lz");
+    const u32 gMonBackPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/shiny.gbapal.lz");
+    const u8 gMonIcon_Sigilyph[] = INCBIN_U8("graphics/pokemon/gen_5/sigilyph/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/footprint.1bpp");
+    const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/gen_5/sigilyph/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SIGILYPH
 
 #if P_FAMILY_YAMASK
-    const u32 gMonFrontPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/anim_front.4bpp.lz");
-    const u32 gMonPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/normal.gbapal.lz");
-    const u32 gMonBackPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/shiny.gbapal.lz");
-    const u8 gMonIcon_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/icon.4bpp");
+    const u32 gMonFrontPic_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/anim_front.4bpp.lz");
+    const u32 gMonPalette_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/normal.gbapal.lz");
+    const u32 gMonBackPic_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/shiny.gbapal.lz");
+    const u8 gMonIcon_Yamask[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/footprint.1bpp");
+    const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/shiny.gbapal.lz");
-    const u8 gMonIcon_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/icon.4bpp");
+    const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/normal.gbapal.lz");
+    const u32 gMonBackPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/shiny.gbapal.lz");
+    const u8 gMonIcon_Cofagrigus[] = INCBIN_U8("graphics/pokemon/gen_5/cofagrigus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/footprint.1bpp");
+    const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/gen_5/cofagrigus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz");
-    const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp");
+    const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/front.4bpp.lz");
+    const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/galarian/icon.4bpp");
 
-    const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz");
-    const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz");
-    const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz");
-    const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp");
+    const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/front.4bpp.lz");
+    const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/normal.gbapal.lz");
+    const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/shiny.gbapal.lz");
+    const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/gen_8/runerigus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/footprint.1bpp");
+    const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/gen_8/runerigus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_YAMASK
 
 #if P_FAMILY_TIRTOUGA
-    const u32 gMonFrontPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/normal.gbapal.lz");
-    const u32 gMonBackPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/shiny.gbapal.lz");
-    const u8 gMonIcon_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/icon.4bpp");
+    const u32 gMonFrontPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/normal.gbapal.lz");
+    const u32 gMonBackPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/shiny.gbapal.lz");
+    const u8 gMonIcon_Tirtouga[] = INCBIN_U8("graphics/pokemon/gen_5/tirtouga/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/footprint.1bpp");
+    const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/gen_5/tirtouga/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/back.4bpp.lz");
-    const u32 gMonShinyPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/shiny.gbapal.lz");
-    const u8 gMonIcon_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/icon.4bpp");
+    const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/anim_front.4bpp.lz");
+    const u32 gMonPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/normal.gbapal.lz");
+    const u32 gMonBackPic_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/back.4bpp.lz");
+    const u32 gMonShinyPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/shiny.gbapal.lz");
+    const u8 gMonIcon_Carracosta[] = INCBIN_U8("graphics/pokemon/gen_5/carracosta/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/footprint.1bpp");
+    const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/gen_5/carracosta/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TIRTOUGA
 
 #if P_FAMILY_ARCHEN
-    const u32 gMonFrontPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/anim_front.4bpp.lz");
-    const u32 gMonPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/normal.gbapal.lz");
-    const u32 gMonBackPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/shiny.gbapal.lz");
-    const u8 gMonIcon_Archen[] = INCBIN_U8("graphics/pokemon/archen/icon.4bpp");
+    const u32 gMonFrontPic_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/anim_front.4bpp.lz");
+    const u32 gMonPalette_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/normal.gbapal.lz");
+    const u32 gMonBackPic_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/shiny.gbapal.lz");
+    const u8 gMonIcon_Archen[] = INCBIN_U8("graphics/pokemon/gen_5/archen/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/archen/footprint.1bpp");
+    const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/gen_5/archen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/back.4bpp.lz");
-    const u32 gMonShinyPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/shiny.gbapal.lz");
-    const u8 gMonIcon_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/icon.4bpp");
+    const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/anim_front.4bpp.lz");
+    const u32 gMonPalette_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/normal.gbapal.lz");
+    const u32 gMonBackPic_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/back.4bpp.lz");
+    const u32 gMonShinyPalette_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/shiny.gbapal.lz");
+    const u8 gMonIcon_Archeops[] = INCBIN_U8("graphics/pokemon/gen_5/archeops/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/footprint.1bpp");
+    const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/gen_5/archeops/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ARCHEN
 
 #if P_FAMILY_TRUBBISH
-    const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/normal.gbapal.lz");
-    const u32 gMonBackPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/shiny.gbapal.lz");
-    const u8 gMonIcon_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/icon.4bpp");
+    const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/normal.gbapal.lz");
+    const u32 gMonBackPic_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/shiny.gbapal.lz");
+    const u8 gMonIcon_Trubbish[] = INCBIN_U8("graphics/pokemon/gen_5/trubbish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/footprint.1bpp");
+    const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/gen_5/trubbish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/shiny.gbapal.lz");
-    const u8 gMonIcon_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/icon.4bpp");
+    const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/normal.gbapal.lz");
+    const u32 gMonBackPic_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/shiny.gbapal.lz");
+    const u8 gMonIcon_Garbodor[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/footprint.1bpp");
+    const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/garbodor/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_TRUBBISH
 
 #if P_FAMILY_ZORUA
-    const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/normal.gbapal.lz");
-    const u32 gMonBackPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/shiny.gbapal.lz");
-    const u8 gMonIcon_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/icon.4bpp");
+    const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/normal.gbapal.lz");
+    const u32 gMonBackPic_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/shiny.gbapal.lz");
+    const u8 gMonIcon_Zorua[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/footprint.1bpp");
+    const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/shiny.gbapal.lz");
-    const u8 gMonIcon_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/icon.4bpp");
+    const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/normal.gbapal.lz");
+    const u32 gMonBackPic_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/shiny.gbapal.lz");
+    const u8 gMonIcon_Zoroark[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/footprint.1bpp");
+    const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/hisuian/icon.4bpp");
 
-    const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_ZORUA
 
 #if P_FAMILY_MINCCINO
-    const u32 gMonFrontPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/anim_front.4bpp.lz");
-    const u32 gMonPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/normal.gbapal.lz");
-    const u32 gMonBackPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/back.4bpp.lz");
-    const u32 gMonShinyPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/shiny.gbapal.lz");
-    const u8 gMonIcon_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/icon.4bpp");
+    const u32 gMonFrontPic_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/anim_front.4bpp.lz");
+    const u32 gMonPalette_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/normal.gbapal.lz");
+    const u32 gMonBackPic_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/back.4bpp.lz");
+    const u32 gMonShinyPalette_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/shiny.gbapal.lz");
+    const u8 gMonIcon_Minccino[] = INCBIN_U8("graphics/pokemon/gen_5/minccino/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/footprint.1bpp");
+    const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/gen_5/minccino/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/shiny.gbapal.lz");
-    const u8 gMonIcon_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/icon.4bpp");
+    const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/normal.gbapal.lz");
+    const u32 gMonBackPic_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/shiny.gbapal.lz");
+    const u8 gMonIcon_Cinccino[] = INCBIN_U8("graphics/pokemon/gen_5/cinccino/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/footprint.1bpp");
+    const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/gen_5/cinccino/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MINCCINO
 
 #if P_FAMILY_GOTHITA
-    const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/anim_front.4bpp.lz");
-    const u32 gMonPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/normal.gbapal.lz");
-    const u32 gMonBackPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/shiny.gbapal.lz");
-    const u8 gMonIcon_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/icon.4bpp");
+    const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/normal.gbapal.lz");
+    const u32 gMonBackPic_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/shiny.gbapal.lz");
+    const u8 gMonIcon_Gothita[] = INCBIN_U8("graphics/pokemon/gen_5/gothita/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/footprint.1bpp");
+    const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gen_5/gothita/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/shiny.gbapal.lz");
-    const u8 gMonIcon_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/icon.4bpp");
+    const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/normal.gbapal.lz");
+    const u32 gMonBackPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/shiny.gbapal.lz");
+    const u8 gMonIcon_Gothorita[] = INCBIN_U8("graphics/pokemon/gen_5/gothorita/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/footprint.1bpp");
+    const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gen_5/gothorita/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/shiny.gbapal.lz");
-    const u8 gMonIcon_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/icon.4bpp");
+    const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/normal.gbapal.lz");
+    const u32 gMonBackPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/shiny.gbapal.lz");
+    const u8 gMonIcon_Gothitelle[] = INCBIN_U8("graphics/pokemon/gen_5/gothitelle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/footprint.1bpp");
+    const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gen_5/gothitelle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GOTHITA
 
 #if P_FAMILY_SOLOSIS
-    const u32 gMonFrontPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/anim_front.4bpp.lz");
-    const u32 gMonPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/normal.gbapal.lz");
-    const u32 gMonBackPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/back.4bpp.lz");
-    const u32 gMonShinyPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/shiny.gbapal.lz");
-    const u8 gMonIcon_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/icon.4bpp");
+    const u32 gMonFrontPic_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/anim_front.4bpp.lz");
+    const u32 gMonPalette_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/normal.gbapal.lz");
+    const u32 gMonBackPic_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/back.4bpp.lz");
+    const u32 gMonShinyPalette_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/shiny.gbapal.lz");
+    const u8 gMonIcon_Solosis[] = INCBIN_U8("graphics/pokemon/gen_5/solosis/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/footprint.1bpp");
+    const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/gen_5/solosis/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/shiny.gbapal.lz");
-    const u8 gMonIcon_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/icon.4bpp");
+    const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/normal.gbapal.lz");
+    const u32 gMonBackPic_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/shiny.gbapal.lz");
+    const u8 gMonIcon_Duosion[] = INCBIN_U8("graphics/pokemon/gen_5/duosion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/footprint.1bpp");
+    const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/gen_5/duosion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/shiny.gbapal.lz");
-    const u8 gMonIcon_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/icon.4bpp");
+    const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/normal.gbapal.lz");
+    const u32 gMonBackPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/shiny.gbapal.lz");
+    const u8 gMonIcon_Reuniclus[] = INCBIN_U8("graphics/pokemon/gen_5/reuniclus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/footprint.1bpp");
+    const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/gen_5/reuniclus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SOLOSIS
 
 #if P_FAMILY_DUCKLETT
-    const u32 gMonFrontPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/normal.gbapal.lz");
-    const u32 gMonBackPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/shiny.gbapal.lz");
-    const u8 gMonIcon_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/icon.4bpp");
+    const u32 gMonFrontPic_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/normal.gbapal.lz");
+    const u32 gMonBackPic_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/shiny.gbapal.lz");
+    const u8 gMonIcon_Ducklett[] = INCBIN_U8("graphics/pokemon/gen_5/ducklett/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/footprint.1bpp");
+    const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/gen_5/ducklett/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/shiny.gbapal.lz");
-    const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/icon.4bpp");
+    const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/normal.gbapal.lz");
+    const u32 gMonBackPic_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/shiny.gbapal.lz");
+    const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/gen_5/swanna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/footprint.1bpp");
+    const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/gen_5/swanna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DUCKLETT
 
 #if P_FAMILY_VANILLITE
-    const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/anim_front.4bpp.lz");
-    const u32 gMonPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/normal.gbapal.lz");
-    const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/shiny.gbapal.lz");
-    const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/icon.4bpp");
+    const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/normal.gbapal.lz");
+    const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/shiny.gbapal.lz");
+    const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/gen_5/vanillite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/footprint.1bpp");
+    const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/gen_5/vanillite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/shiny.gbapal.lz");
-    const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/icon.4bpp");
+    const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/normal.gbapal.lz");
+    const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/shiny.gbapal.lz");
+    const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/gen_5/vanillish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/footprint.1bpp");
+    const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/gen_5/vanillish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/shiny.gbapal.lz");
-    const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/icon.4bpp");
+    const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/normal.gbapal.lz");
+    const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/shiny.gbapal.lz");
+    const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/gen_5/vanilluxe/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/footprint.1bpp");
+    const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/gen_5/vanilluxe/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VANILLITE
 
 #if P_FAMILY_DEERLING
-    const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/anim_front.4bpp.lz");
-    const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/back.4bpp.lz");
+    const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/anim_front.4bpp.lz");
+    const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/back.4bpp.lz");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Deerling[] = INCBIN_U8("graphics/pokemon/deerling/footprint.1bpp");
+    const u8 gMonFootprint_Deerling[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/normal.gbapal.lz");
-    const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/shiny.gbapal.lz");
-    const u8 gMonIcon_DeerlingSpring[] = INCBIN_U8("graphics/pokemon/deerling/icon.4bpp");
+    const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/shiny.gbapal.lz");
+    const u8 gMonIcon_DeerlingSpring[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/icon.4bpp");
 
-    const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/normal.gbapal.lz");
-    const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/shiny.gbapal.lz");
-    const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp");
+    const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/summer/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/summer/shiny.gbapal.lz");
+    const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/summer/icon.4bpp");
 
-    const u32 gMonPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/normal.gbapal.lz");
-    const u32 gMonShinyPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/shiny.gbapal.lz");
-    const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp");
+    const u32 gMonPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/autumn/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/autumn/shiny.gbapal.lz");
+    const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/autumn/icon.4bpp");
 
-    const u32 gMonPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/normal.gbapal.lz");
-    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");
+    const u32 gMonPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/winter/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/winter/shiny.gbapal.lz");
+    const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/winter/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/back.4bpp.lz");
-    const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/shiny.gbapal.lz");
-    const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/sawsbuck/icon.4bpp");
+    const u32 gMonFrontPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/anim_front.4bpp.lz");
+    const u32 gMonPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/normal.gbapal.lz");
+    const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/back.4bpp.lz");
+    const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/shiny.gbapal.lz");
+    const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sawsbuck[] = INCBIN_U8("graphics/pokemon/sawsbuck/footprint.1bpp");
+    const u8 gMonFootprint_Sawsbuck[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz");
-    const u32 gMonPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/normal.gbapal.lz");
-    const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/back.4bpp.lz");
-    const u32 gMonShinyPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/shiny.gbapal.lz");
-    const u8 gMonIcon_SawsbuckSummer[] = INCBIN_U8("graphics/pokemon/sawsbuck/summer/icon.4bpp");
+    const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/front.4bpp.lz");
+    const u32 gMonPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/normal.gbapal.lz");
+    const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/back.4bpp.lz");
+    const u32 gMonShinyPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/shiny.gbapal.lz");
+    const u8 gMonIcon_SawsbuckSummer[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/summer/icon.4bpp");
 
-    const u32 gMonFrontPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/front.4bpp.lz");
-    const u32 gMonPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/normal.gbapal.lz");
-    const u32 gMonBackPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/back.4bpp.lz");
-    const u32 gMonShinyPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/shiny.gbapal.lz");
-    const u8 gMonIcon_SawsbuckAutumn[] = INCBIN_U8("graphics/pokemon/sawsbuck/autumn/icon.4bpp");
+    const u32 gMonFrontPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/front.4bpp.lz");
+    const u32 gMonPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/normal.gbapal.lz");
+    const u32 gMonBackPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/back.4bpp.lz");
+    const u32 gMonShinyPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/shiny.gbapal.lz");
+    const u8 gMonIcon_SawsbuckAutumn[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/autumn/icon.4bpp");
 
-    const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/front.4bpp.lz");
-    const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/normal.gbapal.lz");
-    const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/front.4bpp.lz");
+    const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/normal.gbapal.lz");
+    const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/back.4bpp.lz");
+    const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/shiny.gbapal.lz");
+    const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/winter/icon.4bpp");
 #endif //P_FAMILY_DEERLING
 
 #if P_FAMILY_EMOLGA
-    const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/anim_front.4bpp.lz");
-    const u32 gMonPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/normal.gbapal.lz");
-    const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/back.4bpp.lz");
-    const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/shiny.gbapal.lz");
-    const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/icon.4bpp");
+    const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/anim_front.4bpp.lz");
+    const u32 gMonPalette_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/normal.gbapal.lz");
+    const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/back.4bpp.lz");
+    const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/shiny.gbapal.lz");
+    const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/gen_5/emolga/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/footprint.1bpp");
+    const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/gen_5/emolga/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_EMOLGA
 
 #if P_FAMILY_KARRABLAST
-    const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/anim_front.4bpp.lz");
-    const u32 gMonPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/normal.gbapal.lz");
-    const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/back.4bpp.lz");
-    const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/shiny.gbapal.lz");
-    const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/icon.4bpp");
+    const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/anim_front.4bpp.lz");
+    const u32 gMonPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/normal.gbapal.lz");
+    const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/back.4bpp.lz");
+    const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/shiny.gbapal.lz");
+    const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/gen_5/karrablast/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/footprint.1bpp");
+    const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/gen_5/karrablast/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/shiny.gbapal.lz");
-    const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bpp");
+    const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/anim_front.4bpp.lz");
+    const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/normal.gbapal.lz");
+    const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/shiny.gbapal.lz");
+    const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/gen_5/escavalier/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/footprint.1bpp");
+    const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/gen_5/escavalier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KARRABLAST
 
 #if P_FAMILY_FOONGUS
-    const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/anim_front.4bpp.lz");
-    const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/normal.gbapal.lz");
-    const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/shiny.gbapal.lz");
-    const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/icon.4bpp");
+    const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/normal.gbapal.lz");
+    const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/shiny.gbapal.lz");
+    const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/gen_5/foongus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/footprint.1bpp");
+    const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/gen_5/foongus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/back.4bpp.lz");
-    const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/shiny.gbapal.lz");
-    const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/icon.4bpp");
+    const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/anim_front.4bpp.lz");
+    const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/normal.gbapal.lz");
+    const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/back.4bpp.lz");
+    const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/shiny.gbapal.lz");
+    const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/gen_5/amoonguss/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/footprint.1bpp");
+    const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/gen_5/amoonguss/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FOONGUS
 
 #if P_FAMILY_FRILLISH
-    const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/anim_front.4bpp.lz");
-    const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/normal.gbapal.lz");
-    const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/shiny.gbapal.lz");
-    const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/icon.4bpp");
+    const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/anim_front.4bpp.lz");
+    const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/normal.gbapal.lz");
+    const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/shiny.gbapal.lz");
+    const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/footprint.1bpp");
+    const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/anim_frontf.4bpp.lz");
+    const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/normalf.gbapal.lz");
+    const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/backf.4bpp.lz");
+    const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/shinyf.gbapal.lz");
+    const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/iconf.4bpp");
 
-    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");
-    const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/back.4bpp.lz");
-    const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/shiny.gbapal.lz");
-    const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/icon.4bpp");
+    const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/anim_front.4bpp.lz");
+    const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/normal.gbapal.lz");
+    const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/back.4bpp.lz");
+    const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/shiny.gbapal.lz");
+    const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/footprint.1bpp");
+    const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/anim_frontf.4bpp.lz");
+    const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/normalf.gbapal.lz");
+    const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/backf.4bpp.lz");
+    const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/shinyf.gbapal.lz");
+    const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/iconf.4bpp");
 #endif //P_FAMILY_FRILLISH
 
 #if P_FAMILY_ALOMOMOLA
-    const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/anim_front.4bpp.lz");
-    const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/normal.gbapal.lz");
-    const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/back.4bpp.lz");
-    const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/shiny.gbapal.lz");
-    const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/icon.4bpp");
+    const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/anim_front.4bpp.lz");
+    const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/normal.gbapal.lz");
+    const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/back.4bpp.lz");
+    const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/shiny.gbapal.lz");
+    const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/gen_5/alomomola/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/footprint.1bpp");
+    const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/gen_5/alomomola/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ALOMOMOLA
 
 #if P_FAMILY_JOLTIK
-    const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/anim_front.4bpp.lz");
-    const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/normal.gbapal.lz");
-    const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/back.4bpp.lz");
-    const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/shiny.gbapal.lz");
-    const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/icon.4bpp");
+    const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/anim_front.4bpp.lz");
+    const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/normal.gbapal.lz");
+    const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/back.4bpp.lz");
+    const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/shiny.gbapal.lz");
+    const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/gen_5/joltik/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/footprint.1bpp");
+    const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/gen_5/joltik/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/back.4bpp.lz");
-    const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/shiny.gbapal.lz");
-    const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/icon.4bpp");
+    const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/anim_front.4bpp.lz");
+    const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/normal.gbapal.lz");
+    const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/back.4bpp.lz");
+    const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/shiny.gbapal.lz");
+    const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/gen_5/galvantula/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/footprint.1bpp");
+    const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/gen_5/galvantula/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_JOLTIK
 
 #if P_FAMILY_FERROSEED
-    const u32 gMonFrontPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/anim_front.4bpp.lz");
-    const u32 gMonPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/normal.gbapal.lz");
-    const u32 gMonBackPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/shiny.gbapal.lz");
-    const u8 gMonIcon_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/icon.4bpp");
+    const u32 gMonFrontPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/normal.gbapal.lz");
+    const u32 gMonBackPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/shiny.gbapal.lz");
+    const u8 gMonIcon_Ferroseed[] = INCBIN_U8("graphics/pokemon/gen_5/ferroseed/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/footprint.1bpp");
+    const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/gen_5/ferroseed/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/shiny.gbapal.lz");
-    const u8 gMonIcon_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/icon.4bpp");
+    const u32 gMonFrontPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/normal.gbapal.lz");
+    const u32 gMonBackPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/shiny.gbapal.lz");
+    const u8 gMonIcon_Ferrothorn[] = INCBIN_U8("graphics/pokemon/gen_5/ferrothorn/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/footprint.1bpp");
+    const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/gen_5/ferrothorn/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FERROSEED
 
 #if P_FAMILY_KLINK
-    const u32 gMonFrontPic_Klink[] = INCBIN_U32("graphics/pokemon/klink/anim_front.4bpp.lz");
-    const u32 gMonPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/normal.gbapal.lz");
-    const u32 gMonBackPic_Klink[] = INCBIN_U32("graphics/pokemon/klink/back.4bpp.lz");
-    const u32 gMonShinyPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/shiny.gbapal.lz");
-    const u8 gMonIcon_Klink[] = INCBIN_U8("graphics/pokemon/klink/icon.4bpp");
+    const u32 gMonFrontPic_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/anim_front.4bpp.lz");
+    const u32 gMonPalette_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/normal.gbapal.lz");
+    const u32 gMonBackPic_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/back.4bpp.lz");
+    const u32 gMonShinyPalette_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/shiny.gbapal.lz");
+    const u8 gMonIcon_Klink[] = INCBIN_U8("graphics/pokemon/gen_5/klink/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/klink/footprint.1bpp");
+    const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/gen_5/klink/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/back.4bpp.lz");
-    const u32 gMonShinyPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/shiny.gbapal.lz");
-    const u8 gMonIcon_Klang[] = INCBIN_U8("graphics/pokemon/klang/icon.4bpp");
+    const u32 gMonFrontPic_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/anim_front.4bpp.lz");
+    const u32 gMonPalette_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/normal.gbapal.lz");
+    const u32 gMonBackPic_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/back.4bpp.lz");
+    const u32 gMonShinyPalette_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/shiny.gbapal.lz");
+    const u8 gMonIcon_Klang[] = INCBIN_U8("graphics/pokemon/gen_5/klang/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/klang/footprint.1bpp");
+    const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/gen_5/klang/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/back.4bpp.lz");
-    const u32 gMonShinyPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/shiny.gbapal.lz");
-    const u8 gMonIcon_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/icon.4bpp");
+    const u32 gMonFrontPic_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/anim_front.4bpp.lz");
+    const u32 gMonPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/normal.gbapal.lz");
+    const u32 gMonBackPic_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/back.4bpp.lz");
+    const u32 gMonShinyPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/shiny.gbapal.lz");
+    const u8 gMonIcon_Klinklang[] = INCBIN_U8("graphics/pokemon/gen_5/klinklang/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/footprint.1bpp");
+    const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/gen_5/klinklang/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KLINK
 
 #if P_FAMILY_TYNAMO
-    const u32 gMonFrontPic_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/normal.gbapal.lz");
-    const u32 gMonBackPic_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/shiny.gbapal.lz");
-    const u8 gMonIcon_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/icon.4bpp");
+    const u32 gMonFrontPic_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/normal.gbapal.lz");
+    const u32 gMonBackPic_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/shiny.gbapal.lz");
+    const u8 gMonIcon_Tynamo[] = INCBIN_U8("graphics/pokemon/gen_5/tynamo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/footprint.1bpp");
+    const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/gen_5/tynamo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/back.4bpp.lz");
-    const u32 gMonShinyPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/shiny.gbapal.lz");
-    const u8 gMonIcon_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/icon.4bpp");
+    const u32 gMonFrontPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/anim_front.4bpp.lz");
+    const u32 gMonPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/normal.gbapal.lz");
+    const u32 gMonBackPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/back.4bpp.lz");
+    const u32 gMonShinyPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/shiny.gbapal.lz");
+    const u8 gMonIcon_Eelektrik[] = INCBIN_U8("graphics/pokemon/gen_5/eelektrik/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/footprint.1bpp");
+    const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/gen_5/eelektrik/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/back.4bpp.lz");
-    const u32 gMonShinyPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/shiny.gbapal.lz");
-    const u8 gMonIcon_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/icon.4bpp");
+    const u32 gMonFrontPic_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/anim_front.4bpp.lz");
+    const u32 gMonPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/normal.gbapal.lz");
+    const u32 gMonBackPic_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/back.4bpp.lz");
+    const u32 gMonShinyPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/shiny.gbapal.lz");
+    const u8 gMonIcon_Eelektross[] = INCBIN_U8("graphics/pokemon/gen_5/eelektross/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/footprint.1bpp");
+    const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/gen_5/eelektross/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TYNAMO
 
 #if P_FAMILY_ELGYEM
-    const u32 gMonFrontPic_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/anim_front.4bpp.lz");
-    const u32 gMonPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/normal.gbapal.lz");
-    const u32 gMonBackPic_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/shiny.gbapal.lz");
-    const u8 gMonIcon_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/icon.4bpp");
+    const u32 gMonFrontPic_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/anim_front.4bpp.lz");
+    const u32 gMonPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/normal.gbapal.lz");
+    const u32 gMonBackPic_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/shiny.gbapal.lz");
+    const u8 gMonIcon_Elgyem[] = INCBIN_U8("graphics/pokemon/gen_5/elgyem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/footprint.1bpp");
+    const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/gen_5/elgyem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/shiny.gbapal.lz");
-    const u8 gMonIcon_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/icon.4bpp");
+    const u32 gMonFrontPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/anim_front.4bpp.lz");
+    const u32 gMonPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/normal.gbapal.lz");
+    const u32 gMonBackPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/shiny.gbapal.lz");
+    const u8 gMonIcon_Beheeyem[] = INCBIN_U8("graphics/pokemon/gen_5/beheeyem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/footprint.1bpp");
+    const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/gen_5/beheeyem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ELGYEM
 
 #if P_FAMILY_LITWICK
-    const u32 gMonFrontPic_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/anim_front.4bpp.lz");
-    const u32 gMonPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/normal.gbapal.lz");
-    const u32 gMonBackPic_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/back.4bpp.lz");
-    const u32 gMonShinyPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/shiny.gbapal.lz");
-    const u8 gMonIcon_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/icon.4bpp");
+    const u32 gMonFrontPic_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/anim_front.4bpp.lz");
+    const u32 gMonPalette_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/normal.gbapal.lz");
+    const u32 gMonBackPic_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/back.4bpp.lz");
+    const u32 gMonShinyPalette_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/shiny.gbapal.lz");
+    const u8 gMonIcon_Litwick[] = INCBIN_U8("graphics/pokemon/gen_5/litwick/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/footprint.1bpp");
+    const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/gen_5/litwick/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/shiny.gbapal.lz");
-    const u8 gMonIcon_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/icon.4bpp");
+    const u32 gMonFrontPic_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/anim_front.4bpp.lz");
+    const u32 gMonPalette_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/normal.gbapal.lz");
+    const u32 gMonBackPic_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/shiny.gbapal.lz");
+    const u8 gMonIcon_Lampent[] = INCBIN_U8("graphics/pokemon/gen_5/lampent/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/footprint.1bpp");
+    const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/gen_5/lampent/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/shiny.gbapal.lz");
-    const u8 gMonIcon_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/icon.4bpp");
+    const u32 gMonFrontPic_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/normal.gbapal.lz");
+    const u32 gMonBackPic_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/shiny.gbapal.lz");
+    const u8 gMonIcon_Chandelure[] = INCBIN_U8("graphics/pokemon/gen_5/chandelure/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/footprint.1bpp");
+    const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/gen_5/chandelure/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LITWICK
 
 #if P_FAMILY_AXEW
-    const u32 gMonFrontPic_Axew[] = INCBIN_U32("graphics/pokemon/axew/anim_front.4bpp.lz");
-    const u32 gMonPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/normal.gbapal.lz");
-    const u32 gMonBackPic_Axew[] = INCBIN_U32("graphics/pokemon/axew/back.4bpp.lz");
-    const u32 gMonShinyPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/shiny.gbapal.lz");
-    const u8 gMonIcon_Axew[] = INCBIN_U8("graphics/pokemon/axew/icon.4bpp");
+    const u32 gMonFrontPic_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/anim_front.4bpp.lz");
+    const u32 gMonPalette_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/normal.gbapal.lz");
+    const u32 gMonBackPic_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/back.4bpp.lz");
+    const u32 gMonShinyPalette_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/shiny.gbapal.lz");
+    const u8 gMonIcon_Axew[] = INCBIN_U8("graphics/pokemon/gen_5/axew/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/axew/footprint.1bpp");
+    const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/gen_5/axew/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/shiny.gbapal.lz");
-    const u8 gMonIcon_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/icon.4bpp");
+    const u32 gMonFrontPic_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/anim_front.4bpp.lz");
+    const u32 gMonPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/normal.gbapal.lz");
+    const u32 gMonBackPic_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/shiny.gbapal.lz");
+    const u8 gMonIcon_Fraxure[] = INCBIN_U8("graphics/pokemon/gen_5/fraxure/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/footprint.1bpp");
+    const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/gen_5/fraxure/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/shiny.gbapal.lz");
-    const u8 gMonIcon_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/icon.4bpp");
+    const u32 gMonFrontPic_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/normal.gbapal.lz");
+    const u32 gMonBackPic_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/shiny.gbapal.lz");
+    const u8 gMonIcon_Haxorus[] = INCBIN_U8("graphics/pokemon/gen_5/haxorus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/footprint.1bpp");
+    const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/gen_5/haxorus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_AXEW
 
 #if P_FAMILY_CUBCHOO
-    const u32 gMonFrontPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/normal.gbapal.lz");
-    const u32 gMonBackPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/shiny.gbapal.lz");
-    const u8 gMonIcon_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/icon.4bpp");
+    const u32 gMonFrontPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/normal.gbapal.lz");
+    const u32 gMonBackPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/shiny.gbapal.lz");
+    const u8 gMonIcon_Cubchoo[] = INCBIN_U8("graphics/pokemon/gen_5/cubchoo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/footprint.1bpp");
+    const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/gen_5/cubchoo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/back.4bpp.lz");
-    const u32 gMonShinyPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/shiny.gbapal.lz");
-    const u8 gMonIcon_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/icon.4bpp");
+    const u32 gMonFrontPic_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/anim_front.4bpp.lz");
+    const u32 gMonPalette_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/normal.gbapal.lz");
+    const u32 gMonBackPic_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/back.4bpp.lz");
+    const u32 gMonShinyPalette_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/shiny.gbapal.lz");
+    const u8 gMonIcon_Beartic[] = INCBIN_U8("graphics/pokemon/gen_5/beartic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/footprint.1bpp");
+    const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/gen_5/beartic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CUBCHOO
 
 #if P_FAMILY_CRYOGONAL
-    const u32 gMonFrontPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/normal.gbapal.lz");
-    const u32 gMonBackPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/shiny.gbapal.lz");
-    const u8 gMonIcon_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/icon.4bpp");
+    const u32 gMonFrontPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/normal.gbapal.lz");
+    const u32 gMonBackPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/shiny.gbapal.lz");
+    const u8 gMonIcon_Cryogonal[] = INCBIN_U8("graphics/pokemon/gen_5/cryogonal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/footprint.1bpp");
+    const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/gen_5/cryogonal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CRYOGONAL
 
 #if P_FAMILY_SHELMET
-    const u32 gMonFrontPic_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/anim_front.4bpp.lz");
-    const u32 gMonPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/normal.gbapal.lz");
-    const u32 gMonBackPic_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/shiny.gbapal.lz");
-    const u8 gMonIcon_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/icon.4bpp");
+    const u32 gMonFrontPic_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/anim_front.4bpp.lz");
+    const u32 gMonPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/normal.gbapal.lz");
+    const u32 gMonBackPic_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/shiny.gbapal.lz");
+    const u8 gMonIcon_Shelmet[] = INCBIN_U8("graphics/pokemon/gen_5/shelmet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/footprint.1bpp");
+    const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/gen_5/shelmet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/shiny.gbapal.lz");
-    const u8 gMonIcon_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/icon.4bpp");
+    const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/normal.gbapal.lz");
+    const u32 gMonBackPic_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/shiny.gbapal.lz");
+    const u8 gMonIcon_Accelgor[] = INCBIN_U8("graphics/pokemon/gen_5/accelgor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/footprint.1bpp");
+    const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/gen_5/accelgor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHELMET
 
 #if P_FAMILY_STUNFISK
-    const u32 gMonFrontPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/anim_front.4bpp.lz");
-    const u32 gMonPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/normal.gbapal.lz");
-    const u32 gMonBackPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/shiny.gbapal.lz");
-    const u8 gMonIcon_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/icon.4bpp");
+    const u32 gMonFrontPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/normal.gbapal.lz");
+    const u32 gMonBackPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/shiny.gbapal.lz");
+    const u8 gMonIcon_Stunfisk[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/footprint.1bpp");
+    const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GALARIAN_FORMS
-    const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz");
-    const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz");
-    const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz");
-    const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz");
-    const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp");
+    const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/front.4bpp.lz");
+    const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/normal.gbapal.lz");
+    const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/back.4bpp.lz");
+    const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/shiny.gbapal.lz");
+    const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/galarian/icon.4bpp");
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_STUNFISK
 
 #if P_FAMILY_MIENFOO
-    const u32 gMonFrontPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/normal.gbapal.lz");
-    const u32 gMonBackPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/shiny.gbapal.lz");
-    const u8 gMonIcon_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/icon.4bpp");
+    const u32 gMonFrontPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/normal.gbapal.lz");
+    const u32 gMonBackPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/shiny.gbapal.lz");
+    const u8 gMonIcon_Mienfoo[] = INCBIN_U8("graphics/pokemon/gen_5/mienfoo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/footprint.1bpp");
+    const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/gen_5/mienfoo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/shiny.gbapal.lz");
-    const u8 gMonIcon_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/icon.4bpp");
+    const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/normal.gbapal.lz");
+    const u32 gMonBackPic_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/shiny.gbapal.lz");
+    const u8 gMonIcon_Mienshao[] = INCBIN_U8("graphics/pokemon/gen_5/mienshao/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/footprint.1bpp");
+    const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/gen_5/mienshao/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MIENFOO
 
 #if P_FAMILY_DRUDDIGON
-    const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/anim_front.4bpp.lz");
-    const u32 gMonPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/normal.gbapal.lz");
-    const u32 gMonBackPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/shiny.gbapal.lz");
-    const u8 gMonIcon_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/icon.4bpp");
+    const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/normal.gbapal.lz");
+    const u32 gMonBackPic_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/shiny.gbapal.lz");
+    const u8 gMonIcon_Druddigon[] = INCBIN_U8("graphics/pokemon/gen_5/druddigon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/footprint.1bpp");
+    const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/gen_5/druddigon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRUDDIGON
 
 #if P_FAMILY_GOLETT
-    const u32 gMonFrontPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/anim_front.4bpp.lz");
-    const u32 gMonPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/normal.gbapal.lz");
-    const u32 gMonBackPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/shiny.gbapal.lz");
-    const u8 gMonIcon_Golett[] = INCBIN_U8("graphics/pokemon/golett/icon.4bpp");
+    const u32 gMonFrontPic_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/normal.gbapal.lz");
+    const u32 gMonBackPic_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/shiny.gbapal.lz");
+    const u8 gMonIcon_Golett[] = INCBIN_U8("graphics/pokemon/gen_5/golett/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/golett/footprint.1bpp");
+    const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/gen_5/golett/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/shiny.gbapal.lz");
-    const u8 gMonIcon_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/icon.4bpp");
+    const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/normal.gbapal.lz");
+    const u32 gMonBackPic_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/shiny.gbapal.lz");
+    const u8 gMonIcon_Golurk[] = INCBIN_U8("graphics/pokemon/gen_5/golurk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/footprint.1bpp");
+    const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/gen_5/golurk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GOLETT
 
 #if P_FAMILY_PAWNIARD
-    const u32 gMonFrontPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/normal.gbapal.lz");
-    const u32 gMonBackPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/shiny.gbapal.lz");
-    const u8 gMonIcon_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/icon.4bpp");
+    const u32 gMonFrontPic_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/normal.gbapal.lz");
+    const u32 gMonBackPic_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/shiny.gbapal.lz");
+    const u8 gMonIcon_Pawniard[] = INCBIN_U8("graphics/pokemon/gen_5/pawniard/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/footprint.1bpp");
+    const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/gen_5/pawniard/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/shiny.gbapal.lz");
-    const u8 gMonIcon_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/icon.4bpp");
+    const u32 gMonFrontPic_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/normal.gbapal.lz");
+    const u32 gMonBackPic_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/shiny.gbapal.lz");
+    const u8 gMonIcon_Bisharp[] = INCBIN_U8("graphics/pokemon/gen_5/bisharp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/footprint.1bpp");
+    const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/gen_5/bisharp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GEN_9_CROSS_EVOS
-    const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/front.4bpp.lz");
-    const u32 gMonPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/normal.gbapal.lz");
-    const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/shiny.gbapal.lz");
-    const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp");
+    const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/front.4bpp.lz");
+    const u32 gMonPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/normal.gbapal.lz");
+    const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/shiny.gbapal.lz");
+    const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/gen_9/kingambit/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp");
+    // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/gen_9/kingambit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_PAWNIARD
 
 #if P_FAMILY_BOUFFALANT
-    const u32 gMonFrontPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/normal.gbapal.lz");
-    const u32 gMonBackPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/shiny.gbapal.lz");
-    const u8 gMonIcon_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/icon.4bpp");
+    const u32 gMonFrontPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/normal.gbapal.lz");
+    const u32 gMonBackPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/shiny.gbapal.lz");
+    const u8 gMonIcon_Bouffalant[] = INCBIN_U8("graphics/pokemon/gen_5/bouffalant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/footprint.1bpp");
+    const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/gen_5/bouffalant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BOUFFALANT
 
 #if P_FAMILY_RUFFLET
-    const u32 gMonFrontPic_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/normal.gbapal.lz");
-    const u32 gMonBackPic_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/shiny.gbapal.lz");
-    const u8 gMonIcon_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/icon.4bpp");
+    const u32 gMonFrontPic_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/normal.gbapal.lz");
+    const u32 gMonBackPic_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/shiny.gbapal.lz");
+    const u8 gMonIcon_Rufflet[] = INCBIN_U8("graphics/pokemon/gen_5/rufflet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/footprint.1bpp");
+    const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/gen_5/rufflet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/back.4bpp.lz");
-    const u32 gMonShinyPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/shiny.gbapal.lz");
-    const u8 gMonIcon_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/icon.4bpp");
+    const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/anim_front.4bpp.lz");
+    const u32 gMonPalette_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/normal.gbapal.lz");
+    const u32 gMonBackPic_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/back.4bpp.lz");
+    const u32 gMonShinyPalette_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/shiny.gbapal.lz");
+    const u8 gMonIcon_Braviary[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/footprint.1bpp");
+    const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_RUFFLET
 
 #if P_FAMILY_VULLABY
-    const u32 gMonFrontPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/anim_front.4bpp.lz");
-    const u32 gMonPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/normal.gbapal.lz");
-    const u32 gMonBackPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/shiny.gbapal.lz");
-    const u8 gMonIcon_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/icon.4bpp");
+    const u32 gMonFrontPic_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/normal.gbapal.lz");
+    const u32 gMonBackPic_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/shiny.gbapal.lz");
+    const u8 gMonIcon_Vullaby[] = INCBIN_U8("graphics/pokemon/gen_5/vullaby/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/footprint.1bpp");
+    const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/gen_5/vullaby/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/shiny.gbapal.lz");
-    const u8 gMonIcon_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/icon.4bpp");
+    const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/anim_front.4bpp.lz");
+    const u32 gMonPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/normal.gbapal.lz");
+    const u32 gMonBackPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/shiny.gbapal.lz");
+    const u8 gMonIcon_Mandibuzz[] = INCBIN_U8("graphics/pokemon/gen_5/mandibuzz/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/footprint.1bpp");
+    const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/gen_5/mandibuzz/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VULLABY
 
 #if P_FAMILY_HEATMOR
-    const u32 gMonFrontPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/anim_front.4bpp.lz");
-    const u32 gMonPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/normal.gbapal.lz");
-    const u32 gMonBackPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/shiny.gbapal.lz");
-    const u8 gMonIcon_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/icon.4bpp");
+    const u32 gMonFrontPic_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/anim_front.4bpp.lz");
+    const u32 gMonPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/normal.gbapal.lz");
+    const u32 gMonBackPic_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/shiny.gbapal.lz");
+    const u8 gMonIcon_Heatmor[] = INCBIN_U8("graphics/pokemon/gen_5/heatmor/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/footprint.1bpp");
+    const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/gen_5/heatmor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HEATMOR
 
 #if P_FAMILY_DURANT
-    const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/anim_front.4bpp.lz");
-    const u32 gMonPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/normal.gbapal.lz");
-    const u32 gMonBackPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/shiny.gbapal.lz");
-    const u8 gMonIcon_Durant[] = INCBIN_U8("graphics/pokemon/durant/icon.4bpp");
+    const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/anim_front.4bpp.lz");
+    const u32 gMonPalette_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/normal.gbapal.lz");
+    const u32 gMonBackPic_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/shiny.gbapal.lz");
+    const u8 gMonIcon_Durant[] = INCBIN_U8("graphics/pokemon/gen_5/durant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/durant/footprint.1bpp");
+    const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/gen_5/durant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DURANT
 
 #if P_FAMILY_DEINO
-    const u32 gMonFrontPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/anim_front.4bpp.lz");
-    const u32 gMonPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/normal.gbapal.lz");
-    const u32 gMonBackPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/back.4bpp.lz");
-    const u32 gMonShinyPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/shiny.gbapal.lz");
-    const u8 gMonIcon_Deino[] = INCBIN_U8("graphics/pokemon/deino/icon.4bpp");
+    const u32 gMonFrontPic_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/anim_front.4bpp.lz");
+    const u32 gMonPalette_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/normal.gbapal.lz");
+    const u32 gMonBackPic_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/back.4bpp.lz");
+    const u32 gMonShinyPalette_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/shiny.gbapal.lz");
+    const u8 gMonIcon_Deino[] = INCBIN_U8("graphics/pokemon/gen_5/deino/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/deino/footprint.1bpp");
+    const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/gen_5/deino/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/shiny.gbapal.lz");
-    const u8 gMonIcon_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/icon.4bpp");
+    const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/normal.gbapal.lz");
+    const u32 gMonBackPic_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/shiny.gbapal.lz");
+    const u8 gMonIcon_Zweilous[] = INCBIN_U8("graphics/pokemon/gen_5/zweilous/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/footprint.1bpp");
+    const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/gen_5/zweilous/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/shiny.gbapal.lz");
-    const u8 gMonIcon_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/icon.4bpp");
+    const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/normal.gbapal.lz");
+    const u32 gMonBackPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/shiny.gbapal.lz");
+    const u8 gMonIcon_Hydreigon[] = INCBIN_U8("graphics/pokemon/gen_5/hydreigon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/footprint.1bpp");
+    const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/gen_5/hydreigon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DEINO
 
 #if P_FAMILY_LARVESTA
-    const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/anim_front.4bpp.lz");
-    const u32 gMonPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/normal.gbapal.lz");
-    const u32 gMonBackPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/back.4bpp.lz");
-    const u32 gMonShinyPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/shiny.gbapal.lz");
-    const u8 gMonIcon_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/icon.4bpp");
+    const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/anim_front.4bpp.lz");
+    const u32 gMonPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/normal.gbapal.lz");
+    const u32 gMonBackPic_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/back.4bpp.lz");
+    const u32 gMonShinyPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/shiny.gbapal.lz");
+    const u8 gMonIcon_Larvesta[] = INCBIN_U8("graphics/pokemon/gen_5/larvesta/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/footprint.1bpp");
+    const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/gen_5/larvesta/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/back.4bpp.lz");
-    const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/shiny.gbapal.lz");
-    const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/icon.4bpp");
+    const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/anim_front.4bpp.lz");
+    const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/normal.gbapal.lz");
+    const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/back.4bpp.lz");
+    const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/shiny.gbapal.lz");
+    const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/gen_5/volcarona/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/footprint.1bpp");
+    const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/gen_5/volcarona/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LARVESTA
 
 #if P_FAMILY_COBALION
-    const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/normal.gbapal.lz");
-    const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/shiny.gbapal.lz");
-    const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/icon.4bpp");
+    const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/normal.gbapal.lz");
+    const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/shiny.gbapal.lz");
+    const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/gen_5/cobalion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/footprint.1bpp");
+    const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/gen_5/cobalion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_COBALION
 
 #if P_FAMILY_TERRAKION
-    const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/anim_front.4bpp.lz");
-    const u32 gMonPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/normal.gbapal.lz");
-    const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/shiny.gbapal.lz");
-    const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/icon.4bpp");
+    const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/normal.gbapal.lz");
+    const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/shiny.gbapal.lz");
+    const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/gen_5/terrakion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/footprint.1bpp");
+    const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/gen_5/terrakion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TERRAKION
 
 #if P_FAMILY_VIRIZION
-    const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/anim_front.4bpp.lz");
-    const u32 gMonPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/normal.gbapal.lz");
-    const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/shiny.gbapal.lz");
-    const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/icon.4bpp");
+    const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/normal.gbapal.lz");
+    const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/shiny.gbapal.lz");
+    const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/gen_5/virizion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/footprint.1bpp");
+    const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/gen_5/virizion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VIRIZION
 
 #if P_FAMILY_TORNADUS
-    const u32 gMonFrontPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front.4bpp.lz");
-    const u32 gMonPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/normal.gbapal.lz");
-    const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/back.4bpp.lz");
-    const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/shiny.gbapal.lz");
-    const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/tornadus/icon.4bpp");
+    const u32 gMonFrontPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/anim_front.4bpp.lz");
+    const u32 gMonPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/normal.gbapal.lz");
+    const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/back.4bpp.lz");
+    const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/shiny.gbapal.lz");
+    const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/tornadus/footprint.1bpp");
+    const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/anim_front.4bpp.lz");
+    const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/normal.gbapal.lz");
+    const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/back.4bpp.lz");
+    const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/shiny.gbapal.lz");
+    const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/therian/icon.4bpp");
 #endif //P_FAMILY_TORNADUS
 
 #if P_FAMILY_THUNDURUS
-    const u32 gMonFrontPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front.4bpp.lz");
-    const u32 gMonPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/normal.gbapal.lz");
-    const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/back.4bpp.lz");
-    const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/shiny.gbapal.lz");
-    const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/thundurus/icon.4bpp");
+    const u32 gMonFrontPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/anim_front.4bpp.lz");
+    const u32 gMonPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/normal.gbapal.lz");
+    const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/back.4bpp.lz");
+    const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/shiny.gbapal.lz");
+    const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/thundurus/footprint.1bpp");
+    const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/anim_front.4bpp.lz");
+    const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/normal.gbapal.lz");
+    const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/shiny.gbapal.lz");
+    const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/therian/icon.4bpp");
 #endif //P_FAMILY_THUNDURUS
 
 #if P_FAMILY_RESHIRAM
-    const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/anim_front.4bpp.lz");
-    const u32 gMonPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/normal.gbapal.lz");
-    const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/back.4bpp.lz");
-    const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/shiny.gbapal.lz");
-    const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/icon.4bpp");
+    const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/anim_front.4bpp.lz");
+    const u32 gMonPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/normal.gbapal.lz");
+    const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/back.4bpp.lz");
+    const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/shiny.gbapal.lz");
+    const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/gen_5/reshiram/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/footprint.1bpp");
+    const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/gen_5/reshiram/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_RESHIRAM
 
 #if P_FAMILY_ZEKROM
-    const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/normal.gbapal.lz");
-    const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/shiny.gbapal.lz");
-    const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/icon.4bpp");
+    const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/normal.gbapal.lz");
+    const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/shiny.gbapal.lz");
+    const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/gen_5/zekrom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/footprint.1bpp");
+    const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/gen_5/zekrom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ZEKROM
 
 #if P_FAMILY_LANDORUS
-    const u32 gMonFrontPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/anim_front.4bpp.lz");
-    const u32 gMonPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/normal.gbapal.lz");
-    const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/back.4bpp.lz");
-    const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/shiny.gbapal.lz");
-    const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/landorus/icon.4bpp");
+    const u32 gMonFrontPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/anim_front.4bpp.lz");
+    const u32 gMonPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/normal.gbapal.lz");
+    const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/back.4bpp.lz");
+    const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/shiny.gbapal.lz");
+    const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/landorus/footprint.1bpp");
+    const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/anim_front.4bpp.lz");
+    const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/normal.gbapal.lz");
+    const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/back.4bpp.lz");
+    const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/shiny.gbapal.lz");
+    const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/therian/icon.4bpp");
 #endif //P_FAMILY_LANDORUS
 
 #if P_FAMILY_ENAMORUS
-    const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
-    const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
-    const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
-    const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
-    const u8 gMonIcon_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp");
+    const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/front.4bpp.lz");
+    const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/normal.gbapal.lz");
+    const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/back.4bpp.lz");
+    const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/shiny.gbapal.lz");
+    const u8 gMonIcon_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/icon.4bpp");
 #if P_FOOTPRINTS
-    //const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp");
+    //const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/front.4bpp.lz");
+    const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/normal.gbapal.lz");
+    const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/back.4bpp.lz");
+    const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/shiny.gbapal.lz");
+    const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/therian/icon.4bpp");
 #endif //P_FAMILY_ENAMORUS
 
 #if P_FAMILY_KYUREM
-    const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front.4bpp.lz");
-    const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/normal.gbapal.lz");
-    const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/shiny.gbapal.lz");
-    const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/icon.4bpp");
+    const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/anim_front.4bpp.lz");
+    const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/normal.gbapal.lz");
+    const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/shiny.gbapal.lz");
+    const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1bpp");
+    const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_FUSION_FORMS
-    const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz");
-    const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/anim_front.4bpp.lz");
+    const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/normal.gbapal.lz");
+    const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/back.4bpp.lz");
+    const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/shiny.gbapal.lz");
+    const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/white/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/anim_front.4bpp.lz");
+    const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/normal.gbapal.lz");
+    const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/back.4bpp.lz");
+    const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/shiny.gbapal.lz");
+    const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/black/icon.4bpp");
 #endif //P_FUSION_FORMS
 #endif //P_FAMILY_KYUREM
 
 #if P_FAMILY_KELDEO
-    const u32 gMonFrontPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz");
-    const u32 gMonPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz");
-    const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz");
-    const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz");
-    const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp");
+    const u32 gMonFrontPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/anim_front.4bpp.lz");
+    const u32 gMonPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/normal.gbapal.lz");
+    const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/back.4bpp.lz");
+    const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/shiny.gbapal.lz");
+    const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp");
+    const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/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");
+    const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/front.4bpp.lz");
+    const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/normal.gbapal.lz");
+    const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/back.4bpp.lz");
+    const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/shiny.gbapal.lz");
+    const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/resolute/icon.4bpp");
 #endif //P_FAMILY_KELDEO
 
 #if P_FAMILY_MELOETTA
-    const u32 gMonFrontPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz");
-    const u32 gMonPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/normal.gbapal.lz");
-    const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz");
-    const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz");
-    const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp");
+    const u32 gMonFrontPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/anim_front.4bpp.lz");
+    const u32 gMonPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/normal.gbapal.lz");
+    const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/shiny.gbapal.lz");
+    const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp");
+    const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/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");
+    const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/front.4bpp.lz");
+    const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/normal.gbapal.lz");
+    const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/shiny.gbapal.lz");
+    const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/pirouette/icon.4bpp");
 #endif //P_FAMILY_MELOETTA
 
 #if P_FAMILY_GENESECT
-    const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/anim_front.4bpp.lz");
-    const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/normal.gbapal.lz");
-    const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/back.4bpp.lz");
-    const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/shiny.gbapal.lz");
-    const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/icon.4bpp");
+    const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/anim_front.4bpp.lz");
+    const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/normal.gbapal.lz");
+    const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/back.4bpp.lz");
+    const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shiny.gbapal.lz");
+    const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/gen_5/genesect/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp");
+    const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/gen_5/genesect/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/douse_drive/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/douse_drive/shiny.gbapal.lz");
 
-    const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/shiny.gbapal.lz");
+    const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shock_drive/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shock_drive/shiny.gbapal.lz");
 
-    const u32 gMonPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/shiny.gbapal.lz");
+    const u32 gMonPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/burn_drive/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/burn_drive/shiny.gbapal.lz");
 
-    const u32 gMonPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/shiny.gbapal.lz");
+    const u32 gMonPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/chill_drive/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/chill_drive/shiny.gbapal.lz");
 #endif //P_FAMILY_GENESECT
 
 #if P_FAMILY_CHESPIN
-    const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/normal.gbapal.lz");
-    const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/shiny.gbapal.lz");
-    const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/icon.4bpp");
+    const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/normal.gbapal.lz");
+    const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/shiny.gbapal.lz");
+    const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/gen_6/chespin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp");
+    const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/gen_6/chespin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/shiny.gbapal.lz");
-    const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp");
+    const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/normal.gbapal.lz");
+    const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/shiny.gbapal.lz");
+    const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/gen_6/quilladin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp");
+    const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/gen_6/quilladin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/shiny.gbapal.lz");
-    const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/icon.4bpp");
+    const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/normal.gbapal.lz");
+    const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/shiny.gbapal.lz");
+    const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/gen_6/chesnaught/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp");
+    const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/gen_6/chesnaught/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHESPIN
 
 #if P_FAMILY_FENNEKIN
-    const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/normal.gbapal.lz");
-    const u32 gMonBackPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/shiny.gbapal.lz");
-    const u8 gMonIcon_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/icon.4bpp");
+    const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/normal.gbapal.lz");
+    const u32 gMonBackPic_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/shiny.gbapal.lz");
+    const u8 gMonIcon_Fennekin[] = INCBIN_U8("graphics/pokemon/gen_6/fennekin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/footprint.1bpp");
+    const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/gen_6/fennekin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/shiny.gbapal.lz");
-    const u8 gMonIcon_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/icon.4bpp");
+    const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/anim_front.4bpp.lz");
+    const u32 gMonPalette_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/normal.gbapal.lz");
+    const u32 gMonBackPic_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/shiny.gbapal.lz");
+    const u8 gMonIcon_Braixen[] = INCBIN_U8("graphics/pokemon/gen_6/braixen/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/footprint.1bpp");
+    const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/gen_6/braixen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/back.4bpp.lz");
-    const u32 gMonShinyPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/shiny.gbapal.lz");
-    const u8 gMonIcon_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/icon.4bpp");
+    const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/anim_front.4bpp.lz");
+    const u32 gMonPalette_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/normal.gbapal.lz");
+    const u32 gMonBackPic_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/back.4bpp.lz");
+    const u32 gMonShinyPalette_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/shiny.gbapal.lz");
+    const u8 gMonIcon_Delphox[] = INCBIN_U8("graphics/pokemon/gen_6/delphox/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/footprint.1bpp");
+    const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/gen_6/delphox/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FENNEKIN
 
 #if P_FAMILY_FROAKIE
-    const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/anim_front.4bpp.lz");
-    const u32 gMonPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/normal.gbapal.lz");
-    const u32 gMonBackPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/shiny.gbapal.lz");
-    const u8 gMonIcon_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/icon.4bpp");
+    const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/normal.gbapal.lz");
+    const u32 gMonBackPic_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/shiny.gbapal.lz");
+    const u8 gMonIcon_Froakie[] = INCBIN_U8("graphics/pokemon/gen_6/froakie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/footprint.1bpp");
+    const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/gen_6/froakie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/shiny.gbapal.lz");
-    const u8 gMonIcon_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/icon.4bpp");
+    const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/anim_front.4bpp.lz");
+    const u32 gMonPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/normal.gbapal.lz");
+    const u32 gMonBackPic_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/shiny.gbapal.lz");
+    const u8 gMonIcon_Frogadier[] = INCBIN_U8("graphics/pokemon/gen_6/frogadier/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/footprint.1bpp");
+    const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/gen_6/frogadier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/back.4bpp.lz");
-    const u32 gMonShinyPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/shiny.gbapal.lz");
-    const u8 gMonIcon_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/icon.4bpp");
+    const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/anim_front.4bpp.lz");
+    const u32 gMonPalette_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/normal.gbapal.lz");
+    const u32 gMonBackPic_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/back.4bpp.lz");
+    const u32 gMonShinyPalette_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/shiny.gbapal.lz");
+    const u8 gMonIcon_Greninja[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/footprint.1bpp");
+    const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/anim_front.4bpp.lz");
+    const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/normal.gbapal.lz");
+    const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/back.4bpp.lz");
+    const u32 gMonShinyPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/shiny.gbapal.lz");
+    const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/ash/icon.4bpp");
 #endif //P_FAMILY_FROAKIE
 
 #if P_FAMILY_BUNNELBY
-    const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/normal.gbapal.lz");
-    const u32 gMonBackPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/shiny.gbapal.lz");
-    const u8 gMonIcon_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/icon.4bpp");
+    const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/normal.gbapal.lz");
+    const u32 gMonBackPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/shiny.gbapal.lz");
+    const u8 gMonIcon_Bunnelby[] = INCBIN_U8("graphics/pokemon/gen_6/bunnelby/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/footprint.1bpp");
+    const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/gen_6/bunnelby/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/back.4bpp.lz");
-    const u32 gMonShinyPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/shiny.gbapal.lz");
-    const u8 gMonIcon_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/icon.4bpp");
+    const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/anim_front.4bpp.lz");
+    const u32 gMonPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/normal.gbapal.lz");
+    const u32 gMonBackPic_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/back.4bpp.lz");
+    const u32 gMonShinyPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/shiny.gbapal.lz");
+    const u8 gMonIcon_Diggersby[] = INCBIN_U8("graphics/pokemon/gen_6/diggersby/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/footprint.1bpp");
+    const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/gen_6/diggersby/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BUNNELBY
 
 #if P_FAMILY_FLETCHLING
-    const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/anim_front.4bpp.lz");
-    const u32 gMonPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/normal.gbapal.lz");
-    const u32 gMonBackPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/shiny.gbapal.lz");
-    const u8 gMonIcon_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/icon.4bpp");
+    const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/anim_front.4bpp.lz");
+    const u32 gMonPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/normal.gbapal.lz");
+    const u32 gMonBackPic_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/shiny.gbapal.lz");
+    const u8 gMonIcon_Fletchling[] = INCBIN_U8("graphics/pokemon/gen_6/fletchling/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/footprint.1bpp");
+    const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/gen_6/fletchling/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/shiny.gbapal.lz");
-    const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/icon.4bpp");
+    const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/anim_front.4bpp.lz");
+    const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/normal.gbapal.lz");
+    const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/shiny.gbapal.lz");
+    const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/gen_6/fletchinder/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/footprint.1bpp");
+    const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/gen_6/fletchinder/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/back.4bpp.lz");
-    const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/shiny.gbapal.lz");
-    const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/icon.4bpp");
+    const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/anim_front.4bpp.lz");
+    const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/normal.gbapal.lz");
+    const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/back.4bpp.lz");
+    const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/shiny.gbapal.lz");
+    const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/gen_6/talonflame/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/footprint.1bpp");
+    const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/gen_6/talonflame/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FLETCHLING
 
 #if P_FAMILY_SCATTERBUG
-    const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/anim_front.4bpp.lz");
-    const u32 gMonPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/normal.gbapal.lz");
-    const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/shiny.gbapal.lz");
-    const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/icon.4bpp");
+    const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/anim_front.4bpp.lz");
+    const u32 gMonPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/normal.gbapal.lz");
+    const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/shiny.gbapal.lz");
+    const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/gen_6/scatterbug/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/footprint.1bpp");
+    const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/gen_6/scatterbug/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny.gbapal.lz");
-    const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp");
+    const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/normal.gbapal.lz");
+    const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/shiny.gbapal.lz");
+    const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/gen_6/spewpa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/footprint.1bpp");
+    const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/gen_6/spewpa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp");
+    const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/meadow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/footprint.1bpp");
+    const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/vivillon/polar/icon.4bpp");
+    const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/polar/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonTundra[] = INCBIN_U8("graphics/pokemon/vivillon/tundra/icon.4bpp");
+    const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonTundra[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/tundra/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonContinental[] = INCBIN_U8("graphics/pokemon/vivillon/continental/icon.4bpp");
+    const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonContinental[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/continental/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonGarden[] = INCBIN_U8("graphics/pokemon/vivillon/garden/icon.4bpp");
+    const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonGarden[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/garden/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonElegant[] = INCBIN_U8("graphics/pokemon/vivillon/elegant/icon.4bpp");
+    const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonElegant[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/elegant/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonMeadow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp");
+    const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonMeadow[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/meadow/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonModern[] = INCBIN_U8("graphics/pokemon/vivillon/modern/icon.4bpp");
+    const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonModern[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/modern/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonMarine[] = INCBIN_U8("graphics/pokemon/vivillon/marine/icon.4bpp");
+    const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonMarine[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/marine/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonArchipelago[] = INCBIN_U8("graphics/pokemon/vivillon/archipelago/icon.4bpp");
+    const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonArchipelago[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/archipelago/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonHighPlains[] = INCBIN_U8("graphics/pokemon/vivillon/high_plains/icon.4bpp");
+    const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonHighPlains[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/high_plains/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonSandstorm[] = INCBIN_U8("graphics/pokemon/vivillon/sandstorm/icon.4bpp");
+    const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonSandstorm[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/sandstorm/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonRiver[] = INCBIN_U8("graphics/pokemon/vivillon/river/icon.4bpp");
+    const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonRiver[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/river/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonMonsoon[] = INCBIN_U8("graphics/pokemon/vivillon/monsoon/icon.4bpp");
+    const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonMonsoon[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/monsoon/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonSavanna[] = INCBIN_U8("graphics/pokemon/vivillon/savanna/icon.4bpp");
+    const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonSavanna[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/savanna/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonSun[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/sun/icon.4bpp");
 
-    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");
-    const u32 gMonBackPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonOcean[] = INCBIN_U8("graphics/pokemon/vivillon/ocean/icon.4bpp");
+    const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonOcean[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/ocean/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonJungle[] = INCBIN_U8("graphics/pokemon/vivillon/jungle/icon.4bpp");
+    const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonJungle[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/jungle/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonFancy[] = INCBIN_U8("graphics/pokemon/vivillon/fancy/icon.4bpp");
+    const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonFancy[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/fancy/icon.4bpp");
 
-    const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/anim_front.4bpp.lz");
-    const u32 gMonPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/normal.gbapal.lz");
-    const u32 gMonBackPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/back.4bpp.lz");
-    const u32 gMonShinyPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/shiny.gbapal.lz");
-    const u8 gMonIcon_VivillonPokeBall[] = INCBIN_U8("graphics/pokemon/vivillon/poke_ball/icon.4bpp");
+    const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.4bpp.lz");
+    const u32 gMonPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/normal.gbapal.lz");
+    const u32 gMonBackPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/back.4bpp.lz");
+    const u32 gMonShinyPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/shiny.gbapal.lz");
+    const u8 gMonIcon_VivillonPokeBall[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/poke_ball/icon.4bpp");
 #endif //P_FAMILY_SCATTERBUG
 
 #if P_FAMILY_LITLEO
-    const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz");
-    const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz");
-    const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp");
+    const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/normal.gbapal.lz");
+    const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/shiny.gbapal.lz");
+    const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/gen_6/litleo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/footprint.1bpp");
+    const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/gen_6/litleo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz");
-    const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp");
+    const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/normal.gbapal.lz");
+    const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/shiny.gbapal.lz");
+    const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/footprint.1bpp");
+    const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/anim_frontf.4bpp.lz");
+    const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/backf.4bpp.lz");
+    const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/iconf.4bpp");
 #endif //P_FAMILY_LITLEO
 
 #if P_FAMILY_FLABEBE
-    const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/anim_front.4bpp.lz");
-    const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/back.4bpp.lz");
+    const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/anim_front.4bpp.lz");
+    const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/back.4bpp.lz");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/footprint.1bpp");
+    const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz");
-    const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp");
+    const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/shiny.gbapal.lz");
+    const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/icon.4bpp");
 
-    const u32 gMonPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlabebeYellowFlower[] = INCBIN_U8("graphics/pokemon/flabebe/yellow_flower/icon.4bpp");
+    const u32 gMonPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/yellow_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlabebeYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/yellow_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlabebeOrangeFlower[] = INCBIN_U8("graphics/pokemon/flabebe/orange_flower/icon.4bpp");
+    const u32 gMonPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/orange_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/orange_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlabebeOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/orange_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlabebeBlueFlower[] = INCBIN_U8("graphics/pokemon/flabebe/blue_flower/icon.4bpp");
+    const u32 gMonPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/blue_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/blue_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlabebeBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/blue_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlabebeWhiteFlower[] = INCBIN_U8("graphics/pokemon/flabebe/white_flower/icon.4bpp");
+    const u32 gMonPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/white_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/white_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlabebeWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/white_flower/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/gen_6/floette/anim_front.4bpp.lz");
+    const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/gen_6/floette/back.4bpp.lz");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/floette/footprint.1bpp");
+    const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/gen_6/floette/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp");
+    const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/icon.4bpp");
 
-    const u32 gMonPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteYellowFlower[] = INCBIN_U8("graphics/pokemon/floette/yellow_flower/icon.4bpp");
+    const u32 gMonPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/yellow_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/yellow_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/yellow_flower/icon.4bpp");
 
-    const u32 gMonPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteOrangeFlower[] = INCBIN_U8("graphics/pokemon/floette/orange_flower/icon.4bpp");
+    const u32 gMonPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/orange_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/orange_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/orange_flower/icon.4bpp");
 
-    const u32 gMonPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteBlueFlower[] = INCBIN_U8("graphics/pokemon/floette/blue_flower/icon.4bpp");
+    const u32 gMonPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/blue_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/blue_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/blue_flower/icon.4bpp");
 
-    const u32 gMonPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteWhiteFlower[] = INCBIN_U8("graphics/pokemon/floette/white_flower/icon.4bpp");
+    const u32 gMonPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/white_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/white_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/white_flower/icon.4bpp");
 
-    const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/anim_front.4bpp.lz");
-    const u32 gMonPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/normal.gbapal.lz");
-    const u32 gMonBackPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/back.4bpp.lz");
-    const u32 gMonShinyPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FloetteEternalFlower[] = INCBIN_U8("graphics/pokemon/floette/eternal_flower/icon.4bpp");
+    const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/anim_front.4bpp.lz");
+    const u32 gMonPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/normal.gbapal.lz");
+    const u32 gMonBackPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/back.4bpp.lz");
+    const u32 gMonShinyPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FloetteEternalFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/eternal_flower/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/gen_6/florges/anim_front.4bpp.lz");
+    const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/gen_6/florges/back.4bpp.lz");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/florges/footprint.1bpp");
+    const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/gen_6/florges/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz");
-    const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp");
+    const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/shiny.gbapal.lz");
+    const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/icon.4bpp");
 
-    const u32 gMonPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlorgesYellowFlower[] = INCBIN_U8("graphics/pokemon/florges/yellow_flower/icon.4bpp");
+    const u32 gMonPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/yellow_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/yellow_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlorgesYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/yellow_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlorgesOrangeFlower[] = INCBIN_U8("graphics/pokemon/florges/orange_flower/icon.4bpp");
+    const u32 gMonPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/orange_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/orange_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlorgesOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/orange_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlorgesBlueFlower[] = INCBIN_U8("graphics/pokemon/florges/blue_flower/icon.4bpp");
+    const u32 gMonPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/blue_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/blue_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlorgesBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/blue_flower/icon.4bpp");
 
-    const u32 gMonPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/shiny.gbapal.lz");
-    const u8 gMonIcon_FlorgesWhiteFlower[] = INCBIN_U8("graphics/pokemon/florges/white_flower/icon.4bpp");
+    const u32 gMonPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/white_flower/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/white_flower/shiny.gbapal.lz");
+    const u8 gMonIcon_FlorgesWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/white_flower/icon.4bpp");
 #endif //P_FAMILY_FLABEBE
 
 #if P_FAMILY_SKIDDO
-    const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/anim_front.4bpp.lz");
-    const u32 gMonPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/normal.gbapal.lz");
-    const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/shiny.gbapal.lz");
-    const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/icon.4bpp");
+    const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/normal.gbapal.lz");
+    const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/shiny.gbapal.lz");
+    const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/gen_6/skiddo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/footprint.1bpp");
+    const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/gen_6/skiddo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/shiny.gbapal.lz");
-    const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/icon.4bpp");
+    const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/normal.gbapal.lz");
+    const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/shiny.gbapal.lz");
+    const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gen_6/gogoat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/footprint.1bpp");
+    const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gen_6/gogoat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKIDDO
 
 #if P_FAMILY_PANCHAM
-    const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/normal.gbapal.lz");
-    const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/shiny.gbapal.lz");
-    const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/icon.4bpp");
+    const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/normal.gbapal.lz");
+    const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/shiny.gbapal.lz");
+    const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/gen_6/pancham/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/footprint.1bpp");
+    const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/gen_6/pancham/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/shiny.gbapal.lz");
-    const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/icon.4bpp");
+    const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/normal.gbapal.lz");
+    const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/shiny.gbapal.lz");
+    const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/gen_6/pangoro/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/footprint.1bpp");
+    const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/gen_6/pangoro/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PANCHAM
 
 #if P_FAMILY_FURFROU
-    const u32 gMonFrontPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp");
+    const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouHeartTrim[] = INCBIN_U8("graphics/pokemon/furfrou/heart_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouHeartTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/heart_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouStarTrim[] = INCBIN_U8("graphics/pokemon/furfrou/star_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouStarTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/star_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouDiamondTrim[] = INCBIN_U8("graphics/pokemon/furfrou/diamond_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouDiamondTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/diamond_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouDebutanteTrim[] = INCBIN_U8("graphics/pokemon/furfrou/debutante_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouDebutanteTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/debutante_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouMatronTrim[] = INCBIN_U8("graphics/pokemon/furfrou/matron_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouMatronTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/matron_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouDandyTrim[] = INCBIN_U8("graphics/pokemon/furfrou/dandy_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouDandyTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/dandy_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouLaReineTrim[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouLaReineTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/back.4bpp.lz");
-    const u32 gMonShinyPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/shiny.gbapal.lz");
-    const u8 gMonIcon_FurfrouKabukiTrim[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki_trim/icon.4bpp");
+    const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouKabukiTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.4bpp");
 
-    const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/anim_front.4bpp.lz");
-    const u32 gMonPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/normal.gbapal.lz");
-    const u32 gMonBackPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/back.4bpp.lz");
-    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");
+    const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.4bpp.lz");
+    const u32 gMonPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.gbapal.lz");
+    const u32 gMonBackPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.4bpp.lz");
+    const u32 gMonShinyPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.gbapal.lz");
+    const u8 gMonIcon_FurfrouPharaohTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.4bpp");
 #endif //P_FAMILY_FURFROU
 
 #if P_FAMILY_ESPURR
-    const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/anim_front.4bpp.lz");
-    const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/normal.gbapal.lz");
-    const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/back.4bpp.lz");
-    const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/shiny.gbapal.lz");
-    const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/icon.4bpp");
+    const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/anim_front.4bpp.lz");
+    const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/normal.gbapal.lz");
+    const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/back.4bpp.lz");
+    const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/shiny.gbapal.lz");
+    const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/gen_6/espurr/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/footprint.1bpp");
+    const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/gen_6/espurr/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz");
-    const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz");
-    const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz");
-    const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz");
-    const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp");
+    const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/anim_front.4bpp.lz");
+    const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/normal.gbapal.lz");
+    const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/shiny.gbapal.lz");
+    const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp");
+    const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/anim_front.4bpp.lz");
-    const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/normal.gbapal.lz");
-    const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/back.4bpp.lz");
-    const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/shiny.gbapal.lz");
-    const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/meowstic/female/icon.4bpp");
+    const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/anim_front.4bpp.lz");
+    const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/normal.gbapal.lz");
+    const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/back.4bpp.lz");
+    const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/shiny.gbapal.lz");
+    const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/female/icon.4bpp");
 #endif //P_FAMILY_ESPURR
 
 #if P_FAMILY_HONEDGE
-    const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/anim_front.4bpp.lz");
-    const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/normal.gbapal.lz");
-    const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/back.4bpp.lz");
-    const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/shiny.gbapal.lz");
-    const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/icon.4bpp");
+    const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/anim_front.4bpp.lz");
+    const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/normal.gbapal.lz");
+    const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/back.4bpp.lz");
+    const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/shiny.gbapal.lz");
+    const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/gen_6/honedge/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/footprint.1bpp");
+    const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/gen_6/honedge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/back.4bpp.lz");
-    const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/shiny.gbapal.lz");
-    const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/icon.4bpp");
+    const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/anim_front.4bpp.lz");
+    const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/normal.gbapal.lz");
+    const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/back.4bpp.lz");
+    const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/shiny.gbapal.lz");
+    const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/gen_6/doublade/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/footprint.1bpp");
+    const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/gen_6/doublade/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz");
-    const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz");
-    const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp");
+    const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/anim_front.4bpp.lz");
+    const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/normal.gbapal.lz");
+    const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/back.4bpp.lz");
+    const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/shiny.gbapal.lz");
+    const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/footprint.1bpp");
+    const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/anim_front.4bpp.lz");
+    const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/normal.gbapal.lz");
+    const u32 gMonBackPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/back.4bpp.lz");
+    const u32 gMonShinyPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/shiny.gbapal.lz");
+    const u8 gMonIcon_AegislashBlade[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/blade/icon.4bpp");
 #endif //P_FAMILY_HONEDGE
 
 #if P_FAMILY_SPRITZEE
-    const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/normal.gbapal.lz");
-    const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/shiny.gbapal.lz");
-    const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/icon.4bpp");
+    const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/normal.gbapal.lz");
+    const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/shiny.gbapal.lz");
+    const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/gen_6/spritzee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/footprint.1bpp");
+    const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/gen_6/spritzee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/shiny.gbapal.lz");
-    const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/icon.4bpp");
+    const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/normal.gbapal.lz");
+    const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/shiny.gbapal.lz");
+    const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/gen_6/aromatisse/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/footprint.1bpp");
+    const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/gen_6/aromatisse/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPRITZEE
 
 #if P_FAMILY_SWIRLIX
-    const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/anim_front.4bpp.lz");
-    const u32 gMonPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/normal.gbapal.lz");
-    const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/shiny.gbapal.lz");
-    const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/icon.4bpp");
+    const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/anim_front.4bpp.lz");
+    const u32 gMonPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/normal.gbapal.lz");
+    const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/shiny.gbapal.lz");
+    const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/gen_6/swirlix/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/footprint.1bpp");
+    const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/gen_6/swirlix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/shiny.gbapal.lz");
-    const u8 gMonIcon_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/icon.4bpp");
+    const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/normal.gbapal.lz");
+    const u32 gMonBackPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/shiny.gbapal.lz");
+    const u8 gMonIcon_Slurpuff[] = INCBIN_U8("graphics/pokemon/gen_6/slurpuff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/footprint.1bpp");
+    const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/gen_6/slurpuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SWIRLIX
 
 #if P_FAMILY_INKAY
-    const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/anim_front.4bpp.lz");
-    const u32 gMonPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/normal.gbapal.lz");
-    const u32 gMonBackPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/back.4bpp.lz");
-    const u32 gMonShinyPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/shiny.gbapal.lz");
-    const u8 gMonIcon_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/icon.4bpp");
+    const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/anim_front.4bpp.lz");
+    const u32 gMonPalette_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/normal.gbapal.lz");
+    const u32 gMonBackPic_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/back.4bpp.lz");
+    const u32 gMonShinyPalette_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/shiny.gbapal.lz");
+    const u8 gMonIcon_Inkay[] = INCBIN_U8("graphics/pokemon/gen_6/inkay/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/footprint.1bpp");
+    const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/gen_6/inkay/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/shiny.gbapal.lz");
-    const u8 gMonIcon_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/icon.4bpp");
+    const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/anim_front.4bpp.lz");
+    const u32 gMonPalette_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/normal.gbapal.lz");
+    const u32 gMonBackPic_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/shiny.gbapal.lz");
+    const u8 gMonIcon_Malamar[] = INCBIN_U8("graphics/pokemon/gen_6/malamar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/footprint.1bpp");
+    const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/gen_6/malamar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_INKAY
 
 #if P_FAMILY_BINACLE
-    const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/normal.gbapal.lz");
-    const u32 gMonBackPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/shiny.gbapal.lz");
-    const u8 gMonIcon_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/icon.4bpp");
+    const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/normal.gbapal.lz");
+    const u32 gMonBackPic_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/shiny.gbapal.lz");
+    const u8 gMonIcon_Binacle[] = INCBIN_U8("graphics/pokemon/gen_6/binacle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/footprint.1bpp");
+    const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/gen_6/binacle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/shiny.gbapal.lz");
-    const u8 gMonIcon_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/icon.4bpp");
+    const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/normal.gbapal.lz");
+    const u32 gMonBackPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/shiny.gbapal.lz");
+    const u8 gMonIcon_Barbaracle[] = INCBIN_U8("graphics/pokemon/gen_6/barbaracle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/footprint.1bpp");
+    const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/gen_6/barbaracle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BINACLE
 
 #if P_FAMILY_SKRELP
-    const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/anim_front.4bpp.lz");
-    const u32 gMonPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/normal.gbapal.lz");
-    const u32 gMonBackPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/shiny.gbapal.lz");
-    const u8 gMonIcon_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/icon.4bpp");
+    const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/anim_front.4bpp.lz");
+    const u32 gMonPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/normal.gbapal.lz");
+    const u32 gMonBackPic_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/shiny.gbapal.lz");
+    const u8 gMonIcon_Skrelp[] = INCBIN_U8("graphics/pokemon/gen_6/skrelp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/footprint.1bpp");
+    const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/gen_6/skrelp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/shiny.gbapal.lz");
-    const u8 gMonIcon_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/icon.4bpp");
+    const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/normal.gbapal.lz");
+    const u32 gMonBackPic_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/shiny.gbapal.lz");
+    const u8 gMonIcon_Dragalge[] = INCBIN_U8("graphics/pokemon/gen_6/dragalge/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/footprint.1bpp");
+    const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/gen_6/dragalge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKRELP
 
 #if P_FAMILY_CLAUNCHER
-    const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/anim_front.4bpp.lz");
-    const u32 gMonPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/normal.gbapal.lz");
-    const u32 gMonBackPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/shiny.gbapal.lz");
-    const u8 gMonIcon_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/icon.4bpp");
+    const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/anim_front.4bpp.lz");
+    const u32 gMonPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/normal.gbapal.lz");
+    const u32 gMonBackPic_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/shiny.gbapal.lz");
+    const u8 gMonIcon_Clauncher[] = INCBIN_U8("graphics/pokemon/gen_6/clauncher/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/footprint.1bpp");
+    const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/gen_6/clauncher/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/shiny.gbapal.lz");
-    const u8 gMonIcon_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/icon.4bpp");
+    const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/anim_front.4bpp.lz");
+    const u32 gMonPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/normal.gbapal.lz");
+    const u32 gMonBackPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/shiny.gbapal.lz");
+    const u8 gMonIcon_Clawitzer[] = INCBIN_U8("graphics/pokemon/gen_6/clawitzer/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/footprint.1bpp");
+    const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/gen_6/clawitzer/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CLAUNCHER
 
 #if P_FAMILY_HELIOPTILE
-    const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/anim_front.4bpp.lz");
-    const u32 gMonPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/normal.gbapal.lz");
-    const u32 gMonBackPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/shiny.gbapal.lz");
-    const u8 gMonIcon_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/icon.4bpp");
+    const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/anim_front.4bpp.lz");
+    const u32 gMonPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/normal.gbapal.lz");
+    const u32 gMonBackPic_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/shiny.gbapal.lz");
+    const u8 gMonIcon_Helioptile[] = INCBIN_U8("graphics/pokemon/gen_6/helioptile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/footprint.1bpp");
+    const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/gen_6/helioptile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/shiny.gbapal.lz");
-    const u8 gMonIcon_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/icon.4bpp");
+    const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/anim_front.4bpp.lz");
+    const u32 gMonPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/normal.gbapal.lz");
+    const u32 gMonBackPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/shiny.gbapal.lz");
+    const u8 gMonIcon_Heliolisk[] = INCBIN_U8("graphics/pokemon/gen_6/heliolisk/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/footprint.1bpp");
+    const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/gen_6/heliolisk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HELIOPTILE
 
 #if P_FAMILY_TYRUNT
-    const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/anim_front.4bpp.lz");
-    const u32 gMonPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/normal.gbapal.lz");
-    const u32 gMonBackPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/shiny.gbapal.lz");
-    const u8 gMonIcon_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/icon.4bpp");
+    const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/normal.gbapal.lz");
+    const u32 gMonBackPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/shiny.gbapal.lz");
+    const u8 gMonIcon_Tyrunt[] = INCBIN_U8("graphics/pokemon/gen_6/tyrunt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/footprint.1bpp");
+    const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/gen_6/tyrunt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/shiny.gbapal.lz");
-    const u8 gMonIcon_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/icon.4bpp");
+    const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/anim_front.4bpp.lz");
+    const u32 gMonPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/normal.gbapal.lz");
+    const u32 gMonBackPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/shiny.gbapal.lz");
+    const u8 gMonIcon_Tyrantrum[] = INCBIN_U8("graphics/pokemon/gen_6/tyrantrum/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/footprint.1bpp");
+    const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/gen_6/tyrantrum/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TYRUNT
 
 #if P_FAMILY_AMAURA
-    const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/anim_front.4bpp.lz");
-    const u32 gMonPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/normal.gbapal.lz");
-    const u32 gMonBackPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/back.4bpp.lz");
-    const u32 gMonShinyPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/shiny.gbapal.lz");
-    const u8 gMonIcon_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/icon.4bpp");
+    const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/anim_front.4bpp.lz");
+    const u32 gMonPalette_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/normal.gbapal.lz");
+    const u32 gMonBackPic_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/back.4bpp.lz");
+    const u32 gMonShinyPalette_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/shiny.gbapal.lz");
+    const u8 gMonIcon_Amaura[] = INCBIN_U8("graphics/pokemon/gen_6/amaura/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/footprint.1bpp");
+    const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/gen_6/amaura/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/shiny.gbapal.lz");
-    const u8 gMonIcon_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/icon.4bpp");
+    const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/anim_front.4bpp.lz");
+    const u32 gMonPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/normal.gbapal.lz");
+    const u32 gMonBackPic_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/shiny.gbapal.lz");
+    const u8 gMonIcon_Aurorus[] = INCBIN_U8("graphics/pokemon/gen_6/aurorus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/footprint.1bpp");
+    const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/gen_6/aurorus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_AMAURA
 
 #if P_FAMILY_HAWLUCHA
-    const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/anim_front.4bpp.lz");
-    const u32 gMonPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/normal.gbapal.lz");
-    const u32 gMonBackPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/shiny.gbapal.lz");
-    const u8 gMonIcon_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/icon.4bpp");
+    const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/anim_front.4bpp.lz");
+    const u32 gMonPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/normal.gbapal.lz");
+    const u32 gMonBackPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/shiny.gbapal.lz");
+    const u8 gMonIcon_Hawlucha[] = INCBIN_U8("graphics/pokemon/gen_6/hawlucha/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/footprint.1bpp");
+    const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/gen_6/hawlucha/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_HAWLUCHA
 
 #if P_FAMILY_DEDENNE
-    const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/normal.gbapal.lz");
-    const u32 gMonBackPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/shiny.gbapal.lz");
-    const u8 gMonIcon_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/icon.4bpp");
+    const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/normal.gbapal.lz");
+    const u32 gMonBackPic_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/shiny.gbapal.lz");
+    const u8 gMonIcon_Dedenne[] = INCBIN_U8("graphics/pokemon/gen_6/dedenne/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/footprint.1bpp");
+    const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/gen_6/dedenne/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DEDENNE
 
 #if P_FAMILY_CARBINK
-    const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/anim_front.4bpp.lz");
-    const u32 gMonPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/normal.gbapal.lz");
-    const u32 gMonBackPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/back.4bpp.lz");
-    const u32 gMonShinyPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/shiny.gbapal.lz");
-    const u8 gMonIcon_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/icon.4bpp");
+    const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/anim_front.4bpp.lz");
+    const u32 gMonPalette_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/normal.gbapal.lz");
+    const u32 gMonBackPic_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/back.4bpp.lz");
+    const u32 gMonShinyPalette_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/shiny.gbapal.lz");
+    const u8 gMonIcon_Carbink[] = INCBIN_U8("graphics/pokemon/gen_6/carbink/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/footprint.1bpp");
+    const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/gen_6/carbink/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CARBINK
 
 #if P_FAMILY_GOOMY
-    const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/anim_front.4bpp.lz");
-    const u32 gMonPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/normal.gbapal.lz");
-    const u32 gMonBackPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/shiny.gbapal.lz");
-    const u8 gMonIcon_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/icon.4bpp");
+    const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/anim_front.4bpp.lz");
+    const u32 gMonPalette_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/normal.gbapal.lz");
+    const u32 gMonBackPic_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/shiny.gbapal.lz");
+    const u8 gMonIcon_Goomy[] = INCBIN_U8("graphics/pokemon/gen_6/goomy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/footprint.1bpp");
+    const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/gen_6/goomy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/shiny.gbapal.lz");
-    const u8 gMonIcon_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/icon.4bpp");
+    const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/normal.gbapal.lz");
+    const u32 gMonBackPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/shiny.gbapal.lz");
+    const u8 gMonIcon_Sliggoo[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/footprint.1bpp");
+    const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 
-    const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/anim_front.4bpp.lz");
-    const u32 gMonPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/normal.gbapal.lz");
-    const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/shiny.gbapal.lz");
-    const u8 gMonIcon_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/icon.4bpp");
+    const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/anim_front.4bpp.lz");
+    const u32 gMonPalette_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/normal.gbapal.lz");
+    const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/shiny.gbapal.lz");
+    const u8 gMonIcon_Goodra[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/footprint.1bpp");
+    const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_GOOMY
 
 #if P_FAMILY_KLEFKI
-    const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/anim_front.4bpp.lz");
-    const u32 gMonPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/normal.gbapal.lz");
-    const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/back.4bpp.lz");
-    const u32 gMonShinyPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/shiny.gbapal.lz");
-    const u8 gMonIcon_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/icon.4bpp");
+    const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/anim_front.4bpp.lz");
+    const u32 gMonPalette_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/normal.gbapal.lz");
+    const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/back.4bpp.lz");
+    const u32 gMonShinyPalette_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/shiny.gbapal.lz");
+    const u8 gMonIcon_Klefki[] = INCBIN_U8("graphics/pokemon/gen_6/klefki/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/footprint.1bpp");
+    const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/gen_6/klefki/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KLEFKI
 
 #if P_FAMILY_PHANTUMP
-    const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/anim_front.4bpp.lz");
-    const u32 gMonPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/normal.gbapal.lz");
-    const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/back.4bpp.lz");
-    const u32 gMonShinyPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/shiny.gbapal.lz");
-    const u8 gMonIcon_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/icon.4bpp");
+    const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/anim_front.4bpp.lz");
+    const u32 gMonPalette_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/normal.gbapal.lz");
+    const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/back.4bpp.lz");
+    const u32 gMonShinyPalette_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/shiny.gbapal.lz");
+    const u8 gMonIcon_Phantump[] = INCBIN_U8("graphics/pokemon/gen_6/phantump/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/footprint.1bpp");
+    const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/gen_6/phantump/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/shiny.gbapal.lz");
-    const u8 gMonIcon_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/icon.4bpp");
+    const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/anim_front.4bpp.lz");
+    const u32 gMonPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/normal.gbapal.lz");
+    const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/shiny.gbapal.lz");
+    const u8 gMonIcon_Trevenant[] = INCBIN_U8("graphics/pokemon/gen_6/trevenant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/footprint.1bpp");
+    const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/gen_6/trevenant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PHANTUMP
 
 #if P_FAMILY_PUMPKABOO
-    const u32 gMonPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/normal.gbapal.lz");
-    const u32 gMonShinyPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/shiny.gbapal.lz");
-    const u8 gMonIcon_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/icon.4bpp");
+    const u32 gMonPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/shiny.gbapal.lz");
+    const u8 gMonIcon_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/gen_6/pumpkaboo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/footprint.1bpp");
+    const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/gen_6/pumpkaboo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz");
-    const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/back.4bpp.lz");
+    const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/anim_front.4bpp.lz");
+    const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/back.4bpp.lz");
 
-    const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/anim_front.4bpp.lz");
-    const u32 gMonBackPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/back.4bpp.lz");
+    const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/small/anim_front.4bpp.lz");
+    const u32 gMonBackPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/small/back.4bpp.lz");
 
-    const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/anim_front.4bpp.lz");
-    const u32 gMonBackPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/back.4bpp.lz");
+    const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/large/anim_front.4bpp.lz");
+    const u32 gMonBackPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/large/back.4bpp.lz");
 
-    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");
+    const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/super/anim_front.4bpp.lz");
+    const u32 gMonBackPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/super/back.4bpp.lz");
 
-    const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/normal.gbapal.lz");
-    const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/shiny.gbapal.lz");
-    const u8 gMonIcon_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/icon.4bpp");
+    const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/shiny.gbapal.lz");
+    const u8 gMonIcon_Gourgeist[] = INCBIN_U8("graphics/pokemon/gen_6/gourgeist/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/footprint.1bpp");
+    const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gen_6/gourgeist/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz");
-    const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/back.4bpp.lz");
+    const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/anim_front.4bpp.lz");
+    const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/back.4bpp.lz");
 
-    const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/anim_front.4bpp.lz");
-    const u32 gMonBackPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/back.4bpp.lz");
+    const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/small/anim_front.4bpp.lz");
+    const u32 gMonBackPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/small/back.4bpp.lz");
 
-    const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/anim_front.4bpp.lz");
-    const u32 gMonBackPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/back.4bpp.lz");
+    const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/large/anim_front.4bpp.lz");
+    const u32 gMonBackPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/large/back.4bpp.lz");
 
-    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");
+    const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/super/anim_front.4bpp.lz");
+    const u32 gMonBackPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/super/back.4bpp.lz");
 #endif //P_FAMILY_PUMPKABOO
 
 #if P_FAMILY_BERGMITE
-    const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/anim_front.4bpp.lz");
-    const u32 gMonPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/normal.gbapal.lz");
-    const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/shiny.gbapal.lz");
-    const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/icon.4bpp");
+    const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/normal.gbapal.lz");
+    const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/shiny.gbapal.lz");
+    const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/gen_6/bergmite/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/footprint.1bpp");
+    const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/gen_6/bergmite/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/back.4bpp.lz");
-    const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/shiny.gbapal.lz");
-    const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/icon.4bpp");
+    const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/anim_front.4bpp.lz");
+    const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/normal.gbapal.lz");
+    const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/back.4bpp.lz");
+    const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/shiny.gbapal.lz");
+    const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/footprint.1bpp");
+    const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_BERGMITE
 
 #if P_FAMILY_NOIBAT
-    const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/anim_front.4bpp.lz");
-    const u32 gMonPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/normal.gbapal.lz");
-    const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/shiny.gbapal.lz");
-    const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/icon.4bpp");
+    const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/anim_front.4bpp.lz");
+    const u32 gMonPalette_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/normal.gbapal.lz");
+    const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/shiny.gbapal.lz");
+    const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/gen_6/noibat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/footprint.1bpp");
+    const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/gen_6/noibat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/back.4bpp.lz");
-    const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/shiny.gbapal.lz");
-    const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/icon.4bpp");
+    const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/anim_front.4bpp.lz");
+    const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/normal.gbapal.lz");
+    const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/back.4bpp.lz");
+    const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/shiny.gbapal.lz");
+    const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/gen_6/noivern/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/footprint.1bpp");
+    const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/gen_6/noivern/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NOIBAT
 
 #if P_FAMILY_XERNEAS
-    const u32 gMonFrontPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/front.4bpp.lz");
-    const u32 gMonPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/normal.gbapal.lz");
-    const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/back.4bpp.lz");
-    const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/shiny.gbapal.lz");
-    const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/xerneas/icon.4bpp");
+    const u32 gMonFrontPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/front.4bpp.lz");
+    const u32 gMonPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/normal.gbapal.lz");
+    const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/back.4bpp.lz");
+    const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/shiny.gbapal.lz");
+    const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/footprint.1bpp");
+    const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/anim_front.4bpp.lz");
+    const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/normal.gbapal.lz");
+    const u32 gMonBackPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/back.4bpp.lz");
+    const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/shiny.gbapal.lz");
+    const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/active/icon.4bpp");
 #endif //P_FAMILY_XERNEAS
 
 #if P_FAMILY_YVELTAL
-    const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/anim_front.4bpp.lz");
-    const u32 gMonPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/normal.gbapal.lz");
-    const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/shiny.gbapal.lz");
-    const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/icon.4bpp");
+    const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/anim_front.4bpp.lz");
+    const u32 gMonPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/normal.gbapal.lz");
+    const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/shiny.gbapal.lz");
+    const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/gen_6/yveltal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/footprint.1bpp");
+    const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/gen_6/yveltal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_YVELTAL
 
 #if P_FAMILY_ZYGARDE
-    const u32 gMonFrontPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/anim_front.4bpp.lz");
-    const u32 gMonPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/normal.gbapal.lz");
-    const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/shiny.gbapal.lz");
-    const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp");
+    const u32 gMonFrontPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/normal.gbapal.lz");
+    const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/shiny.gbapal.lz");
+    const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint.1bpp");
+    const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/anim_front.4bpp.lz");
+    const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/normal.gbapal.lz");
+    const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/shiny.gbapal.lz");
+    const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/10_percent/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/anim_front.4bpp.lz");
+    const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/normal.gbapal.lz");
+    const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/shiny.gbapal.lz");
+    const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/complete/icon.4bpp");
 #endif //P_FAMILY_ZYGARDE
 
 #if P_FAMILY_DIANCIE
-    const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_front.4bpp.lz");
-    const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gbapal.lz");
-    const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz");
-    const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp");
+    const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/anim_front.4bpp.lz");
+    const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/normal.gbapal.lz");
+    const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/shiny.gbapal.lz");
+    const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp");
+    const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_MEGA_EVOLUTIONS
-    const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz");
-    const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/front.4bpp.lz");
+    const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/normal.gbapal.lz");
+    const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/back.4bpp.lz");
+    const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/shiny.gbapal.lz");
+    const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/mega/icon.4bpp");
 #endif //P_MEGA_EVOLUTIONS
 #endif //P_FAMILY_DIANCIE
 
 #if P_FAMILY_HOOPA
-    const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz");
-    const u32 gMonPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/normal.gbapal.lz");
-    const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz");
-    const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz");
-    const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp");
+    const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/anim_front.4bpp.lz");
+    const u32 gMonPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/normal.gbapal.lz");
+    const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/back.4bpp.lz");
+    const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/shiny.gbapal.lz");
+    const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp");
+    const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/anim_front.4bpp.lz");
+    const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/normal.gbapal.lz");
+    const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/back.4bpp.lz");
+    const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/shiny.gbapal.lz");
+    const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/unbound/icon.4bpp");
 #endif //P_FAMILY_HOOPA
 
 #if P_FAMILY_VOLCANION
-    const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz");
-    const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/normal.gbapal.lz");
-    const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/back.4bpp.lz");
-    const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/shiny.gbapal.lz");
-    const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/icon.4bpp");
+    const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/anim_front.4bpp.lz");
+    const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/normal.gbapal.lz");
+    const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/back.4bpp.lz");
+    const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/shiny.gbapal.lz");
+    const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/gen_6/volcanion/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp");
+    const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/gen_6/volcanion/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VOLCANION
 
 #if P_FAMILY_ROWLET
-    const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/normal.gbapal.lz");
-    const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/shiny.gbapal.lz");
-    const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/icon.4bpp");
+    const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/normal.gbapal.lz");
+    const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/shiny.gbapal.lz");
+    const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/gen_7/rowlet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp");
+    const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/gen_7/rowlet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/shiny.gbapal.lz");
-    const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp");
+    const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/normal.gbapal.lz");
+    const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/shiny.gbapal.lz");
+    const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/gen_7/dartrix/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp");
+    const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/gen_7/dartrix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/back.4bpp.lz");
-    const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/shiny.gbapal.lz");
-    const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/icon.4bpp");
+    const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/anim_front.4bpp.lz");
+    const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/normal.gbapal.lz");
+    const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/back.4bpp.lz");
+    const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/shiny.gbapal.lz");
+    const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/footprint.1bpp");
+    const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_HISUIAN_FORMS
-    const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz");
-    const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz");
-    const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz");
-    const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz");
-    const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp");
+    const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/front.4bpp.lz");
+    const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/normal.gbapal.lz");
+    const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/back.4bpp.lz");
+    const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/shiny.gbapal.lz");
+    const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/hisuian/icon.4bpp");
 #endif //P_HISUIAN_FORMS
 #endif //P_FAMILY_ROWLET
 
 #if P_FAMILY_LITTEN
-    const u32 gMonFrontPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/front.4bpp.lz");
-    const u32 gMonPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/normal.gbapal.lz");
-    const u32 gMonBackPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/back.4bpp.lz");
-    const u32 gMonShinyPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/shiny.gbapal.lz");
-    const u8 gMonIcon_Litten[] = INCBIN_U8("graphics/pokemon/litten/icon.4bpp");
+    const u32 gMonFrontPic_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/front.4bpp.lz");
+    const u32 gMonPalette_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/normal.gbapal.lz");
+    const u32 gMonBackPic_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/back.4bpp.lz");
+    const u32 gMonShinyPalette_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/shiny.gbapal.lz");
+    const u8 gMonIcon_Litten[] = INCBIN_U8("graphics/pokemon/gen_7/litten/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/litten/footprint.1bpp");
+    const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/gen_7/litten/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/front.4bpp.lz");
-    const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/normal.gbapal.lz");
-    const u32 gMonBackPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/back.4bpp.lz");
-    const u32 gMonShinyPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/shiny.gbapal.lz");
-    const u8 gMonIcon_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/icon.4bpp");
+    const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/front.4bpp.lz");
+    const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/normal.gbapal.lz");
+    const u32 gMonBackPic_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/back.4bpp.lz");
+    const u32 gMonShinyPalette_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/shiny.gbapal.lz");
+    const u8 gMonIcon_Torracat[] = INCBIN_U8("graphics/pokemon/gen_7/torracat/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/footprint.1bpp");
+    const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/gen_7/torracat/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/front.4bpp.lz");
-    const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/normal.gbapal.lz");
-    const u32 gMonBackPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/shiny.gbapal.lz");
-    const u8 gMonIcon_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/icon.4bpp");
+    const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/front.4bpp.lz");
+    const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/normal.gbapal.lz");
+    const u32 gMonBackPic_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/shiny.gbapal.lz");
+    const u8 gMonIcon_Incineroar[] = INCBIN_U8("graphics/pokemon/gen_7/incineroar/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/footprint.1bpp");
+    const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/gen_7/incineroar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_LITTEN
 
 #if P_FAMILY_POPPLIO
-    const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/front.4bpp.lz");
-    const u32 gMonPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/normal.gbapal.lz");
-    const u32 gMonBackPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/back.4bpp.lz");
-    const u32 gMonShinyPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/shiny.gbapal.lz");
-    const u8 gMonIcon_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/icon.4bpp");
+    const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/front.4bpp.lz");
+    const u32 gMonPalette_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/normal.gbapal.lz");
+    const u32 gMonBackPic_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/back.4bpp.lz");
+    const u32 gMonShinyPalette_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/shiny.gbapal.lz");
+    const u8 gMonIcon_Popplio[] = INCBIN_U8("graphics/pokemon/gen_7/popplio/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/footprint.1bpp");
+    const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/gen_7/popplio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz");
-    const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/normal.gbapal.lz");
-    const u32 gMonBackPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/back.4bpp.lz");
-    const u32 gMonShinyPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/shiny.gbapal.lz");
-    const u8 gMonIcon_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/icon.4bpp");
+    const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/front.4bpp.lz");
+    const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/normal.gbapal.lz");
+    const u32 gMonBackPic_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/back.4bpp.lz");
+    const u32 gMonShinyPalette_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/shiny.gbapal.lz");
+    const u8 gMonIcon_Brionne[] = INCBIN_U8("graphics/pokemon/gen_7/brionne/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/footprint.1bpp");
+    const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/gen_7/brionne/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz");
-    const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/normal.gbapal.lz");
-    const u32 gMonBackPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/back.4bpp.lz");
-    const u32 gMonShinyPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/shiny.gbapal.lz");
-    const u8 gMonIcon_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/icon.4bpp");
+    const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/front.4bpp.lz");
+    const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/normal.gbapal.lz");
+    const u32 gMonBackPic_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/back.4bpp.lz");
+    const u32 gMonShinyPalette_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/shiny.gbapal.lz");
+    const u8 gMonIcon_Primarina[] = INCBIN_U8("graphics/pokemon/gen_7/primarina/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/footprint.1bpp");
+    const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/gen_7/primarina/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_POPPLIO
 
 #if P_FAMILY_PIKIPEK
-    const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/normal.gbapal.lz");
-    const u32 gMonBackPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/shiny.gbapal.lz");
-    const u8 gMonIcon_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/icon.4bpp");
+    const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/normal.gbapal.lz");
+    const u32 gMonBackPic_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/shiny.gbapal.lz");
+    const u8 gMonIcon_Pikipek[] = INCBIN_U8("graphics/pokemon/gen_7/pikipek/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/footprint.1bpp");
+    const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/gen_7/pikipek/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/back.4bpp.lz");
-    const u32 gMonShinyPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/shiny.gbapal.lz");
-    const u8 gMonIcon_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/icon.4bpp");
+    const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/anim_front.4bpp.lz");
+    const u32 gMonPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/normal.gbapal.lz");
+    const u32 gMonBackPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/back.4bpp.lz");
+    const u32 gMonShinyPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/shiny.gbapal.lz");
+    const u8 gMonIcon_Trumbeak[] = INCBIN_U8("graphics/pokemon/gen_7/trumbeak/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/footprint.1bpp");
+    const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/gen_7/trumbeak/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/shiny.gbapal.lz");
-    const u8 gMonIcon_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/icon.4bpp");
+    const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/anim_front.4bpp.lz");
+    const u32 gMonPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/normal.gbapal.lz");
+    const u32 gMonBackPic_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/shiny.gbapal.lz");
+    const u8 gMonIcon_Toucannon[] = INCBIN_U8("graphics/pokemon/gen_7/toucannon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/footprint.1bpp");
+    const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/gen_7/toucannon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PIKIPEK
 
 #if P_FAMILY_YUNGOOS
-    const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/front.4bpp.lz");
-    const u32 gMonPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/normal.gbapal.lz");
-    const u32 gMonBackPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/shiny.gbapal.lz");
-    const u8 gMonIcon_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/icon.4bpp");
+    const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/front.4bpp.lz");
+    const u32 gMonPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/normal.gbapal.lz");
+    const u32 gMonBackPic_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/shiny.gbapal.lz");
+    const u8 gMonIcon_Yungoos[] = INCBIN_U8("graphics/pokemon/gen_7/yungoos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/footprint.1bpp");
+    const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/gen_7/yungoos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz");
-    const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/normal.gbapal.lz");
-    const u32 gMonBackPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/shiny.gbapal.lz");
-    const u8 gMonIcon_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/icon.4bpp");
+    const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/front.4bpp.lz");
+    const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/normal.gbapal.lz");
+    const u32 gMonBackPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/shiny.gbapal.lz");
+    const u8 gMonIcon_Gumshoos[] = INCBIN_U8("graphics/pokemon/gen_7/gumshoos/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/footprint.1bpp");
+    const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gen_7/gumshoos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_YUNGOOS
 
 #if P_FAMILY_GRUBBIN
-    const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/normal.gbapal.lz");
-    const u32 gMonBackPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/shiny.gbapal.lz");
-    const u8 gMonIcon_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/icon.4bpp");
+    const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/normal.gbapal.lz");
+    const u32 gMonBackPic_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/shiny.gbapal.lz");
+    const u8 gMonIcon_Grubbin[] = INCBIN_U8("graphics/pokemon/gen_7/grubbin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/footprint.1bpp");
+    const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/gen_7/grubbin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/back.4bpp.lz");
-    const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/shiny.gbapal.lz");
-    const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/icon.4bpp");
+    const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/anim_front.4bpp.lz");
+    const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/normal.gbapal.lz");
+    const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/back.4bpp.lz");
+    const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/shiny.gbapal.lz");
+    const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/gen_7/charjabug/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/footprint.1bpp");
+    const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/gen_7/charjabug/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/shiny.gbapal.lz");
-    const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/icon.4bpp");
+    const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/anim_front.4bpp.lz");
+    const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/normal.gbapal.lz");
+    const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/shiny.gbapal.lz");
+    const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/gen_7/vikavolt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/footprint.1bpp");
+    const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/gen_7/vikavolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GRUBBIN
 
 #if P_FAMILY_CRABRAWLER
-    const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/front.4bpp.lz");
-    const u32 gMonPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/normal.gbapal.lz");
-    const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/shiny.gbapal.lz");
-    const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/icon.4bpp");
+    const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/front.4bpp.lz");
+    const u32 gMonPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/normal.gbapal.lz");
+    const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/shiny.gbapal.lz");
+    const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/gen_7/crabrawler/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/footprint.1bpp");
+    const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/gen_7/crabrawler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz");
-    const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/normal.gbapal.lz");
-    const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/shiny.gbapal.lz");
-    const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/icon.4bpp");
+    const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/front.4bpp.lz");
+    const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/normal.gbapal.lz");
+    const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/shiny.gbapal.lz");
+    const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/gen_7/crabominable/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/footprint.1bpp");
+    const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/gen_7/crabominable/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CRABRAWLER
 
 #if P_FAMILY_ORICORIO
-    const u32 gMonFrontPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz");
-    const u32 gMonPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/normal.gbapal.lz");
-    const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/back.4bpp.lz");
-    const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/shiny.gbapal.lz");
-    const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/oricorio/icon.4bpp");
+    const u32 gMonFrontPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/front.4bpp.lz");
+    const u32 gMonPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/normal.gbapal.lz");
+    const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/back.4bpp.lz");
+    const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/shiny.gbapal.lz");
+    const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/oricorio/footprint.1bpp");
+    const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/front.4bpp.lz");
+    const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/normal.gbapal.lz");
+    const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/back.4bpp.lz");
+    const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/shiny.gbapal.lz");
+    const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/pom_pom/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/front.4bpp.lz");
+    const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/normal.gbapal.lz");
+    const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/back.4bpp.lz");
+    const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/shiny.gbapal.lz");
+    const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/pau/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/front.4bpp.lz");
+    const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/normal.gbapal.lz");
+    const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/back.4bpp.lz");
+    const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/shiny.gbapal.lz");
+    const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/sensu/icon.4bpp");
 #endif //P_FAMILY_ORICORIO
 
 #if P_FAMILY_CUTIEFLY
-    const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/anim_front.4bpp.lz");
-    const u32 gMonPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/normal.gbapal.lz");
-    const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/shiny.gbapal.lz");
-    const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/icon.4bpp");
+    const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/normal.gbapal.lz");
+    const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/shiny.gbapal.lz");
+    const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/gen_7/cutiefly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/footprint.1bpp");
+    const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/gen_7/cutiefly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/shiny.gbapal.lz");
-    const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/icon.4bpp");
+    const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/normal.gbapal.lz");
+    const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/shiny.gbapal.lz");
+    const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/gen_7/ribombee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/footprint.1bpp");
+    const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/gen_7/ribombee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CUTIEFLY
 
 #if P_FAMILY_ROCKRUFF
-    const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/normal.gbapal.lz");
-    const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/shiny.gbapal.lz");
-    const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/icon.4bpp");
+    const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/normal.gbapal.lz");
+    const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/shiny.gbapal.lz");
+    const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/gen_7/rockruff/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/footprint.1bpp");
+    const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/gen_7/rockruff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/back.4bpp.lz");
-    const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny.gbapal.lz");
-    const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/lycanroc/icon.4bpp");
+    const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/anim_front.4bpp.lz");
+    const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/normal.gbapal.lz");
+    const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/back.4bpp.lz");
+    const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/shiny.gbapal.lz");
+    const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/lycanroc/footprint.1bpp");
+    const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/anim_front.4bpp.lz");
+    const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/normal.gbapal.lz");
+    const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/back.4bpp.lz");
+    const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/shiny.gbapal.lz");
+    const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/midnight/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/anim_front.4bpp.lz");
+    const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/normal.gbapal.lz");
+    const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/back.4bpp.lz");
+    const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/shiny.gbapal.lz");
+    const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/dusk/icon.4bpp");
 #endif //P_FAMILY_ROCKRUFF
 
 #if P_FAMILY_WISHIWASHI
-    const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz");
-    const u32 gMonPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/normal.gbapal.lz");
-    const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/back.4bpp.lz");
-    const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny.gbapal.lz");
-    const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon.4bpp");
+    const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/front.4bpp.lz");
+    const u32 gMonPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/normal.gbapal.lz");
+    const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/back.4bpp.lz");
+    const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/shiny.gbapal.lz");
+    const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/wishiwashi/footprint.1bpp");
+    const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/front.4bpp.lz");
+    const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/normal.gbapal.lz");
+    const u32 gMonBackPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/back.4bpp.lz");
+    const u32 gMonShinyPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/shiny.gbapal.lz");
+    const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/school/icon.4bpp");
 #endif //P_FAMILY_WISHIWASHI
 
 #if P_FAMILY_MAREANIE
-    const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front.4bpp.lz");
-    const u32 gMonPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/normal.gbapal.lz");
-    const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/shiny.gbapal.lz");
-    const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/icon.4bpp");
+    const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/front.4bpp.lz");
+    const u32 gMonPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/normal.gbapal.lz");
+    const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/shiny.gbapal.lz");
+    const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/gen_7/mareanie/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/footprint.1bpp");
+    const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/gen_7/mareanie/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz");
-    const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/normal.gbapal.lz");
-    const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/shiny.gbapal.lz");
-    const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/icon.4bpp");
+    const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/front.4bpp.lz");
+    const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/normal.gbapal.lz");
+    const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/shiny.gbapal.lz");
+    const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/gen_7/toxapex/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/footprint.1bpp");
+    const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/gen_7/toxapex/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MAREANIE
 
 #if P_FAMILY_MUDBRAY
-    const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/front.4bpp.lz");
-    const u32 gMonPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/normal.gbapal.lz");
-    const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/shiny.gbapal.lz");
-    const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/icon.4bpp");
+    const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/front.4bpp.lz");
+    const u32 gMonPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/normal.gbapal.lz");
+    const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/shiny.gbapal.lz");
+    const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/gen_7/mudbray/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/footprint.1bpp");
+    const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/gen_7/mudbray/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/front.4bpp.lz");
-    const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/normal.gbapal.lz");
-    const u32 gMonBackPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/shiny.gbapal.lz");
-    const u8 gMonIcon_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/icon.4bpp");
+    const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/front.4bpp.lz");
+    const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/normal.gbapal.lz");
+    const u32 gMonBackPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/shiny.gbapal.lz");
+    const u8 gMonIcon_Mudsdale[] = INCBIN_U8("graphics/pokemon/gen_7/mudsdale/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/footprint.1bpp");
+    const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/gen_7/mudsdale/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MUDBRAY
 
 #if P_FAMILY_DEWPIDER
-    const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/anim_front.4bpp.lz");
-    const u32 gMonPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/normal.gbapal.lz");
-    const u32 gMonBackPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/shiny.gbapal.lz");
-    const u8 gMonIcon_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/icon.4bpp");
+    const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/anim_front.4bpp.lz");
+    const u32 gMonPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/normal.gbapal.lz");
+    const u32 gMonBackPic_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/shiny.gbapal.lz");
+    const u8 gMonIcon_Dewpider[] = INCBIN_U8("graphics/pokemon/gen_7/dewpider/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/footprint.1bpp");
+    const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/gen_7/dewpider/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/back.4bpp.lz");
-    const u32 gMonShinyPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/shiny.gbapal.lz");
-    const u8 gMonIcon_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/icon.4bpp");
+    const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/anim_front.4bpp.lz");
+    const u32 gMonPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/normal.gbapal.lz");
+    const u32 gMonBackPic_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/back.4bpp.lz");
+    const u32 gMonShinyPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/shiny.gbapal.lz");
+    const u8 gMonIcon_Araquanid[] = INCBIN_U8("graphics/pokemon/gen_7/araquanid/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/footprint.1bpp");
+    const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/gen_7/araquanid/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DEWPIDER
 
 #if P_FAMILY_FOMANTIS
-    const u32 gMonFrontPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/front.4bpp.lz");
-    const u32 gMonPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/normal.gbapal.lz");
-    const u32 gMonBackPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/shiny.gbapal.lz");
-    const u8 gMonIcon_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/icon.4bpp");
+    const u32 gMonFrontPic_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/front.4bpp.lz");
+    const u32 gMonPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/normal.gbapal.lz");
+    const u32 gMonBackPic_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/shiny.gbapal.lz");
+    const u8 gMonIcon_Fomantis[] = INCBIN_U8("graphics/pokemon/gen_7/fomantis/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/footprint.1bpp");
+    const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/gen_7/fomantis/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/front.4bpp.lz");
-    const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/normal.gbapal.lz");
-    const u32 gMonBackPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/shiny.gbapal.lz");
-    const u8 gMonIcon_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/icon.4bpp");
+    const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/front.4bpp.lz");
+    const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/normal.gbapal.lz");
+    const u32 gMonBackPic_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/shiny.gbapal.lz");
+    const u8 gMonIcon_Lurantis[] = INCBIN_U8("graphics/pokemon/gen_7/lurantis/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/footprint.1bpp");
+    const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/gen_7/lurantis/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FOMANTIS
 
 #if P_FAMILY_MORELULL
-    const u32 gMonFrontPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/front.4bpp.lz");
-    const u32 gMonPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/normal.gbapal.lz");
-    const u32 gMonBackPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/back.4bpp.lz");
-    const u32 gMonShinyPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/shiny.gbapal.lz");
-    const u8 gMonIcon_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/icon.4bpp");
+    const u32 gMonFrontPic_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/front.4bpp.lz");
+    const u32 gMonPalette_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/normal.gbapal.lz");
+    const u32 gMonBackPic_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/back.4bpp.lz");
+    const u32 gMonShinyPalette_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/shiny.gbapal.lz");
+    const u8 gMonIcon_Morelull[] = INCBIN_U8("graphics/pokemon/gen_7/morelull/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/footprint.1bpp");
+    const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/gen_7/morelull/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/front.4bpp.lz");
-    const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/normal.gbapal.lz");
-    const u32 gMonBackPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/shiny.gbapal.lz");
-    const u8 gMonIcon_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/icon.4bpp");
+    const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/front.4bpp.lz");
+    const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/normal.gbapal.lz");
+    const u32 gMonBackPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/shiny.gbapal.lz");
+    const u8 gMonIcon_Shiinotic[] = INCBIN_U8("graphics/pokemon/gen_7/shiinotic/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/footprint.1bpp");
+    const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/gen_7/shiinotic/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MORELULL
 
 #if P_FAMILY_SALANDIT
-    const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/anim_front.4bpp.lz");
-    const u32 gMonPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/normal.gbapal.lz");
-    const u32 gMonBackPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/back.4bpp.lz");
-    const u32 gMonShinyPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/shiny.gbapal.lz");
-    const u8 gMonIcon_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/icon.4bpp");
+    const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/anim_front.4bpp.lz");
+    const u32 gMonPalette_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/normal.gbapal.lz");
+    const u32 gMonBackPic_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/back.4bpp.lz");
+    const u32 gMonShinyPalette_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/shiny.gbapal.lz");
+    const u8 gMonIcon_Salandit[] = INCBIN_U8("graphics/pokemon/gen_7/salandit/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/footprint.1bpp");
+    const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/gen_7/salandit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/shiny.gbapal.lz");
-    const u8 gMonIcon_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/icon.4bpp");
+    const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/normal.gbapal.lz");
+    const u32 gMonBackPic_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/shiny.gbapal.lz");
+    const u8 gMonIcon_Salazzle[] = INCBIN_U8("graphics/pokemon/gen_7/salazzle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/footprint.1bpp");
+    const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/gen_7/salazzle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SALANDIT
 
 #if P_FAMILY_STUFFUL
-    const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/anim_front.4bpp.lz");
-    const u32 gMonPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/normal.gbapal.lz");
-    const u32 gMonBackPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/shiny.gbapal.lz");
-    const u8 gMonIcon_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/icon.4bpp");
+    const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/anim_front.4bpp.lz");
+    const u32 gMonPalette_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/normal.gbapal.lz");
+    const u32 gMonBackPic_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/shiny.gbapal.lz");
+    const u8 gMonIcon_Stufful[] = INCBIN_U8("graphics/pokemon/gen_7/stufful/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/footprint.1bpp");
+    const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/gen_7/stufful/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/shiny.gbapal.lz");
-    const u8 gMonIcon_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/icon.4bpp");
+    const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/anim_front.4bpp.lz");
+    const u32 gMonPalette_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/normal.gbapal.lz");
+    const u32 gMonBackPic_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/shiny.gbapal.lz");
+    const u8 gMonIcon_Bewear[] = INCBIN_U8("graphics/pokemon/gen_7/bewear/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/footprint.1bpp");
+    const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/gen_7/bewear/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_STUFFUL
 
 #if P_FAMILY_BOUNSWEET
-    const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/front.4bpp.lz");
-    const u32 gMonPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/normal.gbapal.lz");
-    const u32 gMonBackPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/shiny.gbapal.lz");
-    const u8 gMonIcon_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/icon.4bpp");
+    const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/front.4bpp.lz");
+    const u32 gMonPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/normal.gbapal.lz");
+    const u32 gMonBackPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/shiny.gbapal.lz");
+    const u8 gMonIcon_Bounsweet[] = INCBIN_U8("graphics/pokemon/gen_7/bounsweet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/footprint.1bpp");
+    const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/gen_7/bounsweet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz");
-    const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/normal.gbapal.lz");
-    const u32 gMonBackPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/shiny.gbapal.lz");
-    const u8 gMonIcon_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/icon.4bpp");
+    const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/front.4bpp.lz");
+    const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/normal.gbapal.lz");
+    const u32 gMonBackPic_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/shiny.gbapal.lz");
+    const u8 gMonIcon_Steenee[] = INCBIN_U8("graphics/pokemon/gen_7/steenee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/footprint.1bpp");
+    const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/gen_7/steenee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz");
-    const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/normal.gbapal.lz");
-    const u32 gMonBackPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/shiny.gbapal.lz");
-    const u8 gMonIcon_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/icon.4bpp");
+    const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/front.4bpp.lz");
+    const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/normal.gbapal.lz");
+    const u32 gMonBackPic_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/shiny.gbapal.lz");
+    const u8 gMonIcon_Tsareena[] = INCBIN_U8("graphics/pokemon/gen_7/tsareena/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/footprint.1bpp");
+    const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/gen_7/tsareena/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BOUNSWEET
 
 #if P_FAMILY_COMFEY
-    const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/front.4bpp.lz");
-    const u32 gMonPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/normal.gbapal.lz");
-    const u32 gMonBackPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/shiny.gbapal.lz");
-    const u8 gMonIcon_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/icon.4bpp");
+    const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/front.4bpp.lz");
+    const u32 gMonPalette_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/normal.gbapal.lz");
+    const u32 gMonBackPic_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/shiny.gbapal.lz");
+    const u8 gMonIcon_Comfey[] = INCBIN_U8("graphics/pokemon/gen_7/comfey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/footprint.1bpp");
+    const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/gen_7/comfey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_COMFEY
 
 #if P_FAMILY_ORANGURU
-    const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/anim_front.4bpp.lz");
-    const u32 gMonPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/normal.gbapal.lz");
-    const u32 gMonBackPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/back.4bpp.lz");
-    const u32 gMonShinyPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/shiny.gbapal.lz");
-    const u8 gMonIcon_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/icon.4bpp");
+    const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/anim_front.4bpp.lz");
+    const u32 gMonPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/normal.gbapal.lz");
+    const u32 gMonBackPic_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/back.4bpp.lz");
+    const u32 gMonShinyPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/shiny.gbapal.lz");
+    const u8 gMonIcon_Oranguru[] = INCBIN_U8("graphics/pokemon/gen_7/oranguru/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/footprint.1bpp");
+    const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/gen_7/oranguru/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ORANGURU
 
 #if P_FAMILY_PASSIMIAN
-    const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/anim_front.4bpp.lz");
-    const u32 gMonPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/normal.gbapal.lz");
-    const u32 gMonBackPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/back.4bpp.lz");
-    const u32 gMonShinyPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/shiny.gbapal.lz");
-    const u8 gMonIcon_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/icon.4bpp");
+    const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/anim_front.4bpp.lz");
+    const u32 gMonPalette_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/normal.gbapal.lz");
+    const u32 gMonBackPic_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/back.4bpp.lz");
+    const u32 gMonShinyPalette_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/shiny.gbapal.lz");
+    const u8 gMonIcon_Passimian[] = INCBIN_U8("graphics/pokemon/gen_7/passimian/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/footprint.1bpp");
+    const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/gen_7/passimian/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PASSIMIAN
 
 #if P_FAMILY_WIMPOD
-    const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/anim_front.4bpp.lz");
-    const u32 gMonPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/normal.gbapal.lz");
-    const u32 gMonBackPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/shiny.gbapal.lz");
-    const u8 gMonIcon_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/icon.4bpp");
+    const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/anim_front.4bpp.lz");
+    const u32 gMonPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/normal.gbapal.lz");
+    const u32 gMonBackPic_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/shiny.gbapal.lz");
+    const u8 gMonIcon_Wimpod[] = INCBIN_U8("graphics/pokemon/gen_7/wimpod/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/footprint.1bpp");
+    const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/gen_7/wimpod/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back.4bpp.lz");
-    const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/shiny.gbapal.lz");
-    const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp");
+    const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/anim_front.4bpp.lz");
+    const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/normal.gbapal.lz");
+    const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/back.4bpp.lz");
+    const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/shiny.gbapal.lz");
+    const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/gen_7/golisopod/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/footprint.1bpp");
+    const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/gen_7/golisopod/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WIMPOD
 
 #if P_FAMILY_SANDYGAST
-    const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz");
-    const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/normal.gbapal.lz");
-    const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz");
-    const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp");
+    const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/front.4bpp.lz");
+    const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/normal.gbapal.lz");
+    const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/shiny.gbapal.lz");
+    const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/gen_7/sandygast/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/footprint.1bpp");
+    const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/gen_7/sandygast/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz");
-    const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz");
-    const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz");
-    const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz");
-    const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp");
+    const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/front.4bpp.lz");
+    const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/normal.gbapal.lz");
+    const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/back.4bpp.lz");
+    const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/shiny.gbapal.lz");
+    const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/gen_7/palossand/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/footprint.1bpp");
+    const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/gen_7/palossand/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SANDYGAST
 
 #if P_FAMILY_PYUKUMUKU
-    const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz");
-    const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz");
-    const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp");
+    const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/normal.gbapal.lz");
+    const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/shiny.gbapal.lz");
+    const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/gen_7/pyukumuku/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/footprint.1bpp");
+    const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/gen_7/pyukumuku/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PYUKUMUKU
 
 #if P_FAMILY_TYPE_NULL
-    const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz");
-    const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz");
-    const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz");
-    const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz");
-    const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp");
+    const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/front.4bpp.lz");
+    const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/normal.gbapal.lz");
+    const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/back.4bpp.lz");
+    const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/shiny.gbapal.lz");
+    const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/gen_7/type_null/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/type_null/footprint.1bpp");
+    const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/gen_7/type_null/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz");
-    const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz");
-    const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp");
+    const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/front.4bpp.lz");
+    const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/back.4bpp.lz");
+    const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/gen_7/silvally/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/footprint.1bpp");
+    const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/gen_7/silvally/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/silvally/fighting/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/silvally/fighting/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fighting/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fighting/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/silvally/flying/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/silvally/flying/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/flying/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/flying/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/silvally/poison/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/silvally/poison/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/poison/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/poison/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/silvally/ground/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/silvally/ground/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ground/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ground/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/silvally/rock/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/silvally/rock/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/rock/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/rock/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/silvally/bug/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/silvally/bug/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/bug/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/bug/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/silvally/ghost/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/silvally/ghost/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ghost/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ghost/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/silvally/steel/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/silvally/steel/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/steel/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/steel/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/silvally/fire/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/silvally/fire/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fire/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fire/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/silvally/water/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/silvally/water/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/water/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/water/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/silvally/grass/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/silvally/grass/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/grass/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/grass/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/silvally/electric/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/silvally/electric/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/electric/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/electric/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/silvally/psychic/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/silvally/psychic/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/psychic/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/psychic/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/silvally/ice/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/silvally/ice/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ice/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ice/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/silvally/dragon/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/silvally/dragon/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dragon/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dragon/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/silvally/dark/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/silvally/dark/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dark/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dark/shiny.gbapal.lz");
 
-    const u32 gMonPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/silvally/fairy/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/silvally/fairy/shiny.gbapal.lz");
+    const u32 gMonPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fairy/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fairy/shiny.gbapal.lz");
 #endif //P_FAMILY_TYPE_NULL
 
 #if P_FAMILY_MINIOR
-    const u32 gMonFrontPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz");
-    const u32 gMonPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz");
-    const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz");
-    const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz");
-    const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp");
+    const u32 gMonFrontPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/front.4bpp.lz");
+    const u32 gMonPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/normal.gbapal.lz");
+    const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/back.4bpp.lz");
+    const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/shiny.gbapal.lz");
+    const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/gen_7/minior/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Minior[] = INCBIN_U8("graphics/pokemon/minior/footprint.1bpp");
+    const u8 gMonFootprint_Minior[] = INCBIN_U8("graphics/pokemon/gen_7/minior/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/front.4bpp.lz");
-    const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/back.4bpp.lz");
-    const u32 gMonShinyPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/shiny.gbapal.lz");
+    const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/front.4bpp.lz");
+    const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/back.4bpp.lz");
+    const u32 gMonShinyPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/shiny.gbapal.lz");
 
-    const u32 gMonPalette_MiniorCoreRed[] = INCBIN_U32("graphics/pokemon/minior/core/red/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreRed[] = INCBIN_U8("graphics/pokemon/minior/core/red/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreRed[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/red/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreRed[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/red/icon.4bpp");
 
-    const u32 gMonPalette_MiniorCoreOrange[] = INCBIN_U32("graphics/pokemon/minior/core/orange/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreOrange[] = INCBIN_U8("graphics/pokemon/minior/core/orange/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreOrange[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/orange/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreOrange[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/orange/icon.4bpp");
 
-    const u32 gMonPalette_MiniorCoreYellow[] = INCBIN_U32("graphics/pokemon/minior/core/yellow/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreYellow[] = INCBIN_U8("graphics/pokemon/minior/core/yellow/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreYellow[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/yellow/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreYellow[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/yellow/icon.4bpp");
 
-    const u32 gMonPalette_MiniorCoreGreen[] = INCBIN_U32("graphics/pokemon/minior/core/green/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreGreen[] = INCBIN_U8("graphics/pokemon/minior/core/green/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreGreen[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/green/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreGreen[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/green/icon.4bpp");
 
-    const u32 gMonPalette_MiniorCoreBlue[] = INCBIN_U32("graphics/pokemon/minior/core/blue/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreBlue[] = INCBIN_U8("graphics/pokemon/minior/core/blue/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreBlue[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/blue/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreBlue[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/blue/icon.4bpp");
 
-    const u32 gMonPalette_MiniorCoreIndigo[] = INCBIN_U32("graphics/pokemon/minior/core/indigo/normal.gbapal.lz");
-    const u8 gMonIcon_MiniorCoreIndigo[] = INCBIN_U8("graphics/pokemon/minior/core/indigo/icon.4bpp");
+    const u32 gMonPalette_MiniorCoreIndigo[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/indigo/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreIndigo[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/indigo/icon.4bpp");
 
-    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");
+    const u32 gMonPalette_MiniorCoreViolet[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/violet/normal.gbapal.lz");
+    const u8 gMonIcon_MiniorCoreViolet[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/violet/icon.4bpp");
 #endif //P_FAMILY_MINIOR
 
 #if P_FAMILY_KOMALA
-    const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz");
-    const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz");
-    const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz");
-    const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz");
-    const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp");
+    const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/front.4bpp.lz");
+    const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/normal.gbapal.lz");
+    const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/back.4bpp.lz");
+    const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/shiny.gbapal.lz");
+    const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/gen_7/komala/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/komala/footprint.1bpp");
+    const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/gen_7/komala/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KOMALA
 
 #if P_FAMILY_TURTONATOR
-    const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/anim_front.4bpp.lz");
-    const u32 gMonPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/normal.gbapal.lz");
-    const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/back.4bpp.lz");
-    const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/shiny.gbapal.lz");
-    const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/icon.4bpp");
+    const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/anim_front.4bpp.lz");
+    const u32 gMonPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/normal.gbapal.lz");
+    const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/back.4bpp.lz");
+    const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/shiny.gbapal.lz");
+    const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/gen_7/turtonator/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/footprint.1bpp");
+    const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/gen_7/turtonator/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TURTONATOR
 
 #if P_FAMILY_TOGEDEMARU
-    const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/anim_front.4bpp.lz");
-    const u32 gMonPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/normal.gbapal.lz");
-    const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/back.4bpp.lz");
-    const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/shiny.gbapal.lz");
-    const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/icon.4bpp");
+    const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/anim_front.4bpp.lz");
+    const u32 gMonPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/normal.gbapal.lz");
+    const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/back.4bpp.lz");
+    const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/shiny.gbapal.lz");
+    const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/gen_7/togedemaru/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/footprint.1bpp");
+    const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/gen_7/togedemaru/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TOGEDEMARU
 
 #if P_FAMILY_MIMIKYU
-    const u32 gMonFrontPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz");
-    const u32 gMonPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gbapal.lz");
-    const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp.lz");
-    const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny.gbapal.lz");
-    const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp");
+    const u32 gMonFrontPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/front.4bpp.lz");
+    const u32 gMonPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/normal.gbapal.lz");
+    const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/back.4bpp.lz");
+    const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/shiny.gbapal.lz");
+    const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint.1bpp");
+    const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/front.4bpp.lz");
+    const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/normal.gbapal.lz");
+    const u32 gMonBackPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/back.4bpp.lz");
+    const u32 gMonShinyPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/shiny.gbapal.lz");
+    const u8 gMonIcon_MimikyuBusted[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/busted/icon.4bpp");
 #endif //P_FAMILY_MIMIKYU
 
 #if P_FAMILY_BRUXISH
-    const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz");
-    const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz");
-    const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz");
-    const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp");
+    const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/front.4bpp.lz");
+    const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/normal.gbapal.lz");
+    const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/shiny.gbapal.lz");
+    const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/gen_7/bruxish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp");
+    const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/gen_7/bruxish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BRUXISH
 
 #if P_FAMILY_DRAMPA
-    const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/anim_front.4bpp.lz");
-    const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz");
-    const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz");
-    const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp");
+    const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/normal.gbapal.lz");
+    const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/shiny.gbapal.lz");
+    const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/gen_7/drampa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp");
+    const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/gen_7/drampa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRAMPA
 
 #if P_FAMILY_DHELMISE
-    const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz");
-    const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz");
-    const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz");
-    const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp");
+    const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/front.4bpp.lz");
+    const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/normal.gbapal.lz");
+    const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/shiny.gbapal.lz");
+    const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/gen_7/dhelmise/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp");
+    const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/gen_7/dhelmise/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DHELMISE
 
 #if P_FAMILY_JANGMO_O
-    const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/anim_front.4bpp.lz");
-    const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz");
-    const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz");
-    const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz");
-    const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp");
+    const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/anim_front.4bpp.lz");
+    const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/normal.gbapal.lz");
+    const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/back.4bpp.lz");
+    const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/shiny.gbapal.lz");
+    const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/gen_7/jangmo_o/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp");
+    const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/gen_7/jangmo_o/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz");
-    const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz");
-    const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp");
+    const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/anim_front.4bpp.lz");
+    const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/normal.gbapal.lz");
+    const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/back.4bpp.lz");
+    const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/shiny.gbapal.lz");
+    const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/gen_7/hakamo_o/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp");
+    const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/gen_7/hakamo_o/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz");
-    const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz");
-    const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp");
+    const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/anim_front.4bpp.lz");
+    const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/normal.gbapal.lz");
+    const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/back.4bpp.lz");
+    const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/shiny.gbapal.lz");
+    const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/gen_7/kommo_o/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp");
+    const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/gen_7/kommo_o/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_JANGMO_O
 
 #if P_FAMILY_TAPU_KOKO
-    const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz");
-    const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz");
-    const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz");
-    const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz");
-    const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp");
+    const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/anim_front.4bpp.lz");
+    const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/normal.gbapal.lz");
+    const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/back.4bpp.lz");
+    const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/shiny.gbapal.lz");
+    const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_koko/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp");
+    const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_koko/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAPU_KOKO
 
 #if P_FAMILY_TAPU_LELE
-    const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz");
-    const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz");
-    const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz");
-    const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz");
-    const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp");
+    const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/anim_front.4bpp.lz");
+    const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/normal.gbapal.lz");
+    const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/back.4bpp.lz");
+    const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/shiny.gbapal.lz");
+    const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_lele/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp");
+    const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_lele/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAPU_LELE
 
 #if P_FAMILY_TAPU_BULU
-    const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz");
-    const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz");
-    const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz");
-    const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz");
-    const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp");
+    const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/anim_front.4bpp.lz");
+    const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/normal.gbapal.lz");
+    const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/back.4bpp.lz");
+    const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/shiny.gbapal.lz");
+    const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_bulu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp");
+    const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_bulu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAPU_BULU
 
 #if P_FAMILY_TAPU_FINI
-    const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/anim_front.4bpp.lz");
-    const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz");
-    const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz");
-    const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz");
-    const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp");
+    const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/anim_front.4bpp.lz");
+    const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/normal.gbapal.lz");
+    const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/back.4bpp.lz");
+    const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/shiny.gbapal.lz");
+    const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_fini/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/footprint.1bpp");
+    const u8 gMonFootprint_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_fini/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAPU_FINI
 
 #if P_FAMILY_COSMOG
-    const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz");
-    const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz");
-    const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz");
-    const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp");
+    const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/front.4bpp.lz");
+    const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/normal.gbapal.lz");
+    const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/shiny.gbapal.lz");
+    const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/gen_7/cosmog/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/footprint.1bpp");
+    const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/gen_7/cosmog/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz");
-    const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz");
-    const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz");
-    const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp");
+    const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/front.4bpp.lz");
+    const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/normal.gbapal.lz");
+    const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/shiny.gbapal.lz");
+    const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/gen_7/cosmoem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/footprint.1bpp");
+    const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/gen_7/cosmoem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz");
-    const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz");
-    const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz");
-    const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp");
+    const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/front.4bpp.lz");
+    const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/normal.gbapal.lz");
+    const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/shiny.gbapal.lz");
+    const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/gen_7/solgaleo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/footprint.1bpp");
+    const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/gen_7/solgaleo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/front.4bpp.lz");
-    const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/normal.gbapal.lz");
-    const u32 gMonBackPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/shiny.gbapal.lz");
-    const u8 gMonIcon_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/icon.4bpp");
+    const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/front.4bpp.lz");
+    const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/normal.gbapal.lz");
+    const u32 gMonBackPic_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/shiny.gbapal.lz");
+    const u8 gMonIcon_Lunala[] = INCBIN_U8("graphics/pokemon/gen_7/lunala/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/footprint.1bpp");
+    const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/gen_7/lunala/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_COSMOG
 
 #if P_FAMILY_NIHILEGO
-    const u32 gMonFrontPic_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/front.4bpp.lz");
-    const u32 gMonPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/normal.gbapal.lz");
-    const u32 gMonBackPic_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/shiny.gbapal.lz");
-    const u8 gMonIcon_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/icon.4bpp");
+    const u32 gMonFrontPic_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/front.4bpp.lz");
+    const u32 gMonPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/normal.gbapal.lz");
+    const u32 gMonBackPic_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/shiny.gbapal.lz");
+    const u8 gMonIcon_Nihilego[] = INCBIN_U8("graphics/pokemon/gen_7/nihilego/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/footprint.1bpp");
+    const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/gen_7/nihilego/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NIHILEGO
 
 #if P_FAMILY_BUZZWOLE
-    const u32 gMonFrontPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/front.4bpp.lz");
-    const u32 gMonPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/normal.gbapal.lz");
-    const u32 gMonBackPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/back.4bpp.lz");
-    const u32 gMonShinyPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/shiny.gbapal.lz");
-    const u8 gMonIcon_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/icon.4bpp");
+    const u32 gMonFrontPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/front.4bpp.lz");
+    const u32 gMonPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/normal.gbapal.lz");
+    const u32 gMonBackPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/back.4bpp.lz");
+    const u32 gMonShinyPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/shiny.gbapal.lz");
+    const u8 gMonIcon_Buzzwole[] = INCBIN_U8("graphics/pokemon/gen_7/buzzwole/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/footprint.1bpp");
+    const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/gen_7/buzzwole/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BUZZWOLE
 
 #if P_FAMILY_PHEROMOSA
-    const u32 gMonFrontPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/front.4bpp.lz");
-    const u32 gMonPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/normal.gbapal.lz");
-    const u32 gMonBackPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/shiny.gbapal.lz");
-    const u8 gMonIcon_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/icon.4bpp");
+    const u32 gMonFrontPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/front.4bpp.lz");
+    const u32 gMonPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/normal.gbapal.lz");
+    const u32 gMonBackPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/shiny.gbapal.lz");
+    const u8 gMonIcon_Pheromosa[] = INCBIN_U8("graphics/pokemon/gen_7/pheromosa/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/footprint.1bpp");
+    const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/gen_7/pheromosa/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PHEROMOSA
 
 #if P_FAMILY_XURKITREE
-    const u32 gMonFrontPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/front.4bpp.lz");
-    const u32 gMonPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/normal.gbapal.lz");
-    const u32 gMonBackPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/back.4bpp.lz");
-    const u32 gMonShinyPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/shiny.gbapal.lz");
-    const u8 gMonIcon_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/icon.4bpp");
+    const u32 gMonFrontPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/front.4bpp.lz");
+    const u32 gMonPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/normal.gbapal.lz");
+    const u32 gMonBackPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/back.4bpp.lz");
+    const u32 gMonShinyPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/shiny.gbapal.lz");
+    const u8 gMonIcon_Xurkitree[] = INCBIN_U8("graphics/pokemon/gen_7/xurkitree/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/footprint.1bpp");
+    const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/gen_7/xurkitree/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_XURKITREE
 
 #if P_FAMILY_CELESTEELA
-    const u32 gMonFrontPic_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/front.4bpp.lz");
-    const u32 gMonPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/normal.gbapal.lz");
-    const u32 gMonBackPic_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/back.4bpp.lz");
-    const u32 gMonShinyPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/shiny.gbapal.lz");
-    const u8 gMonIcon_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/icon.4bpp");
+    const u32 gMonFrontPic_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/front.4bpp.lz");
+    const u32 gMonPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/normal.gbapal.lz");
+    const u32 gMonBackPic_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/back.4bpp.lz");
+    const u32 gMonShinyPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/shiny.gbapal.lz");
+    const u8 gMonIcon_Celesteela[] = INCBIN_U8("graphics/pokemon/gen_7/celesteela/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/footprint.1bpp");
+    const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/gen_7/celesteela/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CELESTEELA
 
 #if P_FAMILY_KARTANA
-    const u32 gMonFrontPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/front.4bpp.lz");
-    const u32 gMonPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/normal.gbapal.lz");
-    const u32 gMonBackPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/shiny.gbapal.lz");
-    const u8 gMonIcon_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/icon.4bpp");
+    const u32 gMonFrontPic_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/front.4bpp.lz");
+    const u32 gMonPalette_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/normal.gbapal.lz");
+    const u32 gMonBackPic_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/shiny.gbapal.lz");
+    const u8 gMonIcon_Kartana[] = INCBIN_U8("graphics/pokemon/gen_7/kartana/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/footprint.1bpp");
+    const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/gen_7/kartana/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KARTANA
 
 #if P_FAMILY_GUZZLORD
-    const u32 gMonFrontPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/front.4bpp.lz");
-    const u32 gMonPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/normal.gbapal.lz");
-    const u32 gMonBackPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/back.4bpp.lz");
-    const u32 gMonShinyPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/shiny.gbapal.lz");
-    const u8 gMonIcon_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/icon.4bpp");
+    const u32 gMonFrontPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/front.4bpp.lz");
+    const u32 gMonPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/normal.gbapal.lz");
+    const u32 gMonBackPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/back.4bpp.lz");
+    const u32 gMonShinyPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/shiny.gbapal.lz");
+    const u8 gMonIcon_Guzzlord[] = INCBIN_U8("graphics/pokemon/gen_7/guzzlord/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/footprint.1bpp");
+    const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/gen_7/guzzlord/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GUZZLORD
 
 #if P_FAMILY_NECROZMA
-    const u32 gMonFrontPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/front.4bpp.lz");
-    const u32 gMonPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/normal.gbapal.lz");
-    const u32 gMonBackPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/back.4bpp.lz");
-    const u32 gMonShinyPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/shiny.gbapal.lz");
-    const u8 gMonIcon_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/icon.4bpp");
+    const u32 gMonFrontPic_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/front.4bpp.lz");
+    const u32 gMonPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/normal.gbapal.lz");
+    const u32 gMonBackPic_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/back.4bpp.lz");
+    const u32 gMonShinyPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/shiny.gbapal.lz");
+    const u8 gMonIcon_Necrozma[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/footprint.1bpp");
+    const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_FUSION_FORMS
-    const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/front.4bpp.lz");
-    const u32 gMonPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/front.4bpp.lz");
+    const u32 gMonPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/normal.gbapal.lz");
+    const u32 gMonBackPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/back.4bpp.lz");
+    const u32 gMonShinyPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.gbapal.lz");
+    const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/dusk_mane/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/front.4bpp.lz");
+    const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/normal.gbapal.lz");
+    const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/back.4bpp.lz");
+    const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.gbapal.lz");
+    const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/dawn_wings/icon.4bpp");
 
 #if P_ULTRA_BURST_FORMS
-    const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/front.4bpp.lz");
-    const u32 gMonPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/normal.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/front.4bpp.lz");
+    const u32 gMonPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/normal.gbapal.lz");
+    const u32 gMonBackPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/back.4bpp.lz");
+    const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/shiny.gbapal.lz");
+    const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/ultra/icon.4bpp");
 #endif //P_ULTRA_BURST_FORMS
 #endif //P_FUSION_FORMS
 #endif //P_FAMILY_NECROZMA
 
 #if P_FAMILY_MAGEARNA
-    const u32 gMonFrontPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/front.4bpp.lz");
-    const u32 gMonPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/normal.gbapal.lz");
-    const u32 gMonBackPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/shiny.gbapal.lz");
-    const u8 gMonIcon_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/icon.4bpp");
+    const u32 gMonFrontPic_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/front.4bpp.lz");
+    const u32 gMonPalette_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/normal.gbapal.lz");
+    const u32 gMonBackPic_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/shiny.gbapal.lz");
+    const u8 gMonIcon_Magearna[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/footprint.1bpp");
+    const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz");
-    const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz");
-    const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/back.4bpp.lz");
-    const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/shiny.gbapal.lz");
-    const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp");
+    const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/front.4bpp.lz");
+    const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/normal.gbapal.lz");
+    const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/back.4bpp.lz");
+    const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/shiny.gbapal.lz");
+    const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/original_color/icon.4bpp");
 #endif //P_FAMILY_MAGEARNA
 
 #if P_FAMILY_MARSHADOW
-    const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/anim_front.4bpp.lz");
-    const u32 gMonPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/normal.gbapal.lz");
-    const u32 gMonBackPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/back.4bpp.lz");
-    const u32 gMonShinyPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/shiny.gbapal.lz");
-    const u8 gMonIcon_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/icon.4bpp");
+    const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/anim_front.4bpp.lz");
+    const u32 gMonPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/normal.gbapal.lz");
+    const u32 gMonBackPic_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/back.4bpp.lz");
+    const u32 gMonShinyPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/shiny.gbapal.lz");
+    const u8 gMonIcon_Marshadow[] = INCBIN_U8("graphics/pokemon/gen_7/marshadow/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/footprint.1bpp");
+    const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/gen_7/marshadow/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MARSHADOW
 
 #if P_FAMILY_POIPOLE
-    const u32 gMonFrontPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/front.4bpp.lz");
-    const u32 gMonPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/normal.gbapal.lz");
-    const u32 gMonBackPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/shiny.gbapal.lz");
-    const u8 gMonIcon_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/icon.4bpp");
+    const u32 gMonFrontPic_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/front.4bpp.lz");
+    const u32 gMonPalette_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/normal.gbapal.lz");
+    const u32 gMonBackPic_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/shiny.gbapal.lz");
+    const u8 gMonIcon_Poipole[] = INCBIN_U8("graphics/pokemon/gen_7/poipole/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/footprint.1bpp");
+    const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/gen_7/poipole/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/front.4bpp.lz");
-    const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/normal.gbapal.lz");
-    const u32 gMonBackPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/shiny.gbapal.lz");
-    const u8 gMonIcon_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/icon.4bpp");
+    const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/front.4bpp.lz");
+    const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/normal.gbapal.lz");
+    const u32 gMonBackPic_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/shiny.gbapal.lz");
+    const u8 gMonIcon_Naganadel[] = INCBIN_U8("graphics/pokemon/gen_7/naganadel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/footprint.1bpp");
+    const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/gen_7/naganadel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_POIPOLE
 
 #if P_FAMILY_STAKATAKA
-    const u32 gMonFrontPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/front.4bpp.lz");
-    const u32 gMonPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/normal.gbapal.lz");
-    const u32 gMonBackPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/shiny.gbapal.lz");
-    const u8 gMonIcon_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/icon.4bpp");
+    const u32 gMonFrontPic_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/front.4bpp.lz");
+    const u32 gMonPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/normal.gbapal.lz");
+    const u32 gMonBackPic_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/shiny.gbapal.lz");
+    const u8 gMonIcon_Stakataka[] = INCBIN_U8("graphics/pokemon/gen_7/stakataka/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/footprint.1bpp");
+    const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/gen_7/stakataka/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_STAKATAKA
 
 #if P_FAMILY_BLACEPHALON
-    const u32 gMonFrontPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/front.4bpp.lz");
-    const u32 gMonPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/normal.gbapal.lz");
-    const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/shiny.gbapal.lz");
-    const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4bpp");
+    const u32 gMonFrontPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/front.4bpp.lz");
+    const u32 gMonPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/normal.gbapal.lz");
+    const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/shiny.gbapal.lz");
+    const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/gen_7/blacephalon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/footprint.1bpp");
+    const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/gen_7/blacephalon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BLACEPHALON
 
 #if P_FAMILY_ZERAORA
-    const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/front.4bpp.lz");
-    const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/normal.gbapal.lz");
-    const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz");
-    const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp");
+    const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/front.4bpp.lz");
+    const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/normal.gbapal.lz");
+    const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/shiny.gbapal.lz");
+    const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/gen_7/zeraora/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp");
+    const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/gen_7/zeraora/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ZERAORA
 
 #if P_FAMILY_MELTAN
-    const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/front.4bpp.lz");
-    const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/normal.gbapal.lz");
-    const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.lz");
-    const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny.gbapal.lz");
-    const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp");
+    const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/front.4bpp.lz");
+    const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/normal.gbapal.lz");
+    const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/back.4bpp.lz");
+    const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/shiny.gbapal.lz");
+    const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/gen_7/meltan/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp");
+    const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/gen_7/meltan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz");
-    const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz");
-    const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz");
-    const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp");
+    const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/front.4bpp.lz");
+    const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/normal.gbapal.lz");
+    const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/shiny.gbapal.lz");
+    const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/footprint.1bpp");
+    const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/melmetal/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_MELTAN
 
 #if P_FAMILY_GROOKEY
-    const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz");
-    const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz");
-    const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz");
-    const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp");
+    const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/front.4bpp.lz");
+    const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/normal.gbapal.lz");
+    const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/shiny.gbapal.lz");
+    const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/gen_8/grookey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp");
+    const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/gen_8/grookey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz");
-    const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz");
-    const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz");
-    const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz");
-    const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp");
+    const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/front.4bpp.lz");
+    const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/normal.gbapal.lz");
+    const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/back.4bpp.lz");
+    const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/shiny.gbapal.lz");
+    const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/gen_8/thwackey/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp");
+    const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/gen_8/thwackey/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz");
-    const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz");
-    const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz");
-    const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp");
+    const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/front.4bpp.lz");
+    const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/normal.gbapal.lz");
+    const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/shiny.gbapal.lz");
+    const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp");
+    const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/rillaboom/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_GROOKEY
 
 #if P_FAMILY_SCORBUNNY
-    const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/front.4bpp.lz");
-    const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/normal.gbapal.lz");
-    const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/shiny.gbapal.lz");
-    const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/icon.4bpp");
+    const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/front.4bpp.lz");
+    const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/normal.gbapal.lz");
+    const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/shiny.gbapal.lz");
+    const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/gen_8/scorbunny/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/footprint.1bpp");
+    const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/gen_8/scorbunny/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz");
-    const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz");
-    const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/shiny.gbapal.lz");
-    const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/icon.4bpp");
+    const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/front.4bpp.lz");
+    const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/normal.gbapal.lz");
+    const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/shiny.gbapal.lz");
+    const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/gen_8/raboot/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/footprint.1bpp");
+    const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/gen_8/raboot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz");
-    const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz");
-    const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/shiny.gbapal.lz");
-    const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp");
+    const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/front.4bpp.lz");
+    const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/normal.gbapal.lz");
+    const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/shiny.gbapal.lz");
+    const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/footprint.1bpp");
+    const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/cinderace/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SCORBUNNY
 
 #if P_FAMILY_SOBBLE
-    const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/front.4bpp.lz");
-    const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/normal.gbapal.lz");
-    const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/shiny.gbapal.lz");
-    const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp");
+    const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/front.4bpp.lz");
+    const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/normal.gbapal.lz");
+    const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/shiny.gbapal.lz");
+    const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/gen_8/sobble/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/footprint.1bpp");
+    const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/gen_8/sobble/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz");
-    const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz");
-    const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/shiny.gbapal.lz");
-    const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp");
+    const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/front.4bpp.lz");
+    const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/normal.gbapal.lz");
+    const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/shiny.gbapal.lz");
+    const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/gen_8/drizzile/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/footprint.1bpp");
+    const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/gen_8/drizzile/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz");
-    const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz");
-    const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz");
-    const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp");
+    const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/front.4bpp.lz");
+    const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/normal.gbapal.lz");
+    const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/shiny.gbapal.lz");
+    const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/footprint.1bpp");
+    const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/inteleon/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SOBBLE
 
 #if P_FAMILY_SKWOVET
-    const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/front.4bpp.lz");
-    const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/normal.gbapal.lz");
-    const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/shiny.gbapal.lz");
-    const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp");
+    const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/front.4bpp.lz");
+    const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/normal.gbapal.lz");
+    const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/shiny.gbapal.lz");
+    const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/gen_8/skwovet/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/footprint.1bpp");
+    const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/gen_8/skwovet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz");
-    const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz");
-    const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/back.4bpp.lz");
-    const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/shiny.gbapal.lz");
-    const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp");
+    const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/front.4bpp.lz");
+    const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/normal.gbapal.lz");
+    const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/back.4bpp.lz");
+    const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/shiny.gbapal.lz");
+    const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/gen_8/greedent/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/footprint.1bpp");
+    const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/gen_8/greedent/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SKWOVET
 
 #if P_FAMILY_ROOKIDEE
-    const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/normal.gbapal.lz");
-    const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/shiny.gbapal.lz");
-    const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp");
+    const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/normal.gbapal.lz");
+    const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/shiny.gbapal.lz");
+    const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/gen_8/rookidee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/footprint.1bpp");
+    const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/gen_8/rookidee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/back.4bpp.lz");
-    const u32 gMonShinyPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/shiny.gbapal.lz");
-    const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp");
+    const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/anim_front.4bpp.lz");
+    const u32 gMonPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/normal.gbapal.lz");
+    const u32 gMonBackPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/back.4bpp.lz");
+    const u32 gMonShinyPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/shiny.gbapal.lz");
+    const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/gen_8/corvisquire/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/footprint.1bpp");
+    const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/gen_8/corvisquire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/back.4bpp.lz");
-    const u32 gMonShinyPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/shiny.gbapal.lz");
-    const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp");
+    const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/anim_front.4bpp.lz");
+    const u32 gMonPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/normal.gbapal.lz");
+    const u32 gMonBackPic_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/back.4bpp.lz");
+    const u32 gMonShinyPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/shiny.gbapal.lz");
+    const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/footprint.1bpp");
+    const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/corviknight/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_ROOKIDEE
 
 #if P_FAMILY_BLIPBUG
-    const u32 gMonFrontPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/front.4bpp.lz");
-    const u32 gMonPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/normal.gbapal.lz");
-    const u32 gMonBackPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/back.4bpp.lz");
-    const u32 gMonShinyPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/shiny.gbapal.lz");
-    const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/icon.4bpp");
+    const u32 gMonFrontPic_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/front.4bpp.lz");
+    const u32 gMonPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/normal.gbapal.lz");
+    const u32 gMonBackPic_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/back.4bpp.lz");
+    const u32 gMonShinyPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/shiny.gbapal.lz");
+    const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/gen_8/blipbug/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/footprint.1bpp");
+    const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/gen_8/blipbug/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/front.4bpp.lz");
-    const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/normal.gbapal.lz");
-    const u32 gMonBackPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/shiny.gbapal.lz");
-    const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/icon.4bpp");
+    const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/front.4bpp.lz");
+    const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/normal.gbapal.lz");
+    const u32 gMonBackPic_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/shiny.gbapal.lz");
+    const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/gen_8/dottler/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/footprint.1bpp");
+    const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/gen_8/dottler/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/front.4bpp.lz");
-    const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/normal.gbapal.lz");
-    const u32 gMonBackPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/shiny.gbapal.lz");
-    const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/icon.4bpp");
+    const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/front.4bpp.lz");
+    const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/normal.gbapal.lz");
+    const u32 gMonBackPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/shiny.gbapal.lz");
+    const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/footprint.1bpp");
+    const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/orbeetle/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_BLIPBUG
 
 #if P_FAMILY_NICKIT
-    const u32 gMonFrontPic_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/front.4bpp.lz");
-    const u32 gMonPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/normal.gbapal.lz");
-    const u32 gMonBackPic_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/shiny.gbapal.lz");
-    const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/icon.4bpp");
+    const u32 gMonFrontPic_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/front.4bpp.lz");
+    const u32 gMonPalette_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/normal.gbapal.lz");
+    const u32 gMonBackPic_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/shiny.gbapal.lz");
+    const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/gen_8/nickit/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/footprint.1bpp");
+    const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/gen_8/nickit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/front.4bpp.lz");
-    const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/normal.gbapal.lz");
-    const u32 gMonBackPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/back.4bpp.lz");
-    const u32 gMonShinyPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/shiny.gbapal.lz");
-    const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/icon.4bpp");
+    const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/front.4bpp.lz");
+    const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/normal.gbapal.lz");
+    const u32 gMonBackPic_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/back.4bpp.lz");
+    const u32 gMonShinyPalette_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/shiny.gbapal.lz");
+    const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/gen_8/thievul/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/footprint.1bpp");
+    const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/gen_8/thievul/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NICKIT
 
 #if P_FAMILY_GOSSIFLEUR
-    const u32 gMonFrontPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/front.4bpp.lz");
-    const u32 gMonPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/normal.gbapal.lz");
-    const u32 gMonBackPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/shiny.gbapal.lz");
-    const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/icon.4bpp");
+    const u32 gMonFrontPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/front.4bpp.lz");
+    const u32 gMonPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/normal.gbapal.lz");
+    const u32 gMonBackPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/shiny.gbapal.lz");
+    const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gen_8/gossifleur/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/footprint.1bpp");
+    const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gen_8/gossifleur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/front.4bpp.lz");
-    const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/normal.gbapal.lz");
-    const u32 gMonBackPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/back.4bpp.lz");
-    const u32 gMonShinyPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/shiny.gbapal.lz");
-    const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/icon.4bpp");
+    const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/front.4bpp.lz");
+    const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/normal.gbapal.lz");
+    const u32 gMonBackPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/back.4bpp.lz");
+    const u32 gMonShinyPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/shiny.gbapal.lz");
+    const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/gen_8/eldegoss/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/footprint.1bpp");
+    const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/gen_8/eldegoss/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GOSSIFLEUR
 
 #if P_FAMILY_WOOLOO
-    const u32 gMonFrontPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/front.4bpp.lz");
-    const u32 gMonPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/normal.gbapal.lz");
-    const u32 gMonBackPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/shiny.gbapal.lz");
-    const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/icon.4bpp");
+    const u32 gMonFrontPic_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/front.4bpp.lz");
+    const u32 gMonPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/normal.gbapal.lz");
+    const u32 gMonBackPic_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/shiny.gbapal.lz");
+    const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/gen_8/wooloo/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/footprint.1bpp");
+    const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/gen_8/wooloo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/front.4bpp.lz");
-    const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/normal.gbapal.lz");
-    const u32 gMonBackPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/shiny.gbapal.lz");
-    const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/icon.4bpp");
+    const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/front.4bpp.lz");
+    const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/normal.gbapal.lz");
+    const u32 gMonBackPic_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/shiny.gbapal.lz");
+    const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/gen_8/dubwool/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/footprint.1bpp");
+    const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/gen_8/dubwool/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WOOLOO
 
 #if P_FAMILY_CHEWTLE
-    const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/anim_front.4bpp.lz");
-    const u32 gMonPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/normal.gbapal.lz");
-    const u32 gMonBackPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/shiny.gbapal.lz");
-    const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/icon.4bpp");
+    const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/anim_front.4bpp.lz");
+    const u32 gMonPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/normal.gbapal.lz");
+    const u32 gMonBackPic_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/shiny.gbapal.lz");
+    const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/gen_8/chewtle/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/footprint.1bpp");
+    const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/gen_8/chewtle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/shiny.gbapal.lz");
-    const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/icon.4bpp");
+    const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/anim_front.4bpp.lz");
+    const u32 gMonPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/normal.gbapal.lz");
+    const u32 gMonBackPic_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/shiny.gbapal.lz");
+    const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/footprint.1bpp");
+    const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/drednaw/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_CHEWTLE
 
 #if P_FAMILY_YAMPER
-    const u32 gMonFrontPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/front.4bpp.lz");
-    const u32 gMonPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/normal.gbapal.lz");
-    const u32 gMonBackPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/back.4bpp.lz");
-    const u32 gMonShinyPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/shiny.gbapal.lz");
-    const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/icon.4bpp");
+    const u32 gMonFrontPic_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/front.4bpp.lz");
+    const u32 gMonPalette_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/normal.gbapal.lz");
+    const u32 gMonBackPic_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/back.4bpp.lz");
+    const u32 gMonShinyPalette_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/shiny.gbapal.lz");
+    const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/gen_8/yamper/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/footprint.1bpp");
+    const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/gen_8/yamper/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/front.4bpp.lz");
-    const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/normal.gbapal.lz");
-    const u32 gMonBackPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/back.4bpp.lz");
-    const u32 gMonShinyPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/shiny.gbapal.lz");
-    const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/icon.4bpp");
+    const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/front.4bpp.lz");
+    const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/normal.gbapal.lz");
+    const u32 gMonBackPic_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/back.4bpp.lz");
+    const u32 gMonShinyPalette_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/shiny.gbapal.lz");
+    const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/gen_8/boltund/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/footprint.1bpp");
+    const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/gen_8/boltund/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_YAMPER
 
 #if P_FAMILY_ROLYCOLY
-    const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/anim_front.4bpp.lz");
-    const u32 gMonPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/normal.gbapal.lz");
-    const u32 gMonBackPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/shiny.gbapal.lz");
-    const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/icon.4bpp");
+    const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/anim_front.4bpp.lz");
+    const u32 gMonPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/normal.gbapal.lz");
+    const u32 gMonBackPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/shiny.gbapal.lz");
+    const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/gen_8/rolycoly/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/footprint.1bpp");
+    const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/gen_8/rolycoly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/back.4bpp.lz");
-    const u32 gMonShinyPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/shiny.gbapal.lz");
-    const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/icon.4bpp");
+    const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/anim_front.4bpp.lz");
+    const u32 gMonPalette_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/normal.gbapal.lz");
+    const u32 gMonBackPic_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/back.4bpp.lz");
+    const u32 gMonShinyPalette_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/shiny.gbapal.lz");
+    const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/gen_8/carkol/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/footprint.1bpp");
+    const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/gen_8/carkol/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/back.4bpp.lz");
-    const u32 gMonShinyPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/shiny.gbapal.lz");
-    const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/icon.4bpp");
+    const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/anim_front.4bpp.lz");
+    const u32 gMonPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/normal.gbapal.lz");
+    const u32 gMonBackPic_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/back.4bpp.lz");
+    const u32 gMonShinyPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/shiny.gbapal.lz");
+    const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/footprint.1bpp");
+    const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/coalossal/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_ROLYCOLY
 
 #if P_FAMILY_APPLIN
-    const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/normal.gbapal.lz");
-    const u32 gMonBackPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/shiny.gbapal.lz");
-    const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/applin/icon.4bpp");
+    const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/normal.gbapal.lz");
+    const u32 gMonBackPic_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/shiny.gbapal.lz");
+    const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/gen_8/applin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/applin/footprint.1bpp");
+    const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/gen_8/applin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/shiny.gbapal.lz");
-    const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/icon.4bpp");
+    const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/anim_front.4bpp.lz");
+    const u32 gMonPalette_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/normal.gbapal.lz");
+    const u32 gMonBackPic_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/shiny.gbapal.lz");
+    const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/footprint.1bpp");
+    const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/flapple/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 
-    const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/anim_front.4bpp.lz");
-    const u32 gMonPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/normal.gbapal.lz");
-    const u32 gMonBackPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/back.4bpp.lz");
-    const u32 gMonShinyPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/shiny.gbapal.lz");
-    const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp");
+    const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/anim_front.4bpp.lz");
+    const u32 gMonPalette_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/normal.gbapal.lz");
+    const u32 gMonBackPic_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/back.4bpp.lz");
+    const u32 gMonShinyPalette_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/shiny.gbapal.lz");
+    const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/footprint.1bpp");
+    const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/appletun/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 
 #if P_GEN_9_CROSS_EVOS
-    const u32 gMonFrontPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/front.4bpp.lz");
-    const u32 gMonPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/normal.gbapal.lz");
-    const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz");
-    const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp");
+    const u32 gMonFrontPic_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/front.4bpp.lz");
+    const u32 gMonPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/normal.gbapal.lz");
+    const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/shiny.gbapal.lz");
+    const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/gen_9/dipplin/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp");
+    // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/gen_9/dipplin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz");
-    // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz");
-    // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz");
-    // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz");
-    // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp");
+    // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/front.4bpp.lz");
+    // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/normal.gbapal.lz");
+    // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/back.4bpp.lz");
+    // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/shiny.gbapal.lz");
+    // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/gen_9/hydrapple/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp");
+    // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/gen_9/hydrapple/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_APPLIN
 
 #if P_FAMILY_SILICOBRA
-    const u32 gMonFrontPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/front.4bpp.lz");
-    const u32 gMonPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/normal.gbapal.lz");
-    const u32 gMonBackPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/shiny.gbapal.lz");
-    const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp");
+    const u32 gMonFrontPic_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/front.4bpp.lz");
+    const u32 gMonPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/normal.gbapal.lz");
+    const u32 gMonBackPic_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/shiny.gbapal.lz");
+    const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/gen_8/silicobra/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/footprint.1bpp");
+    const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/gen_8/silicobra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/front.4bpp.lz");
-    const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/normal.gbapal.lz");
-    const u32 gMonBackPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/shiny.gbapal.lz");
-    const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp");
+    const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/front.4bpp.lz");
+    const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/normal.gbapal.lz");
+    const u32 gMonBackPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/shiny.gbapal.lz");
+    const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/footprint.1bpp");
+    const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/sandaconda/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SILICOBRA
 
 #if P_FAMILY_CRAMORANT
-    const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/front.4bpp.lz");
-    const u32 gMonPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/normal.gbapal.lz");
-    const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/shiny.gbapal.lz");
-    const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp");
+    const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/front.4bpp.lz");
+    const u32 gMonPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/normal.gbapal.lz");
+    const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/shiny.gbapal.lz");
+    const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/footprint.1bpp");
+    const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/front.4bpp.lz");
+    const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/normal.gbapal.lz");
+    const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/back.4bpp.lz");
+    const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/shiny.gbapal.lz");
+    const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/gulping/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/front.4bpp.lz");
+    const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/normal.gbapal.lz");
+    const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/back.4bpp.lz");
+    const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/shiny.gbapal.lz");
+    const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/gorging/icon.4bpp");
 #endif //P_FAMILY_CRAMORANT
 
 #if P_FAMILY_ARROKUDA
-    const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/front.4bpp.lz");
-    const u32 gMonPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/normal.gbapal.lz");
-    const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/shiny.gbapal.lz");
-    const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp");
+    const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/front.4bpp.lz");
+    const u32 gMonPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/normal.gbapal.lz");
+    const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/shiny.gbapal.lz");
+    const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/gen_8/arrokuda/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/footprint.1bpp");
+    const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/gen_8/arrokuda/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz");
-    const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/normal.gbapal.lz");
-    const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/back.4bpp.lz");
-    const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/shiny.gbapal.lz");
-    const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp");
+    const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/front.4bpp.lz");
+    const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/normal.gbapal.lz");
+    const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/back.4bpp.lz");
+    const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/shiny.gbapal.lz");
+    const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/gen_8/barraskewda/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/footprint.1bpp");
+    const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/gen_8/barraskewda/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ARROKUDA
 
 #if P_FAMILY_TOXEL
-    const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/front.4bpp.lz");
-    const u32 gMonPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/normal.gbapal.lz");
-    const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/shiny.gbapal.lz");
-    const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp");
+    const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/front.4bpp.lz");
+    const u32 gMonPalette_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/normal.gbapal.lz");
+    const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/shiny.gbapal.lz");
+    const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/gen_8/toxel/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/footprint.1bpp");
+    const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/gen_8/toxel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz");
-    const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz");
-    const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/back.4bpp.lz");
-    const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/shiny.gbapal.lz");
-    const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp");
+    const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/front.4bpp.lz");
+    const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/normal.gbapal.lz");
+    const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/back.4bpp.lz");
+    const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/shiny.gbapal.lz");
+    const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/footprint.1bpp");
+    const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/front.4bpp.lz");
+    const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/normal.gbapal.lz");
+    const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/back.4bpp.lz");
+    const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/shiny.gbapal.lz");
+    const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/low_key/icon.4bpp");
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/toxtricity/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_TOXEL
 
 #if P_FAMILY_SIZZLIPEDE
-    const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/anim_front.4bpp.lz");
-    const u32 gMonPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/normal.gbapal.lz");
-    const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/shiny.gbapal.lz");
-    const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp");
+    const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/anim_front.4bpp.lz");
+    const u32 gMonPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/normal.gbapal.lz");
+    const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/shiny.gbapal.lz");
+    const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/gen_8/sizzlipede/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/footprint.1bpp");
+    const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/gen_8/sizzlipede/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/back.4bpp.lz");
-    const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/shiny.gbapal.lz");
-    const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp");
+    const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/anim_front.4bpp.lz");
+    const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/normal.gbapal.lz");
+    const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/back.4bpp.lz");
+    const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/shiny.gbapal.lz");
+    const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/footprint.1bpp");
+    const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/centiskorch/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_SIZZLIPEDE
 
 #if P_FAMILY_CLOBBOPUS
-    const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/front.4bpp.lz");
-    const u32 gMonPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/normal.gbapal.lz");
-    const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/shiny.gbapal.lz");
-    const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp");
+    const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/front.4bpp.lz");
+    const u32 gMonPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/normal.gbapal.lz");
+    const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/shiny.gbapal.lz");
+    const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/gen_8/clobbopus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/footprint.1bpp");
+    const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/gen_8/clobbopus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/front.4bpp.lz");
-    const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/normal.gbapal.lz");
-    const u32 gMonBackPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/shiny.gbapal.lz");
-    const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/icon.4bpp");
+    const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/front.4bpp.lz");
+    const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/normal.gbapal.lz");
+    const u32 gMonBackPic_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/shiny.gbapal.lz");
+    const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/gen_8/grapploct/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/footprint.1bpp");
+    const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/gen_8/grapploct/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CLOBBOPUS
 
 #if P_FAMILY_SINISTEA
-    const u32 gMonFrontPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/front.4bpp.lz");
-    const u32 gMonPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/normal.gbapal.lz");
-    const u32 gMonBackPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/shiny.gbapal.lz");
-    const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/icon.4bpp");
+    const u32 gMonFrontPic_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/front.4bpp.lz");
+    const u32 gMonPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/normal.gbapal.lz");
+    const u32 gMonBackPic_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/shiny.gbapal.lz");
+    const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/gen_8/sinistea/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/footprint.1bpp");
+    const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/gen_8/sinistea/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/front.4bpp.lz");
-    const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/normal.gbapal.lz");
-    const u32 gMonBackPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/back.4bpp.lz");
-    const u32 gMonShinyPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/shiny.gbapal.lz");
-    const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/icon.4bpp");
+    const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/front.4bpp.lz");
+    const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/normal.gbapal.lz");
+    const u32 gMonBackPic_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/back.4bpp.lz");
+    const u32 gMonShinyPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/shiny.gbapal.lz");
+    const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/gen_8/polteageist/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/footprint.1bpp");
+    const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/gen_8/polteageist/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SINISTEA
 
 #if P_FAMILY_HATENNA
-    const u32 gMonFrontPic_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/front.4bpp.lz");
-    const u32 gMonPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/normal.gbapal.lz");
-    const u32 gMonBackPic_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/shiny.gbapal.lz");
-    const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/icon.4bpp");
+    const u32 gMonFrontPic_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/front.4bpp.lz");
+    const u32 gMonPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/normal.gbapal.lz");
+    const u32 gMonBackPic_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/shiny.gbapal.lz");
+    const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/gen_8/hatenna/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/footprint.1bpp");
+    const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/gen_8/hatenna/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/front.4bpp.lz");
-    const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/normal.gbapal.lz");
-    const u32 gMonBackPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/shiny.gbapal.lz");
-    const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/icon.4bpp");
+    const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/front.4bpp.lz");
+    const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/normal.gbapal.lz");
+    const u32 gMonBackPic_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/shiny.gbapal.lz");
+    const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/gen_8/hattrem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/footprint.1bpp");
+    const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/gen_8/hattrem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/front.4bpp.lz");
-    const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/normal.gbapal.lz");
-    const u32 gMonBackPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/back.4bpp.lz");
-    const u32 gMonShinyPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/shiny.gbapal.lz");
-    const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/icon.4bpp");
+    const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/front.4bpp.lz");
+    const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/normal.gbapal.lz");
+    const u32 gMonBackPic_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/back.4bpp.lz");
+    const u32 gMonShinyPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/shiny.gbapal.lz");
+    const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/footprint.1bpp");
+    const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/hatterene/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_HATENNA
 
 #if P_FAMILY_IMPIDIMP
-    const u32 gMonFrontPic_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/front.4bpp.lz");
-    const u32 gMonPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/normal.gbapal.lz");
-    const u32 gMonBackPic_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/back.4bpp.lz");
-    const u32 gMonShinyPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/shiny.gbapal.lz");
-    const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/icon.4bpp");
+    const u32 gMonFrontPic_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/front.4bpp.lz");
+    const u32 gMonPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/normal.gbapal.lz");
+    const u32 gMonBackPic_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/back.4bpp.lz");
+    const u32 gMonShinyPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/shiny.gbapal.lz");
+    const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/gen_8/impidimp/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/footprint.1bpp");
+    const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/gen_8/impidimp/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/front.4bpp.lz");
-    const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/normal.gbapal.lz");
-    const u32 gMonBackPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/back.4bpp.lz");
-    const u32 gMonShinyPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/shiny.gbapal.lz");
-    const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/icon.4bpp");
+    const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/front.4bpp.lz");
+    const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/normal.gbapal.lz");
+    const u32 gMonBackPic_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/back.4bpp.lz");
+    const u32 gMonShinyPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/shiny.gbapal.lz");
+    const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/gen_8/morgrem/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/footprint.1bpp");
+    const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/gen_8/morgrem/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/front.4bpp.lz");
-    const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/normal.gbapal.lz");
-    const u32 gMonBackPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/shiny.gbapal.lz");
-    const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/icon.4bpp");
+    const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/front.4bpp.lz");
+    const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/normal.gbapal.lz");
+    const u32 gMonBackPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/shiny.gbapal.lz");
+    const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/footprint.1bpp");
+    const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_IMPIDIMP
 
 #if P_FAMILY_MILCERY
-    const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz");
-    const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz");
-    const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz");
-    const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz");
-    const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp");
+    const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/front.4bpp.lz");
+    const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/normal.gbapal.lz");
+    const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/back.4bpp.lz");
+    const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/shiny.gbapal.lz");
+    const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/gen_8/milcery/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/footprint.1bpp");
-#endif //P_FOOTPRINTS
-    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");
-    const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz");
-
-    const u8 gMonIcon_AlcremieStrawberryVanillaCream[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberrySaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp");
-    //const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp");
-
-    const u32 gMonFrontPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberrySaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_shiny.gbapal.lz");
-#if P_FOOTPRINTS
-    const u8 gMonFootprint_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/footprint.1bpp");
+    const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/gen_8/milcery/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieBerryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerrySaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieBerryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_shiny.gbapal.lz");
+    const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/front.4bpp.lz");
+    const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/back.4bpp.lz");
+    const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/shiny.gbapal.lz");
 
-    const u32 gMonFrontPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieLoveVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieLoveRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_shiny.gbapal.lz");
+    const u8 gMonIcon_AlcremieStrawberryVanillaCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryRubyCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/ruby_cream/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryMatchaCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/matcha_cream/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryMintCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/mint_cream/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryLemonCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/lemon_cream/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberrySaltedCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/salted_cream/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryRubySwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/ruby_swirl/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/caramel_swirl/icon.4bpp");
+    //const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/rainbow_swirl/icon.4bpp");
 
-    const u32 gMonFrontPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieStarVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieStarRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_shiny.gbapal.lz");
+    const u32 gMonFrontPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberrySaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.gbapal.lz");
+#if P_FOOTPRINTS
+    const u8 gMonFootprint_Alcremie[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/footprint.1bpp");
+#endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieCloverVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieCloverRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_shiny.gbapal.lz");
+    const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieBerryVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerrySaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieBerryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_shiny.gbapal.lz");
 
-    const u32 gMonFrontPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieFlowerVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieFlowerRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_rainbow_swirl.gbapal.lz");
-    const u32 gMonBackPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/back.4bpp.lz");
-    const u32 gMonShinyPalette_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_shiny.gbapal.lz");
+    const u32 gMonFrontPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieLoveVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieLoveRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_shiny.gbapal.lz");
 
-    const u32 gMonFrontPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/front.4bpp.lz");
-    const u32 gMonPalette_AlcremieRibbonVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_default.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.gbapal.lz");
-    const u32 gMonPalette_AlcremieRibbonRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.gbapal.lz");
-    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");
+    const u32 gMonFrontPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieStarVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieStarRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_shiny.gbapal.lz");
+
+    const u32 gMonFrontPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieCloverVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieCloverRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_shiny.gbapal.lz");
+
+    const u32 gMonFrontPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieFlowerVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieFlowerRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_shiny.gbapal.lz");
+
+    const u32 gMonFrontPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/front.4bpp.lz");
+    const u32 gMonPalette_AlcremieRibbonVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.gbapal.lz");
+    const u32 gMonPalette_AlcremieRibbonRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.gbapal.lz");
+    const u32 gMonBackPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/back.4bpp.lz");
+    const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.gbapal.lz");
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/alcremie/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_MILCERY
 
 #if P_FAMILY_FALINKS
-    const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/front.4bpp.lz");
-    const u32 gMonPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/normal.gbapal.lz");
-    const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/back.4bpp.lz");
-    const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/shiny.gbapal.lz");
-    const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp");
+    const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/front.4bpp.lz");
+    const u32 gMonPalette_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/normal.gbapal.lz");
+    const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/back.4bpp.lz");
+    const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/shiny.gbapal.lz");
+    const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/gen_8/falinks/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/footprint.1bpp");
+    const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/gen_8/falinks/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FALINKS
 
 #if P_FAMILY_PINCURCHIN
-    const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/anim_front.4bpp.lz");
-    const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/normal.gbapal.lz");
-    const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/shiny.gbapal.lz");
-    const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp");
+    const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/anim_front.4bpp.lz");
+    const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/normal.gbapal.lz");
+    const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/shiny.gbapal.lz");
+    const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/gen_8/pincurchin/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/footprint.1bpp");
+    const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/gen_8/pincurchin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PINCURCHIN
 
 #if P_FAMILY_SNOM
-    const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/front.4bpp.lz");
-    const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/normal.gbapal.lz");
-    const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/shiny.gbapal.lz");
-    const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp");
+    const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/front.4bpp.lz");
+    const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/normal.gbapal.lz");
+    const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/shiny.gbapal.lz");
+    const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/gen_8/snom/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/snom/footprint.1bpp");
+    const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/gen_8/snom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz");
-    const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/normal.gbapal.lz");
-    const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/back.4bpp.lz");
-    const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/shiny.gbapal.lz");
-    const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp");
+    const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/front.4bpp.lz");
+    const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/normal.gbapal.lz");
+    const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/back.4bpp.lz");
+    const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/shiny.gbapal.lz");
+    const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/gen_8/frosmoth/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/footprint.1bpp");
+    const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/gen_8/frosmoth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SNOM
 
 #if P_FAMILY_STONJOURNER
-    const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/front.4bpp.lz");
-    const u32 gMonPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/normal.gbapal.lz");
-    const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/back.4bpp.lz");
-    const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/shiny.gbapal.lz");
-    const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp");
+    const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/front.4bpp.lz");
+    const u32 gMonPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/normal.gbapal.lz");
+    const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/back.4bpp.lz");
+    const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/shiny.gbapal.lz");
+    const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/gen_8/stonjourner/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/footprint.1bpp");
+    const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/gen_8/stonjourner/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_STONJOURNER
 
 #if P_FAMILY_EISCUE
-    const u32 gMonFrontPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz");
-    const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz");
-    const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz");
-    const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz");
-    const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp");
+    const u32 gMonFrontPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/front.4bpp.lz");
+    const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/normal.gbapal.lz");
+    const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/back.4bpp.lz");
+    const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/shiny.gbapal.lz");
+    const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/footprint.1bpp");
+    const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz");
-    const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz");
-    const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/back.4bpp.lz");
-    const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/shiny.gbapal.lz");
-    const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp");
+    const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/front.4bpp.lz");
+    const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/normal.gbapal.lz");
+    const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/back.4bpp.lz");
+    const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/shiny.gbapal.lz");
+    const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/noice_face/icon.4bpp");
 #endif //P_FAMILY_EISCUE
 
 #if P_FAMILY_INDEEDEE
-    const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz");
-    const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz");
-    const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz");
-    const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz");
-    const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp");
+    const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/front.4bpp.lz");
+    const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/normal.gbapal.lz");
+    const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/back.4bpp.lz");
+    const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/shiny.gbapal.lz");
+    const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/footprint.1bpp");
+    const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/front.4bpp.lz");
-    const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/normal.gbapal.lz");
-    const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/back.4bpp.lz");
-    const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/shiny.gbapal.lz");
-    const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp");
+    const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/front.4bpp.lz");
+    const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/normal.gbapal.lz");
+    const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/back.4bpp.lz");
+    const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/shiny.gbapal.lz");
+    const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/female/icon.4bpp");
 #endif //P_FAMILY_INDEEDEE
 
 #if P_FAMILY_MORPEKO
-    const u32 gMonFrontPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/front.4bpp.lz");
-    const u32 gMonPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/normal.gbapal.lz");
-    const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/back.4bpp.lz");
-    const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/shiny.gbapal.lz");
-    const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp");
+    const u32 gMonFrontPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/front.4bpp.lz");
+    const u32 gMonPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/normal.gbapal.lz");
+    const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/back.4bpp.lz");
+    const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/shiny.gbapal.lz");
+    const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/footprint.1bpp");
+    const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/front.4bpp.lz");
+    const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/normal.gbapal.lz");
+    const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/back.4bpp.lz");
+    const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/shiny.gbapal.lz");
+    const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/hangry/icon.4bpp");
 #endif //P_FAMILY_MORPEKO
 
 #if P_FAMILY_CUFANT
-    const u32 gMonFrontPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/front.4bpp.lz");
-    const u32 gMonPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/normal.gbapal.lz");
-    const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/shiny.gbapal.lz");
-    const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp");
+    const u32 gMonFrontPic_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/front.4bpp.lz");
+    const u32 gMonPalette_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/normal.gbapal.lz");
+    const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/shiny.gbapal.lz");
+    const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/gen_8/cufant/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/footprint.1bpp");
+    const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/gen_8/cufant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/front.4bpp.lz");
-    const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/normal.gbapal.lz");
-    const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/back.4bpp.lz");
-    const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/shiny.gbapal.lz");
-    const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp");
+    const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/front.4bpp.lz");
+    const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/normal.gbapal.lz");
+    const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/back.4bpp.lz");
+    const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/shiny.gbapal.lz");
+    const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/footprint.1bpp");
+    const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/copperajah/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 #endif //P_FAMILY_CUFANT
 
 #if P_FAMILY_DRACOZOLT
-    const u32 gMonFrontPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/front.4bpp.lz");
-    const u32 gMonPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/normal.gbapal.lz");
-    const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/shiny.gbapal.lz");
-    const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp");
+    const u32 gMonFrontPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/front.4bpp.lz");
+    const u32 gMonPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/normal.gbapal.lz");
+    const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/shiny.gbapal.lz");
+    const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/gen_8/dracozolt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/footprint.1bpp");
+    const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/gen_8/dracozolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRACOZOLT
 
 #if P_FAMILY_ARCTOZOLT
-    const u32 gMonFrontPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/front.4bpp.lz");
-    const u32 gMonPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/normal.gbapal.lz");
-    const u32 gMonBackPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/shiny.gbapal.lz");
-    const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp");
+    const u32 gMonFrontPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/front.4bpp.lz");
+    const u32 gMonPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/normal.gbapal.lz");
+    const u32 gMonBackPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/shiny.gbapal.lz");
+    const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/gen_8/arctozolt/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/footprint.1bpp");
+    const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/gen_8/arctozolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ARCTOZOLT
 
 #if P_FAMILY_DRACOVISH
-    const u32 gMonFrontPic_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/front.4bpp.lz");
-    const u32 gMonPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/normal.gbapal.lz");
-    const u32 gMonBackPic_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/shiny.gbapal.lz");
-    const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp");
+    const u32 gMonFrontPic_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/front.4bpp.lz");
+    const u32 gMonPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/normal.gbapal.lz");
+    const u32 gMonBackPic_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/shiny.gbapal.lz");
+    const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/gen_8/dracovish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/footprint.1bpp");
+    const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/gen_8/dracovish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DRACOVISH
 
 #if P_FAMILY_ARCTOVISH
-    const u32 gMonFrontPic_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/front.4bpp.lz");
-    const u32 gMonPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/normal.gbapal.lz");
-    const u32 gMonBackPic_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/shiny.gbapal.lz");
-    const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp");
+    const u32 gMonFrontPic_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/front.4bpp.lz");
+    const u32 gMonPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/normal.gbapal.lz");
+    const u32 gMonBackPic_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/shiny.gbapal.lz");
+    const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/gen_8/arctovish/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/footprint.1bpp");
+    const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/gen_8/arctovish/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ARCTOVISH
 
 #if P_FAMILY_DURALUDON
-    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/front.4bpp.lz");
-    const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/normal.gbapal.lz");
-    const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz");
-    const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp");
+    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/front.4bpp.lz");
+    const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/normal.gbapal.lz");
+    const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/shiny.gbapal.lz");
+    const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/footprint.1bpp");
+    const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_GIGANTAMAX_FORMS
-    const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/gigantamax/icon.4bpp");
 #endif //P_GIGANTAMAX_FORMS
 
 #if P_GEN_9_CROSS_EVOS
@@ -11586,1457 +11588,1457 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
 #endif //P_FAMILY_DURALUDON
 
 #if P_FAMILY_DREEPY
-    const u32 gMonFrontPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/front.4bpp.lz");
-    const u32 gMonPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/normal.gbapal.lz");
-    const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/shiny.gbapal.lz");
-    const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp");
+    const u32 gMonFrontPic_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/front.4bpp.lz");
+    const u32 gMonPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/normal.gbapal.lz");
+    const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/shiny.gbapal.lz");
+    const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/gen_8/dreepy/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/footprint.1bpp");
+    const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/gen_8/dreepy/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/front.4bpp.lz");
-    const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/normal.gbapal.lz");
-    const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/back.4bpp.lz");
-    const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/shiny.gbapal.lz");
-    const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp");
+    const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/front.4bpp.lz");
+    const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/normal.gbapal.lz");
+    const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/back.4bpp.lz");
+    const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/shiny.gbapal.lz");
+    const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/gen_8/drakloak/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/footprint.1bpp");
+    const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/gen_8/drakloak/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/front.4bpp.lz");
-    const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/normal.gbapal.lz");
-    const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/shiny.gbapal.lz");
-    const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp");
+    const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/front.4bpp.lz");
+    const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/normal.gbapal.lz");
+    const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/shiny.gbapal.lz");
+    const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/gen_8/dragapult/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/footprint.1bpp");
+    const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/gen_8/dragapult/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DREEPY
 
 #if P_FAMILY_ZACIAN
-    const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz");
-    const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz");
-    const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz");
-    const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp");
+    const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/front.4bpp.lz");
+    const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/normal.gbapal.lz");
+    const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/shiny.gbapal.lz");
+    const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/footprint.1bpp");
+    const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz");
-    const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz");
-    const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz");
-    const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp");
+    const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/front.4bpp.lz");
+    const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/normal.gbapal.lz");
+    const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/shiny.gbapal.lz");
+    const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/crowned_sword/icon.4bpp");
 #endif //P_FAMILY_ZACIAN
 
 #if P_FAMILY_ZAMAZENTA
-    const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz");
-    const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz");
-    const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz");
-    const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp");
+    const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/front.4bpp.lz");
+    const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/normal.gbapal.lz");
+    const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/shiny.gbapal.lz");
+    const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/footprint.1bpp");
+    const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz");
-    const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz");
-    const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz");
-    const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz");
-    const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp");
+    const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/front.4bpp.lz");
+    const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.gbapal.lz");
+    const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.gbapal.lz");
+    const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.4bpp");
 #endif //P_FAMILY_ZAMAZENTA
 
 #if P_FAMILY_ETERNATUS
-    const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/front.4bpp.lz");
-    const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/normal.gbapal.lz");
-    const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/shiny.gbapal.lz");
-    const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp");
+    const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/front.4bpp.lz");
+    const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/normal.gbapal.lz");
+    const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/shiny.gbapal.lz");
+    const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/footprint.1bpp");
+    const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/front.4bpp.lz");
+    const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/normal.gbapal.lz");
+    const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/back.4bpp.lz");
+    const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/shiny.gbapal.lz");
+    const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/eternamax/icon.4bpp");
 #endif //P_FAMILY_ETERNATUS
 
 #if P_FAMILY_KUBFU
-    const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/front.4bpp.lz");
-    const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/normal.gbapal.lz");
-    const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz");
-    const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp");
+    const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/front.4bpp.lz");
+    const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/normal.gbapal.lz");
+    const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/shiny.gbapal.lz");
+    const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/gen_8/kubfu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/footprint.1bpp");
+    const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/gen_8/kubfu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz");
-    const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz");
-    const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz");
-    const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz");
-    const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp");
+    const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/front.4bpp.lz");
+    const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/normal.gbapal.lz");
+    const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/back.4bpp.lz");
+    const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/shiny.gbapal.lz");
+    const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/footprint.1bpp");
+    const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz");
-    const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz");
-    const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/back.4bpp.lz");
-    const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/shiny.gbapal.lz");
+    const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.4bpp.lz");
+    const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.gbapal.lz");
+    const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.4bpp.lz");
+    const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.gbapal.lz");
 
-    const u32 gMonFrontPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.4bpp");
 
-    const u32 gMonFrontPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz");
-    const u32 gMonBackPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz");
-    const u32 gMonPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz");
-    const u32 gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz");
-    const u8 gMonIcon_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.4bpp");
+    const u32 gMonFrontPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz");
+    const u32 gMonBackPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz");
+    const u32 gMonPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz");
+    const u32 gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz");
+    const u8 gMonIcon_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.4bpp");
 #endif //P_FAMILY_KUBFU
 
 #if P_FAMILY_ZARUDE
-    const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/front.4bpp.lz");
-    const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/normal.gbapal.lz");
-    const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz");
-    const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz");
-    const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp");
+    const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/front.4bpp.lz");
+    const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/normal.gbapal.lz");
+    const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/back.4bpp.lz");
+    const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/shiny.gbapal.lz");
+    const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/footprint.1bpp");
+    const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/front.4bpp.lz");
+    const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/normal.gbapal.lz");
+    const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/back.4bpp.lz");
+    const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/shiny.gbapal.lz");
+    const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/dada/icon.4bpp");
 #endif //P_FAMILY_ZARUDE
 
 #if P_FAMILY_REGIELEKI
-    const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz");
-    const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz");
-    const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz");
-    const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz");
-    const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp");
+    const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/front.4bpp.lz");
+    const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/normal.gbapal.lz");
+    const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/back.4bpp.lz");
+    const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/shiny.gbapal.lz");
+    const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/gen_8/regieleki/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/footprint.1bpp");
+    const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/gen_8/regieleki/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGIELEKI
 
 #if P_FAMILY_REGIDRAGO
-    const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/front.4bpp.lz");
-    const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/normal.gbapal.lz");
-    const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz");
-    const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz");
-    const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp");
+    const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/front.4bpp.lz");
+    const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/normal.gbapal.lz");
+    const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/back.4bpp.lz");
+    const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/shiny.gbapal.lz");
+    const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/gen_8/regidrago/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footprint.1bpp");
+    const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/gen_8/regidrago/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_REGIDRAGO
 
 #if P_FAMILY_GLASTRIER
-    const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz");
-    const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz");
-    const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz");
-    const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp");
+    const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/front.4bpp.lz");
+    const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/normal.gbapal.lz");
+    const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/shiny.gbapal.lz");
+    const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/gen_8/glastrier/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp");
+    const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/gen_8/glastrier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GLASTRIER
 
 #if P_FAMILY_SPECTRIER
-    const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz");
-    const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz");
-    const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz");
-    const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp");
+    const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/front.4bpp.lz");
+    const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/normal.gbapal.lz");
+    const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/shiny.gbapal.lz");
+    const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/gen_8/spectrier/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp");
+    const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/gen_8/spectrier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPECTRIER
 
 #if P_FAMILY_CALYREX
-    const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz");
-    const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz");
-    const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz");
-    const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz");
-    const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp");
+    const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/front.4bpp.lz");
+    const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/normal.gbapal.lz");
+    const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/back.4bpp.lz");
+    const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shiny.gbapal.lz");
+    const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/icon.4bpp");
 #if P_FOOTPRINTS
-    const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp");
+    const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
 #if P_FUSION_FORMS
-    const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz");
-    const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz");
-    const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz");
-    const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
-    const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
+    const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/front.4bpp.lz");
+    const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/normal.gbapal.lz");
+    const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/back.4bpp.lz");
+    const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/shiny.gbapal.lz");
+    const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/ice_rider/icon.4bpp");
 #endif //P_FUSION_FORMS
 
 #if P_FUSION_FORMS
-    const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz");
-    const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz");
-    const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz");
-    const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
-    const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
+    const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/front.4bpp.lz");
+    const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/normal.gbapal.lz");
+    const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/back.4bpp.lz");
+    const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.gbapal.lz");
+    const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/shadow_rider/icon.4bpp");
 #endif //P_FUSION_FORMS
 #endif //P_FAMILY_CALYREX
 
 #if P_FAMILY_SPRIGATITO
-    const u32 gMonFrontPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/front.4bpp.lz");
-    const u32 gMonPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/normal.gbapal.lz");
-    const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/shiny.gbapal.lz");
-    const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/icon.4bpp");
+    const u32 gMonFrontPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/front.4bpp.lz");
+    const u32 gMonPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/normal.gbapal.lz");
+    const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/shiny.gbapal.lz");
+    const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/gen_9/sprigatito/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp");
+    // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/gen_9/sprigatito/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/front.4bpp.lz");
-    const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/normal.gbapal.lz");
-    const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/back.4bpp.lz");
-    const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/shiny.gbapal.lz");
-    const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/icon.4bpp");
+    const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/front.4bpp.lz");
+    const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/normal.gbapal.lz");
+    const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/back.4bpp.lz");
+    const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/shiny.gbapal.lz");
+    const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/gen_9/floragato/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp");
+    // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/gen_9/floragato/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/front.4bpp.lz");
-    const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/normal.gbapal.lz");
-    const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/back.4bpp.lz");
-    const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/shiny.gbapal.lz");
-    const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/icon.4bpp");
+    const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/front.4bpp.lz");
+    const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/normal.gbapal.lz");
+    const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/back.4bpp.lz");
+    const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/shiny.gbapal.lz");
+    const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/gen_9/meowscarada/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp");
+    // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/gen_9/meowscarada/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SPRIGATITO
 
 #if P_FAMILY_FUECOCO
-    const u32 gMonFrontPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/front.4bpp.lz");
-    const u32 gMonPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/normal.gbapal.lz");
-    const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/shiny.gbapal.lz");
-    const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/icon.4bpp");
+    const u32 gMonFrontPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/front.4bpp.lz");
+    const u32 gMonPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/normal.gbapal.lz");
+    const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/shiny.gbapal.lz");
+    const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/gen_9/fuecoco/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp");
+    // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/gen_9/fuecoco/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/front.4bpp.lz");
-    const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/normal.gbapal.lz");
-    const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/shiny.gbapal.lz");
-    const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/icon.4bpp");
+    const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/front.4bpp.lz");
+    const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/normal.gbapal.lz");
+    const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/shiny.gbapal.lz");
+    const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/gen_9/crocalor/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp");
+    // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/gen_9/crocalor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/front.4bpp.lz");
-    const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/normal.gbapal.lz");
-    const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/back.4bpp.lz");
-    const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/shiny.gbapal.lz");
-    const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/icon.4bpp");
+    const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/front.4bpp.lz");
+    const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/normal.gbapal.lz");
+    const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/back.4bpp.lz");
+    const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/shiny.gbapal.lz");
+    const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/gen_9/skeledirge/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp");
+    // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/gen_9/skeledirge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FUECOCO
 
 #if P_FAMILY_QUAXLY
-    const u32 gMonFrontPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/front.4bpp.lz");
-    const u32 gMonPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/normal.gbapal.lz");
-    const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/shiny.gbapal.lz");
-    const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/icon.4bpp");
+    const u32 gMonFrontPic_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/front.4bpp.lz");
+    const u32 gMonPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/normal.gbapal.lz");
+    const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/shiny.gbapal.lz");
+    const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/gen_9/quaxly/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp");
+    // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/gen_9/quaxly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/front.4bpp.lz");
-    const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/normal.gbapal.lz");
-    const u32 gMonBackPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/shiny.gbapal.lz");
-    const u8 gMonIcon_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/icon.4bpp");
+    const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/front.4bpp.lz");
+    const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/normal.gbapal.lz");
+    const u32 gMonBackPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/shiny.gbapal.lz");
+    const u8 gMonIcon_Quaxwell[] = INCBIN_U8("graphics/pokemon/gen_9/quaxwell/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/footprint.1bpp");
+    // const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/gen_9/quaxwell/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/front.4bpp.lz");
-    const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/normal.gbapal.lz");
-    const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/back.4bpp.lz");
-    const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/shiny.gbapal.lz");
-    const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/icon.4bpp");
+    const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/front.4bpp.lz");
+    const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/normal.gbapal.lz");
+    const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/back.4bpp.lz");
+    const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/shiny.gbapal.lz");
+    const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/gen_9/quaquaval/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp");
+    // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/gen_9/quaquaval/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_QUAXLY
 
 #if P_FAMILY_LECHONK
-    const u32 gMonFrontPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/front.4bpp.lz");
-    const u32 gMonPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/normal.gbapal.lz");
-    const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/shiny.gbapal.lz");
-    const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp");
+    const u32 gMonFrontPic_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/front.4bpp.lz");
+    const u32 gMonPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/normal.gbapal.lz");
+    const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/shiny.gbapal.lz");
+    const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/gen_9/lechonk/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp");
+    // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/gen_9/lechonk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz");
-    const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz");
-    const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz");
-    const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz");
-    const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp");
+    const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/front.4bpp.lz");
+    const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/normal.gbapal.lz");
+    const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/back.4bpp.lz");
+    const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/shiny.gbapal.lz");
+    const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp");
+    // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz");
-    const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/normal.gbapal.lz");
-    const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/back.4bpp.lz");
-    const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz");
-    const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp");
+    const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/front.4bpp.lz");
+    const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/normal.gbapal.lz");
+    const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/back.4bpp.lz");
+    const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/shiny.gbapal.lz");
+    const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/female/icon.4bpp");
 #endif //P_FAMILY_LECHONK
 
 #if P_FAMILY_TAROUNTULA
-    const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/front.4bpp.lz");
-    const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/normal.gbapal.lz");
-    const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/shiny.gbapal.lz");
-    const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/icon.4bpp");
+    const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/front.4bpp.lz");
+    const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/normal.gbapal.lz");
+    const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/shiny.gbapal.lz");
+    const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/gen_9/tarountula/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp");
+    // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/gen_9/tarountula/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/front.4bpp.lz");
-    const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/normal.gbapal.lz");
-    const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/back.4bpp.lz");
-    const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/shiny.gbapal.lz");
-    const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/icon.4bpp");
+    const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/front.4bpp.lz");
+    const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/normal.gbapal.lz");
+    const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/back.4bpp.lz");
+    const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/shiny.gbapal.lz");
+    const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/gen_9/spidops/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp");
+    // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/gen_9/spidops/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TAROUNTULA
 
 #if P_FAMILY_NYMBLE
-    const u32 gMonFrontPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/front.4bpp.lz");
-    const u32 gMonPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/normal.gbapal.lz");
-    const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/shiny.gbapal.lz");
-    const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/icon.4bpp");
+    const u32 gMonFrontPic_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/front.4bpp.lz");
+    const u32 gMonPalette_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/normal.gbapal.lz");
+    const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/shiny.gbapal.lz");
+    const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/gen_9/nymble/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp");
+    // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/gen_9/nymble/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/front.4bpp.lz");
-    const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/normal.gbapal.lz");
-    const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/back.4bpp.lz");
-    const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/shiny.gbapal.lz");
-    const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/icon.4bpp");
+    const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/front.4bpp.lz");
+    const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/normal.gbapal.lz");
+    const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/back.4bpp.lz");
+    const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/shiny.gbapal.lz");
+    const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/gen_9/lokix/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp");
+    // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/gen_9/lokix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NYMBLE
 
 #if P_FAMILY_PAWMI
-    const u32 gMonFrontPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/front.4bpp.lz");
-    const u32 gMonPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/normal.gbapal.lz");
-    const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/shiny.gbapal.lz");
-    const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/icon.4bpp");
+    const u32 gMonFrontPic_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/front.4bpp.lz");
+    const u32 gMonPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/normal.gbapal.lz");
+    const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/shiny.gbapal.lz");
+    const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/gen_9/pawmi/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp");
+    // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/gen_9/pawmi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/front.4bpp.lz");
-    const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/normal.gbapal.lz");
-    const u32 gMonBackPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/shiny.gbapal.lz");
-    const u8 gMonIcon_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/icon.4bpp");
+    const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/front.4bpp.lz");
+    const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/normal.gbapal.lz");
+    const u32 gMonBackPic_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/shiny.gbapal.lz");
+    const u8 gMonIcon_Pawmo[] = INCBIN_U8("graphics/pokemon/gen_9/pawmo/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/footprint.1bpp");
+    // const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/gen_9/pawmo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/front.4bpp.lz");
-    const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/normal.gbapal.lz");
-    const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/back.4bpp.lz");
-    const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/shiny.gbapal.lz");
-    const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/icon.4bpp");
+    const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/front.4bpp.lz");
+    const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/normal.gbapal.lz");
+    const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/back.4bpp.lz");
+    const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/shiny.gbapal.lz");
+    const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/gen_9/pawmot/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp");
+    // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/gen_9/pawmot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PAWMI
 
 #if P_FAMILY_TANDEMAUS
-    const u32 gMonFrontPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/front.4bpp.lz");
-    const u32 gMonPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/normal.gbapal.lz");
-    const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/shiny.gbapal.lz");
-    const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp");
+    const u32 gMonFrontPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/front.4bpp.lz");
+    const u32 gMonPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/normal.gbapal.lz");
+    const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/shiny.gbapal.lz");
+    const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/gen_9/tandemaus/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp");
+    // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/gen_9/tandemaus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz");
-    const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz");
+    const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/normal.gbapal.lz");
+    const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/shiny.gbapal.lz");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp");
+    // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz");
-    const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz");
-    const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp");
+    const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/front.4bpp.lz");
+    const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/back.4bpp.lz");
+    const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/icon.4bpp");
 
-    const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz");
-    const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz");
-    const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp");
+    const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/four/front.4bpp.lz");
+    const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/four/back.4bpp.lz");
+    const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/four/icon.4bpp");
 #endif //P_FAMILY_TANDEMAUS
 
 #if P_FAMILY_FIDOUGH
-    const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/front.4bpp.lz");
-    const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/normal.gbapal.lz");
-    const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/shiny.gbapal.lz");
-    const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/icon.4bpp");
+    const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/front.4bpp.lz");
+    const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/normal.gbapal.lz");
+    const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/shiny.gbapal.lz");
+    const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/gen_9/fidough/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp");
+    // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/gen_9/fidough/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.4bpp.lz");
-    const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/normal.gbapal.lz");
-    const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/shiny.gbapal.lz");
-    const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/icon.4bpp");
+    const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/front.4bpp.lz");
+    const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/normal.gbapal.lz");
+    const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/shiny.gbapal.lz");
+    const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/gen_9/dachsbun/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp");
+    // const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/gen_9/dachsbun/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FIDOUGH
 
 #if P_FAMILY_SMOLIV
-    const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/front.4bpp.lz");
-    const u32 gMonPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/normal.gbapal.lz");
-    const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/back.4bpp.lz");
-    const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/shiny.gbapal.lz");
-    const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/icon.4bpp");
+    const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/front.4bpp.lz");
+    const u32 gMonPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/normal.gbapal.lz");
+    const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/back.4bpp.lz");
+    const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/shiny.gbapal.lz");
+    const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/gen_9/smoliv/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp");
+    // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/gen_9/smoliv/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/front.4bpp.lz");
-    const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/normal.gbapal.lz");
-    const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/shiny.gbapal.lz");
-    const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/icon.4bpp");
+    const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/front.4bpp.lz");
+    const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/normal.gbapal.lz");
+    const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/shiny.gbapal.lz");
+    const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/gen_9/dolliv/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp");
+    // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/gen_9/dolliv/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/front.4bpp.lz");
-    const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/normal.gbapal.lz");
-    const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/shiny.gbapal.lz");
-    const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp");
+    const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/front.4bpp.lz");
+    const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/normal.gbapal.lz");
+    const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/shiny.gbapal.lz");
+    const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/gen_9/arboliva/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp");
+    // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/gen_9/arboliva/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SMOLIV
 
 #if P_FAMILY_SQUAWKABILLY
-    const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/front.4bpp.lz");
-    const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/back.4bpp.lz");
+    const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/front.4bpp.lz");
+    const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/back.4bpp.lz");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp");
+    // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz");
-    const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/green_plumage/icon.4bpp");
+    const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.gbapal.lz");
+    const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.4bpp");
 
-    const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz");
-    const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp");
+    const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.gbapal.lz");
+    const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.4bpp");
 
-    const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz");
-    const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp");
+    const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.gbapal.lz");
+    const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.4bpp");
 
-    const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz");
-    const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz");
-    const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp");
+    const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.gbapal.lz");
+    const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.gbapal.lz");
+    const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.4bpp");
 #endif //P_FAMILY_SQUAWKABILLY
 
 #if P_FAMILY_NACLI
-    const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/front.4bpp.lz");
-    const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/normal.gbapal.lz");
-    const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/back.4bpp.lz");
-    const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/shiny.gbapal.lz");
-    const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/icon.4bpp");
+    const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/front.4bpp.lz");
+    const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/normal.gbapal.lz");
+    const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/back.4bpp.lz");
+    const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/shiny.gbapal.lz");
+    const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/gen_9/nacli/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp");
+    // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/gen_9/nacli/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/front.4bpp.lz");
-    const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/normal.gbapal.lz");
-    const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/back.4bpp.lz");
-    const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/shiny.gbapal.lz");
-    const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/icon.4bpp");
+    const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/front.4bpp.lz");
+    const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/normal.gbapal.lz");
+    const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/back.4bpp.lz");
+    const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/shiny.gbapal.lz");
+    const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/gen_9/naclstack/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp");
+    // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/gen_9/naclstack/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/front.4bpp.lz");
-    const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/normal.gbapal.lz");
-    const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/back.4bpp.lz");
-    const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/shiny.gbapal.lz");
-    const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/icon.4bpp");
+    const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/front.4bpp.lz");
+    const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/normal.gbapal.lz");
+    const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/back.4bpp.lz");
+    const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/shiny.gbapal.lz");
+    const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/gen_9/garganacl/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp");
+    // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/gen_9/garganacl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_NACLI
 
 #if P_FAMILY_CHARCADET
-    const u32 gMonFrontPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/front.4bpp.lz");
-    const u32 gMonPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/normal.gbapal.lz");
-    const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/shiny.gbapal.lz");
-    const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/icon.4bpp");
+    const u32 gMonFrontPic_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/front.4bpp.lz");
+    const u32 gMonPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/normal.gbapal.lz");
+    const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/shiny.gbapal.lz");
+    const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/gen_9/charcadet/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp");
+    // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/gen_9/charcadet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/front.4bpp.lz");
-    const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/normal.gbapal.lz");
-    const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/back.4bpp.lz");
-    const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/shiny.gbapal.lz");
-    const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/icon.4bpp");
+    const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/front.4bpp.lz");
+    const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/normal.gbapal.lz");
+    const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/back.4bpp.lz");
+    const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/shiny.gbapal.lz");
+    const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/gen_9/armarouge/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp");
+    // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/gen_9/armarouge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/front.4bpp.lz");
-    const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/normal.gbapal.lz");
-    const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/back.4bpp.lz");
-    const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/shiny.gbapal.lz");
-    const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/icon.4bpp");
+    const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/front.4bpp.lz");
+    const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/normal.gbapal.lz");
+    const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/back.4bpp.lz");
+    const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/shiny.gbapal.lz");
+    const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/gen_9/ceruledge/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp");
+    // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/gen_9/ceruledge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHARCADET
 
 #if P_FAMILY_TADBULB
-    const u32 gMonFrontPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/front.4bpp.lz");
-    const u32 gMonPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/normal.gbapal.lz");
-    const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/shiny.gbapal.lz");
-    const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/icon.4bpp");
+    const u32 gMonFrontPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/front.4bpp.lz");
+    const u32 gMonPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/normal.gbapal.lz");
+    const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/shiny.gbapal.lz");
+    const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/gen_9/tadbulb/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp");
+    // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/gen_9/tadbulb/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/front.4bpp.lz");
-    const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/normal.gbapal.lz");
-    const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/shiny.gbapal.lz");
-    const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/icon.4bpp");
+    const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/front.4bpp.lz");
+    const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/normal.gbapal.lz");
+    const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/shiny.gbapal.lz");
+    const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/gen_9/bellibolt/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp");
+    // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/gen_9/bellibolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TADBULB
 
 #if P_FAMILY_WATTREL
-    const u32 gMonFrontPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/front.4bpp.lz");
-    const u32 gMonPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/normal.gbapal.lz");
-    const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/shiny.gbapal.lz");
-    const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/icon.4bpp");
+    const u32 gMonFrontPic_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/front.4bpp.lz");
+    const u32 gMonPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/normal.gbapal.lz");
+    const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/shiny.gbapal.lz");
+    const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/gen_9/wattrel/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp");
+    // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/gen_9/wattrel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/front.4bpp.lz");
-    const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/normal.gbapal.lz");
-    const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/shiny.gbapal.lz");
-    const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/icon.4bpp");
+    const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/front.4bpp.lz");
+    const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/normal.gbapal.lz");
+    const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/shiny.gbapal.lz");
+    const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/gen_9/kilowattrel/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp");
+    // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/gen_9/kilowattrel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WATTREL
 
 #if P_FAMILY_MASCHIFF
-    const u32 gMonFrontPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/front.4bpp.lz");
-    const u32 gMonPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/normal.gbapal.lz");
-    const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/shiny.gbapal.lz");
-    const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/icon.4bpp");
+    const u32 gMonFrontPic_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/front.4bpp.lz");
+    const u32 gMonPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/normal.gbapal.lz");
+    const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/shiny.gbapal.lz");
+    const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/gen_9/maschiff/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp");
+    // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/gen_9/maschiff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/front.4bpp.lz");
-    const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/normal.gbapal.lz");
-    const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/shiny.gbapal.lz");
-    const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/icon.4bpp");
+    const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/front.4bpp.lz");
+    const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/normal.gbapal.lz");
+    const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/shiny.gbapal.lz");
+    const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/gen_9/mabosstiff/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp");
+    // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/gen_9/mabosstiff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MASCHIFF
 
 #if P_FAMILY_SHROODLE
-    const u32 gMonFrontPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/front.4bpp.lz");
-    const u32 gMonPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/normal.gbapal.lz");
-    const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/shiny.gbapal.lz");
-    const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/icon.4bpp");
+    const u32 gMonFrontPic_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/front.4bpp.lz");
+    const u32 gMonPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/normal.gbapal.lz");
+    const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/shiny.gbapal.lz");
+    const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/gen_9/shroodle/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp");
+    // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/gen_9/shroodle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/front.4bpp.lz");
-    const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/normal.gbapal.lz");
-    const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/back.4bpp.lz");
-    const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/shiny.gbapal.lz");
-    const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/icon.4bpp");
+    const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/front.4bpp.lz");
+    const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/normal.gbapal.lz");
+    const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/back.4bpp.lz");
+    const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/shiny.gbapal.lz");
+    const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/gen_9/grafaiai/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp");
+    // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/gen_9/grafaiai/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SHROODLE
 
 #if P_FAMILY_BRAMBLIN
-    const u32 gMonFrontPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/front.4bpp.lz");
-    const u32 gMonPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/normal.gbapal.lz");
-    const u32 gMonBackPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/shiny.gbapal.lz");
-    const u8 gMonIcon_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/icon.4bpp");
+    const u32 gMonFrontPic_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/front.4bpp.lz");
+    const u32 gMonPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/normal.gbapal.lz");
+    const u32 gMonBackPic_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/shiny.gbapal.lz");
+    const u8 gMonIcon_Bramblin[] = INCBIN_U8("graphics/pokemon/gen_9/bramblin/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/footprint.1bpp");
+    // const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/gen_9/bramblin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/front.4bpp.lz");
-    const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/normal.gbapal.lz");
-    const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/back.4bpp.lz");
-    const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/shiny.gbapal.lz");
-    const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/icon.4bpp");
+    const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/front.4bpp.lz");
+    const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/normal.gbapal.lz");
+    const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/back.4bpp.lz");
+    const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/shiny.gbapal.lz");
+    const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/gen_9/brambleghast/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp");
+    // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/gen_9/brambleghast/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BRAMBLIN
 
 #if P_FAMILY_TOEDSCOOL
-    const u32 gMonFrontPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/front.4bpp.lz");
-    const u32 gMonPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/normal.gbapal.lz");
-    const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/shiny.gbapal.lz");
-    const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/icon.4bpp");
+    const u32 gMonFrontPic_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/front.4bpp.lz");
+    const u32 gMonPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/normal.gbapal.lz");
+    const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/shiny.gbapal.lz");
+    const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/gen_9/toedscool/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp");
+    // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/gen_9/toedscool/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/front.4bpp.lz");
-    const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/normal.gbapal.lz");
-    const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/back.4bpp.lz");
-    const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/shiny.gbapal.lz");
-    const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/icon.4bpp");
+    const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/front.4bpp.lz");
+    const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/normal.gbapal.lz");
+    const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/back.4bpp.lz");
+    const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/shiny.gbapal.lz");
+    const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/gen_9/toedscruel/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp");
+    // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/gen_9/toedscruel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TOEDSCOOL
 
 #if P_FAMILY_KLAWF
-    const u32 gMonFrontPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/front.4bpp.lz");
-    const u32 gMonPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/normal.gbapal.lz");
-    const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/back.4bpp.lz");
-    const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/shiny.gbapal.lz");
-    const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/icon.4bpp");
+    const u32 gMonFrontPic_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/front.4bpp.lz");
+    const u32 gMonPalette_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/normal.gbapal.lz");
+    const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/back.4bpp.lz");
+    const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/shiny.gbapal.lz");
+    const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/gen_9/klawf/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp");
+    // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/gen_9/klawf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KLAWF
 
 #if P_FAMILY_CAPSAKID
-    const u32 gMonFrontPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/front.4bpp.lz");
-    const u32 gMonPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/normal.gbapal.lz");
-    const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/back.4bpp.lz");
-    const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/shiny.gbapal.lz");
-    const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/icon.4bpp");
+    const u32 gMonFrontPic_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/front.4bpp.lz");
+    const u32 gMonPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/normal.gbapal.lz");
+    const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/back.4bpp.lz");
+    const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/shiny.gbapal.lz");
+    const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/gen_9/capsakid/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp");
+    // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/gen_9/capsakid/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/front.4bpp.lz");
-    const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/normal.gbapal.lz");
-    const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/back.4bpp.lz");
-    const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/shiny.gbapal.lz");
-    const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/icon.4bpp");
+    const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/front.4bpp.lz");
+    const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/normal.gbapal.lz");
+    const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/back.4bpp.lz");
+    const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/shiny.gbapal.lz");
+    const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/gen_9/scovillain/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp");
+    // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/gen_9/scovillain/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CAPSAKID
 
 #if P_FAMILY_RELLOR
-    const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/front.4bpp.lz");
-    const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/normal.gbapal.lz");
-    const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/shiny.gbapal.lz");
-    const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp");
+    const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/front.4bpp.lz");
+    const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/normal.gbapal.lz");
+    const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/shiny.gbapal.lz");
+    const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/gen_9/rellor/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp");
+    // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/gen_9/rellor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz");
-    const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz");
-    const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz");
-    const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz");
-    const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp");
+    const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/front.4bpp.lz");
+    const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/normal.gbapal.lz");
+    const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/back.4bpp.lz");
+    const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/shiny.gbapal.lz");
+    const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/gen_9/rabsca/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp");
+    // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/gen_9/rabsca/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_RELLOR
 
 #if P_FAMILY_FLITTLE
-    const u32 gMonFrontPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/front.4bpp.lz");
-    const u32 gMonPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/normal.gbapal.lz");
-    const u32 gMonBackPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/shiny.gbapal.lz");
-    const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/icon.4bpp");
+    const u32 gMonFrontPic_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/front.4bpp.lz");
+    const u32 gMonPalette_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/normal.gbapal.lz");
+    const u32 gMonBackPic_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/shiny.gbapal.lz");
+    const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/gen_9/flittle/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp");
+    // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/gen_9/flittle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz");
-    const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz");
-    const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/back.4bpp.lz");
-    const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/shiny.gbapal.lz");
-    const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/icon.4bpp");
+    const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/front.4bpp.lz");
+    const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/normal.gbapal.lz");
+    const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/back.4bpp.lz");
+    const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/shiny.gbapal.lz");
+    const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/gen_9/espathra/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp");
+    // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/gen_9/espathra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FLITTLE
 
 #if P_FAMILY_TINKATINK
-    const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/front.4bpp.lz");
-    const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/normal.gbapal.lz");
-    const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz");
-    const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp");
+    const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/front.4bpp.lz");
+    const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/normal.gbapal.lz");
+    const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/shiny.gbapal.lz");
+    const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatink/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp");
+    // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatink/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz");
-    const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz");
-    const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz");
-    const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp");
+    const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/front.4bpp.lz");
+    const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/normal.gbapal.lz");
+    const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/shiny.gbapal.lz");
+    const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatuff/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp");
+    // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/front.4bpp.lz");
-    const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/normal.gbapal.lz");
-    const u32 gMonBackPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/back.4bpp.lz");
-    const u32 gMonShinyPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/shiny.gbapal.lz");
-    const u8 gMonIcon_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/icon.4bpp");
+    const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/front.4bpp.lz");
+    const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/normal.gbapal.lz");
+    const u32 gMonBackPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/back.4bpp.lz");
+    const u32 gMonShinyPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/shiny.gbapal.lz");
+    const u8 gMonIcon_Tinkaton[] = INCBIN_U8("graphics/pokemon/gen_9/tinkaton/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/footprint.1bpp");
+    // const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/gen_9/tinkaton/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TINKATINK
 
 #if P_FAMILY_WIGLETT
-    const u32 gMonFrontPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/front.4bpp.lz");
-    const u32 gMonPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/normal.gbapal.lz");
-    const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/shiny.gbapal.lz");
-    const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/icon.4bpp");
+    const u32 gMonFrontPic_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/front.4bpp.lz");
+    const u32 gMonPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/normal.gbapal.lz");
+    const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/shiny.gbapal.lz");
+    const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/gen_9/wiglett/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp");
+    // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/gen_9/wiglett/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/front.4bpp.lz");
-    const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/normal.gbapal.lz");
-    const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/back.4bpp.lz");
-    const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/shiny.gbapal.lz");
-    const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/icon.4bpp");
+    const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/front.4bpp.lz");
+    const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/normal.gbapal.lz");
+    const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/back.4bpp.lz");
+    const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/shiny.gbapal.lz");
+    const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/gen_9/wugtrio/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp");
+    // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/gen_9/wugtrio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WIGLETT
 
 #if P_FAMILY_BOMBIRDIER
-    const u32 gMonFrontPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/front.4bpp.lz");
-    const u32 gMonPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/normal.gbapal.lz");
-    const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/back.4bpp.lz");
-    const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/shiny.gbapal.lz");
-    const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/icon.4bpp");
+    const u32 gMonFrontPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/front.4bpp.lz");
+    const u32 gMonPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/normal.gbapal.lz");
+    const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/back.4bpp.lz");
+    const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/shiny.gbapal.lz");
+    const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/gen_9/bombirdier/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp");
+    // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/gen_9/bombirdier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BOMBIRDIER
 
 #if P_FAMILY_FINIZEN
-    const u32 gMonFrontPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/front.4bpp.lz");
-    const u32 gMonPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/normal.gbapal.lz");
-    const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/back.4bpp.lz");
-    const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/shiny.gbapal.lz");
-    const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp");
+    const u32 gMonFrontPic_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/front.4bpp.lz");
+    const u32 gMonPalette_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/normal.gbapal.lz");
+    const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/back.4bpp.lz");
+    const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/shiny.gbapal.lz");
+    const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/gen_9/finizen/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp");
+    // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/gen_9/finizen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz");
-    const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz");
-    const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz");
-    const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz");
-    const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp");
+    const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/front.4bpp.lz");
+    const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/normal.gbapal.lz");
+    const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/back.4bpp.lz");
+    const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/shiny.gbapal.lz");
+    const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp");
+    // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/front.4bpp.lz");
+    const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/normal.gbapal.lz");
+    const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/back.4bpp.lz");
+    const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/shiny.gbapal.lz");
+    const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/hero/icon.4bpp");
 #endif //P_FAMILY_FINIZEN
 
 #if P_FAMILY_VAROOM
-    const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/front.4bpp.lz");
-    const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/normal.gbapal.lz");
-    const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/shiny.gbapal.lz");
-    const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/icon.4bpp");
+    const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/front.4bpp.lz");
+    const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/normal.gbapal.lz");
+    const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/shiny.gbapal.lz");
+    const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/gen_9/varoom/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp");
+    // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/gen_9/varoom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/front.4bpp.lz");
-    const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/normal.gbapal.lz");
-    const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/back.4bpp.lz");
-    const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/shiny.gbapal.lz");
-    const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/icon.4bpp");
+    const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/front.4bpp.lz");
+    const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/normal.gbapal.lz");
+    const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/back.4bpp.lz");
+    const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/shiny.gbapal.lz");
+    const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/gen_9/revavroom/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp");
+    // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/gen_9/revavroom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VAROOM
 
 #if P_FAMILY_CYCLIZAR
-    const u32 gMonFrontPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/front.4bpp.lz");
-    const u32 gMonPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/normal.gbapal.lz");
-    const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/shiny.gbapal.lz");
-    const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/icon.4bpp");
+    const u32 gMonFrontPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/front.4bpp.lz");
+    const u32 gMonPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/normal.gbapal.lz");
+    const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/shiny.gbapal.lz");
+    const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/gen_9/cyclizar/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp");
+    // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/gen_9/cyclizar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CYCLIZAR
 
 #if P_FAMILY_ORTHWORM
-    const u32 gMonFrontPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/front.4bpp.lz");
-    const u32 gMonPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/normal.gbapal.lz");
-    const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/back.4bpp.lz");
-    const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/shiny.gbapal.lz");
-    const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/icon.4bpp");
+    const u32 gMonFrontPic_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/front.4bpp.lz");
+    const u32 gMonPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/normal.gbapal.lz");
+    const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/back.4bpp.lz");
+    const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/shiny.gbapal.lz");
+    const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/gen_9/orthworm/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp");
+    // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/gen_9/orthworm/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ORTHWORM
 
 #if P_FAMILY_GLIMMET
-    const u32 gMonFrontPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/front.4bpp.lz");
-    const u32 gMonPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/normal.gbapal.lz");
-    const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/shiny.gbapal.lz");
-    const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/icon.4bpp");
+    const u32 gMonFrontPic_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/front.4bpp.lz");
+    const u32 gMonPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/normal.gbapal.lz");
+    const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/shiny.gbapal.lz");
+    const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/gen_9/glimmet/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp");
+    // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/gen_9/glimmet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/front.4bpp.lz");
-    const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/normal.gbapal.lz");
-    const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/back.4bpp.lz");
-    const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/shiny.gbapal.lz");
-    const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/icon.4bpp");
+    const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/front.4bpp.lz");
+    const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/normal.gbapal.lz");
+    const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/back.4bpp.lz");
+    const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/shiny.gbapal.lz");
+    const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/gen_9/glimmora/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp");
+    // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/gen_9/glimmora/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GLIMMET
 
 #if P_FAMILY_GREAVARD
-    const u32 gMonFrontPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/front.4bpp.lz");
-    const u32 gMonPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/normal.gbapal.lz");
-    const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/back.4bpp.lz");
-    const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/shiny.gbapal.lz");
-    const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/icon.4bpp");
+    const u32 gMonFrontPic_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/front.4bpp.lz");
+    const u32 gMonPalette_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/normal.gbapal.lz");
+    const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/back.4bpp.lz");
+    const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/shiny.gbapal.lz");
+    const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/gen_9/greavard/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp");
+    // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/gen_9/greavard/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/front.4bpp.lz");
-    const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/normal.gbapal.lz");
-    const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/back.4bpp.lz");
-    const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/shiny.gbapal.lz");
-    const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/icon.4bpp");
+    const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/front.4bpp.lz");
+    const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/normal.gbapal.lz");
+    const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/back.4bpp.lz");
+    const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/shiny.gbapal.lz");
+    const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/gen_9/houndstone/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp");
+    // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/gen_9/houndstone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GREAVARD
 
 #if P_FAMILY_FLAMIGO
-    const u32 gMonFrontPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/front.4bpp.lz");
-    const u32 gMonPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/normal.gbapal.lz");
-    const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/shiny.gbapal.lz");
-    const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/icon.4bpp");
+    const u32 gMonFrontPic_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/front.4bpp.lz");
+    const u32 gMonPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/normal.gbapal.lz");
+    const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/shiny.gbapal.lz");
+    const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/gen_9/flamigo/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp");
+    // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/gen_9/flamigo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FLAMIGO
 
 #if P_FAMILY_CETODDLE
-    const u32 gMonFrontPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/front.4bpp.lz");
-    const u32 gMonPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/normal.gbapal.lz");
-    const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/shiny.gbapal.lz");
-    const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/icon.4bpp");
+    const u32 gMonFrontPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/front.4bpp.lz");
+    const u32 gMonPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/normal.gbapal.lz");
+    const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/shiny.gbapal.lz");
+    const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/gen_9/cetoddle/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp");
+    // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/gen_9/cetoddle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/front.4bpp.lz");
-    const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/normal.gbapal.lz");
-    const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/back.4bpp.lz");
-    const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/shiny.gbapal.lz");
-    const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/icon.4bpp");
+    const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/front.4bpp.lz");
+    const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/normal.gbapal.lz");
+    const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/back.4bpp.lz");
+    const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/shiny.gbapal.lz");
+    const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/gen_9/cetitan/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp");
+    // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/gen_9/cetitan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CETODDLE
 
 #if P_FAMILY_VELUZA
-    const u32 gMonFrontPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/front.4bpp.lz");
-    const u32 gMonPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/normal.gbapal.lz");
-    const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/back.4bpp.lz");
-    const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/shiny.gbapal.lz");
-    const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/icon.4bpp");
+    const u32 gMonFrontPic_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/front.4bpp.lz");
+    const u32 gMonPalette_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/normal.gbapal.lz");
+    const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/back.4bpp.lz");
+    const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/shiny.gbapal.lz");
+    const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/gen_9/veluza/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp");
+    // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/gen_9/veluza/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_VELUZA
 
 #if P_FAMILY_DONDOZO
-    const u32 gMonFrontPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/front.4bpp.lz");
-    const u32 gMonPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/normal.gbapal.lz");
-    const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/shiny.gbapal.lz");
-    const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/icon.4bpp");
+    const u32 gMonFrontPic_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/front.4bpp.lz");
+    const u32 gMonPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/normal.gbapal.lz");
+    const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/shiny.gbapal.lz");
+    const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/gen_9/dondozo/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp");
+    // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/gen_9/dondozo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_DONDOZO
 
 #if P_FAMILY_TATSUGIRI
-    const u32 gMonFrontPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/front.4bpp.lz");
-    const u32 gMonPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/normal.gbapal.lz");
-    const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/back.4bpp.lz");
-    const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/shiny.gbapal.lz");
-    const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/tatsugiri/curly/icon.4bpp");
+    const u32 gMonFrontPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/front.4bpp.lz");
+    const u32 gMonPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/normal.gbapal.lz");
+    const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/back.4bpp.lz");
+    const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/shiny.gbapal.lz");
+    const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/curly/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp");
+    // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
+    const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/front.4bpp.lz");
+    const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/normal.gbapal.lz");
+    const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/back.4bpp.lz");
+    const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/shiny.gbapal.lz");
+    const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/droopy/icon.4bpp");
 
-    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");
+    const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/front.4bpp.lz");
+    const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/normal.gbapal.lz");
+    const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/back.4bpp.lz");
+    const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.gbapal.lz");
+    const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/stretchy/icon.4bpp");
 #endif //P_FAMILY_DONDOZO
 
 #if P_FAMILY_GREAT_TUSK
-    const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/anim_front.4bpp.lz");
-    const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/normal.gbapal.lz");
-    const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/back.4bpp.lz");
-    const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/shiny.gbapal.lz");
-    const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/icon.4bpp");
+    const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/anim_front.4bpp.lz");
+    const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/normal.gbapal.lz");
+    const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/back.4bpp.lz");
+    const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/shiny.gbapal.lz");
+    const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/gen_9/great_tusk/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp");
+    // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/gen_9/great_tusk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GREAT_TUSK
 
 #if P_FAMILY_SCREAM_TAIL
-    const u32 gMonFrontPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/front.4bpp.lz");
-    const u32 gMonPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/normal.gbapal.lz");
-    const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/back.4bpp.lz");
-    const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/shiny.gbapal.lz");
-    const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/icon.4bpp");
+    const u32 gMonFrontPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/front.4bpp.lz");
+    const u32 gMonPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/normal.gbapal.lz");
+    const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/back.4bpp.lz");
+    const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/shiny.gbapal.lz");
+    const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/gen_9/scream_tail/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp");
+    // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/gen_9/scream_tail/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SCREAM_TAIL
 
 #if P_FAMILY_BRUTE_BONNET
-    const u32 gMonFrontPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/front.4bpp.lz");
-    const u32 gMonPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/normal.gbapal.lz");
-    const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/back.4bpp.lz");
-    const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/shiny.gbapal.lz");
-    const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/icon.4bpp");
+    const u32 gMonFrontPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/front.4bpp.lz");
+    const u32 gMonPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/normal.gbapal.lz");
+    const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/back.4bpp.lz");
+    const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/shiny.gbapal.lz");
+    const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/gen_9/brute_bonnet/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp");
+    // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/gen_9/brute_bonnet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_BRUTE_BONNET
 
 #if P_FAMILY_FLUTTER_MANE
-    const u32 gMonFrontPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/front.4bpp.lz");
-    const u32 gMonPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/normal.gbapal.lz");
-    const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/back.4bpp.lz");
-    const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/shiny.gbapal.lz");
-    const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/icon.4bpp");
+    const u32 gMonFrontPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/front.4bpp.lz");
+    const u32 gMonPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/normal.gbapal.lz");
+    const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/back.4bpp.lz");
+    const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/shiny.gbapal.lz");
+    const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/gen_9/flutter_mane/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp");
+    // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/gen_9/flutter_mane/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FLUTTER_MANE
 
 #if P_FAMILY_SLITHER_WING
-    const u32 gMonFrontPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/front.4bpp.lz");
-    const u32 gMonPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/normal.gbapal.lz");
-    const u32 gMonBackPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/back.4bpp.lz");
-    const u32 gMonShinyPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/shiny.gbapal.lz");
-    const u8 gMonIcon_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/icon.4bpp");
+    const u32 gMonFrontPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/front.4bpp.lz");
+    const u32 gMonPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/normal.gbapal.lz");
+    const u32 gMonBackPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/back.4bpp.lz");
+    const u32 gMonShinyPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/shiny.gbapal.lz");
+    const u8 gMonIcon_SlitherWing[] = INCBIN_U8("graphics/pokemon/gen_9/slither_wing/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/footprint.1bpp");
+    // const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/gen_9/slither_wing/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SLITHER_WING
 
 #if P_FAMILY_SANDY_SHOCKS
-    const u32 gMonFrontPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/front.4bpp.lz");
-    const u32 gMonPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/normal.gbapal.lz");
-    const u32 gMonBackPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/back.4bpp.lz");
-    const u32 gMonShinyPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/shiny.gbapal.lz");
-    const u8 gMonIcon_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/icon.4bpp");
+    const u32 gMonFrontPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/front.4bpp.lz");
+    const u32 gMonPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/normal.gbapal.lz");
+    const u32 gMonBackPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/back.4bpp.lz");
+    const u32 gMonShinyPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/shiny.gbapal.lz");
+    const u8 gMonIcon_SandyShocks[] = INCBIN_U8("graphics/pokemon/gen_9/sandy_shocks/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/footprint.1bpp");
+    // const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/gen_9/sandy_shocks/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_SANDY_SHOCKS
 
 #if P_FAMILY_IRON_TREADS
-    const u32 gMonFrontPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/front.4bpp.lz");
-    const u32 gMonPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/normal.gbapal.lz");
-    const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/shiny.gbapal.lz");
-    const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/icon.4bpp");
+    const u32 gMonFrontPic_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/front.4bpp.lz");
+    const u32 gMonPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/normal.gbapal.lz");
+    const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/shiny.gbapal.lz");
+    const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/gen_9/iron_treads/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp");
+    // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/gen_9/iron_treads/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_TREADS
 
 #if P_FAMILY_IRON_BUNDLE
-    const u32 gMonFrontPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/front.4bpp.lz");
-    const u32 gMonPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/normal.gbapal.lz");
-    const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/shiny.gbapal.lz");
-    const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/icon.4bpp");
+    const u32 gMonFrontPic_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/front.4bpp.lz");
+    const u32 gMonPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/normal.gbapal.lz");
+    const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/shiny.gbapal.lz");
+    const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/gen_9/iron_bundle/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp");
+    // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/gen_9/iron_bundle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_BUNDLE
 
 #if P_FAMILY_IRON_HANDS
-    const u32 gMonFrontPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/front.4bpp.lz");
-    const u32 gMonPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/normal.gbapal.lz");
-    const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/shiny.gbapal.lz");
-    const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/icon.4bpp");
+    const u32 gMonFrontPic_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/front.4bpp.lz");
+    const u32 gMonPalette_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/normal.gbapal.lz");
+    const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/shiny.gbapal.lz");
+    const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/gen_9/iron_hands/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp");
+    // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/gen_9/iron_hands/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_HANDS
 
 #if P_FAMILY_IRON_JUGULIS
-    const u32 gMonFrontPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/front.4bpp.lz");
-    const u32 gMonPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/normal.gbapal.lz");
-    const u32 gMonBackPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/shiny.gbapal.lz");
-    const u8 gMonIcon_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/icon.4bpp");
+    const u32 gMonFrontPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/front.4bpp.lz");
+    const u32 gMonPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/normal.gbapal.lz");
+    const u32 gMonBackPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/shiny.gbapal.lz");
+    const u8 gMonIcon_IronJugulis[] = INCBIN_U8("graphics/pokemon/gen_9/iron_jugulis/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/footprint.1bpp");
+    // const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/gen_9/iron_jugulis/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_JUGULIS
 
 #if P_FAMILY_IRON_MOTH
-    const u32 gMonFrontPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/front.4bpp.lz");
-    const u32 gMonPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/normal.gbapal.lz");
-    const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/shiny.gbapal.lz");
-    const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/icon.4bpp");
+    const u32 gMonFrontPic_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/front.4bpp.lz");
+    const u32 gMonPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/normal.gbapal.lz");
+    const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/shiny.gbapal.lz");
+    const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/gen_9/iron_moth/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp");
+    // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/gen_9/iron_moth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_MOTH
 
 #if P_FAMILY_IRON_THORNS
-    const u32 gMonFrontPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/front.4bpp.lz");
-    const u32 gMonPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/normal.gbapal.lz");
-    const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/shiny.gbapal.lz");
-    const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp");
+    const u32 gMonFrontPic_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/front.4bpp.lz");
+    const u32 gMonPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/normal.gbapal.lz");
+    const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/shiny.gbapal.lz");
+    const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/gen_9/iron_thorns/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp");
+    // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/gen_9/iron_thorns/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_THORNS
 
 #if P_FAMILY_FRIGIBAX
-    const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/anim_front.4bpp.lz");
-    const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/normal.gbapal.lz");
-    const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/back.4bpp.lz");
-    const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/shiny.gbapal.lz");
-    const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/icon.4bpp");
+    const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/anim_front.4bpp.lz");
+    const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/normal.gbapal.lz");
+    const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/back.4bpp.lz");
+    const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/shiny.gbapal.lz");
+    const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/gen_9/frigibax/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp");
+    // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/gen_9/frigibax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/front.4bpp.lz");
-    const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/normal.gbapal.lz");
-    const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/back.4bpp.lz");
-    const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/shiny.gbapal.lz");
-    const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/icon.4bpp");
+    const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/front.4bpp.lz");
+    const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/normal.gbapal.lz");
+    const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/back.4bpp.lz");
+    const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/shiny.gbapal.lz");
+    const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/gen_9/arctibax/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp");
+    // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/gen_9/arctibax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/front.4bpp.lz");
-    const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/normal.gbapal.lz");
-    const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/back.4bpp.lz");
-    const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/shiny.gbapal.lz");
-    const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp");
+    const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/front.4bpp.lz");
+    const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/normal.gbapal.lz");
+    const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/back.4bpp.lz");
+    const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/shiny.gbapal.lz");
+    const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/gen_9/baxcalibur/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp");
+    // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/gen_9/baxcalibur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FRIGIBAX
 
 #if P_FAMILY_GIMMIGHOUL
-    const u32 gMonFrontPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/front.4bpp.lz");
-    const u32 gMonPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/normal.gbapal.lz");
-    const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz");
-    const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz");
-    const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp");
+    const u32 gMonFrontPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/front.4bpp.lz");
+    const u32 gMonPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/normal.gbapal.lz");
+    const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/back.4bpp.lz");
+    const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/shiny.gbapal.lz");
+    const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp");
+    // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    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");
-    const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/back.4bpp.lz");
-    const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/shiny.gbapal.lz");
-    const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/roaming/icon.4bpp");
+    const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/front.4bpp.lz");
+    const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/normal.gbapal.lz");
+    const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/back.4bpp.lz");
+    const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/shiny.gbapal.lz");
+    const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/roaming/icon.4bpp");
 
-    const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz");
-    const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz");
-    const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/back.4bpp.lz");
-    const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/shiny.gbapal.lz");
-    const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/icon.4bpp");
+    const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/front.4bpp.lz");
+    const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/normal.gbapal.lz");
+    const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/back.4bpp.lz");
+    const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/shiny.gbapal.lz");
+    const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gen_9/gholdengo/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp");
+    // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gen_9/gholdengo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GIMMIGHOUL
 
 #if P_FAMILY_WO_CHIEN
-    const u32 gMonFrontPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/front.4bpp.lz");
-    const u32 gMonPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/normal.gbapal.lz");
-    const u32 gMonBackPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/back.4bpp.lz");
-    const u32 gMonShinyPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/shiny.gbapal.lz");
-    const u8 gMonIcon_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/icon.4bpp");
+    const u32 gMonFrontPic_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/front.4bpp.lz");
+    const u32 gMonPalette_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/normal.gbapal.lz");
+    const u32 gMonBackPic_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/back.4bpp.lz");
+    const u32 gMonShinyPalette_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/shiny.gbapal.lz");
+    const u8 gMonIcon_WoChien[] = INCBIN_U8("graphics/pokemon/gen_9/wo_chien/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/footprint.1bpp");
+    // const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/gen_9/wo_chien/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WO_CHIEN
 
 #if P_FAMILY_CHIEN_PAO
-    const u32 gMonFrontPic_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/front.4bpp.lz");
-    const u32 gMonPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/normal.gbapal.lz");
-    const u32 gMonBackPic_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/back.4bpp.lz");
-    const u32 gMonShinyPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/shiny.gbapal.lz");
-    const u8 gMonIcon_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/icon.4bpp");
+    const u32 gMonFrontPic_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/front.4bpp.lz");
+    const u32 gMonPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/normal.gbapal.lz");
+    const u32 gMonBackPic_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/back.4bpp.lz");
+    const u32 gMonShinyPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/shiny.gbapal.lz");
+    const u8 gMonIcon_ChienPao[] = INCBIN_U8("graphics/pokemon/gen_9/chien_pao/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/footprint.1bpp");
+    // const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/gen_9/chien_pao/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHIEN_PAO
 
 #if P_FAMILY_TING_LU
-    const u32 gMonFrontPic_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/front.4bpp.lz");
-    const u32 gMonPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/normal.gbapal.lz");
-    const u32 gMonBackPic_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/back.4bpp.lz");
-    const u32 gMonShinyPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/shiny.gbapal.lz");
-    const u8 gMonIcon_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/icon.4bpp");
+    const u32 gMonFrontPic_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/front.4bpp.lz");
+    const u32 gMonPalette_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/normal.gbapal.lz");
+    const u32 gMonBackPic_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/back.4bpp.lz");
+    const u32 gMonShinyPalette_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/shiny.gbapal.lz");
+    const u8 gMonIcon_TingLu[] = INCBIN_U8("graphics/pokemon/gen_9/ting_lu/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/footprint.1bpp");
+    // const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/gen_9/ting_lu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_TING_LU
 
 #if P_FAMILY_CHI_YU
-    const u32 gMonFrontPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/front.4bpp.lz");
-    const u32 gMonPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/normal.gbapal.lz");
-    const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/back.4bpp.lz");
-    const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/shiny.gbapal.lz");
-    const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/icon.4bpp");
+    const u32 gMonFrontPic_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/front.4bpp.lz");
+    const u32 gMonPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/normal.gbapal.lz");
+    const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/back.4bpp.lz");
+    const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/shiny.gbapal.lz");
+    const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/gen_9/chi_yu/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp");
+    // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/gen_9/chi_yu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_CHI_YU
 
 #if P_FAMILY_ROARING_MOON
-    const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/front.4bpp.lz");
-    const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/normal.gbapal.lz");
-    const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/back.4bpp.lz");
-    const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/shiny.gbapal.lz");
-    const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/icon.4bpp");
+    const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/front.4bpp.lz");
+    const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/normal.gbapal.lz");
+    const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/back.4bpp.lz");
+    const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/shiny.gbapal.lz");
+    const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/gen_9/roaring_moon/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp");
+    // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/gen_9/roaring_moon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_ROARING_MOON
 
 #if P_FAMILY_IRON_VALIANT
-    const u32 gMonFrontPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/front.4bpp.lz");
-    const u32 gMonPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/normal.gbapal.lz");
-    const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/shiny.gbapal.lz");
-    const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/icon.4bpp");
+    const u32 gMonFrontPic_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/front.4bpp.lz");
+    const u32 gMonPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/normal.gbapal.lz");
+    const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/shiny.gbapal.lz");
+    const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/gen_9/iron_valiant/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp");
+    // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/gen_9/iron_valiant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_VALIANT
 
 #if P_FAMILY_KORAIDON
-    const u32 gMonFrontPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/front.4bpp.lz");
-    const u32 gMonPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/normal.gbapal.lz");
-    const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/shiny.gbapal.lz");
-    const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/icon.4bpp");
+    const u32 gMonFrontPic_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/front.4bpp.lz");
+    const u32 gMonPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/normal.gbapal.lz");
+    const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/shiny.gbapal.lz");
+    const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/gen_9/koraidon/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp");
+    // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/gen_9/koraidon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_KORAIDON
 
 #if P_FAMILY_MIRAIDON
-    const u32 gMonFrontPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/front.4bpp.lz");
-    const u32 gMonPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/normal.gbapal.lz");
-    const u32 gMonBackPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/back.4bpp.lz");
-    const u32 gMonShinyPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/shiny.gbapal.lz");
-    const u8 gMonIcon_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/icon.4bpp");
+    const u32 gMonFrontPic_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/front.4bpp.lz");
+    const u32 gMonPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/normal.gbapal.lz");
+    const u32 gMonBackPic_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/back.4bpp.lz");
+    const u32 gMonShinyPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/shiny.gbapal.lz");
+    const u8 gMonIcon_Miraidon[] = INCBIN_U8("graphics/pokemon/gen_9/miraidon/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/footprint.1bpp");
+    // const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/gen_9/miraidon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MIRAIDON
 
 #if P_FAMILY_WALKING_WAKE
-    const u32 gMonFrontPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/front.4bpp.lz");
-    const u32 gMonPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/normal.gbapal.lz");
-    const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/back.4bpp.lz");
-    const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/shiny.gbapal.lz");
-    const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/icon.4bpp");
+    const u32 gMonFrontPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/front.4bpp.lz");
+    const u32 gMonPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/normal.gbapal.lz");
+    const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/back.4bpp.lz");
+    const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/shiny.gbapal.lz");
+    const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/gen_9/walking_wake/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp");
+    // const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/gen_9/walking_wake/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_WALKING_WAKE
 
 #if P_FAMILY_IRON_LEAVES
-    const u32 gMonFrontPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/front.4bpp.lz");
-    const u32 gMonPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/normal.gbapal.lz");
-    const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/back.4bpp.lz");
-    const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/shiny.gbapal.lz");
-    const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp");
+    const u32 gMonFrontPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/front.4bpp.lz");
+    const u32 gMonPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/normal.gbapal.lz");
+    const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/back.4bpp.lz");
+    const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/shiny.gbapal.lz");
+    const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/gen_9/iron_leaves/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp");
+    // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/gen_9/iron_leaves/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_LEAVES
 
 #if P_FAMILY_POLTCHAGEIST
-    const u32 gMonFrontPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/front.4bpp.lz");
-    const u32 gMonPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/normal.gbapal.lz");
-    const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/back.4bpp.lz");
-    const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/shiny.gbapal.lz");
-    const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/icon.4bpp");
+    const u32 gMonFrontPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/front.4bpp.lz");
+    const u32 gMonPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/normal.gbapal.lz");
+    const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/back.4bpp.lz");
+    const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/shiny.gbapal.lz");
+    const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/gen_9/poltchageist/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp");
+    // const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/gen_9/poltchageist/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/front.4bpp.lz");
-    const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/normal.gbapal.lz");
-    const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/back.4bpp.lz");
-    const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/shiny.gbapal.lz");
-    const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/icon.4bpp");
+    const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/front.4bpp.lz");
+    const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/normal.gbapal.lz");
+    const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/back.4bpp.lz");
+    const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/shiny.gbapal.lz");
+    const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/gen_9/sinistcha/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp");
+    // const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/gen_9/sinistcha/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_POLTCHAGEIST
 
 #if P_FAMILY_OKIDOGI
-    const u32 gMonFrontPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/front.4bpp.lz");
-    const u32 gMonPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/normal.gbapal.lz");
-    const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/back.4bpp.lz");
-    const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/shiny.gbapal.lz");
-    const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/icon.4bpp");
+    const u32 gMonFrontPic_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/front.4bpp.lz");
+    const u32 gMonPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/normal.gbapal.lz");
+    const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/back.4bpp.lz");
+    const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/shiny.gbapal.lz");
+    const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/gen_9/okidogi/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp");
+    // const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/gen_9/okidogi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_OKIDOGI
 
 #if P_FAMILY_MUNKIDORI
-    const u32 gMonFrontPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/front.4bpp.lz");
-    const u32 gMonPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/normal.gbapal.lz");
-    const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/back.4bpp.lz");
-    const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/shiny.gbapal.lz");
-    const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/icon.4bpp");
+    const u32 gMonFrontPic_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/front.4bpp.lz");
+    const u32 gMonPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/normal.gbapal.lz");
+    const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/back.4bpp.lz");
+    const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/shiny.gbapal.lz");
+    const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/gen_9/munkidori/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp");
+    // const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/gen_9/munkidori/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_MUNKIDORI
 
 #if P_FAMILY_FEZANDIPITI
-    const u32 gMonFrontPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/front.4bpp.lz");
-    const u32 gMonPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/normal.gbapal.lz");
-    const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/back.4bpp.lz");
-    const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/shiny.gbapal.lz");
-    const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp");
+    const u32 gMonFrontPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/front.4bpp.lz");
+    const u32 gMonPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/normal.gbapal.lz");
+    const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/back.4bpp.lz");
+    const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/shiny.gbapal.lz");
+    const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/gen_9/fezandipiti/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp");
+    // const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/gen_9/fezandipiti/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_FEZANDIPITI
 
 #if P_FAMILY_OGERPON
-    const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
-    const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
-    const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
-    const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
+    const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/front.4bpp.lz");
+    const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/normal.gbapal.lz");
+    const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/shiny.gbapal.lz");
+    const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp");
+    // const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
-    const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
-    const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
-    // const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp");
+    const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/front.4bpp.lz");
+    const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/normal.gbapal.lz");
+    const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/shiny.gbapal.lz");
+    // const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/wellspring/icon.4bpp");
 
-    const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
-    const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
-    const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
-    // const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp");
+    const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/front.4bpp.lz");
+    const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/normal.gbapal.lz");
+    const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/shiny.gbapal.lz");
+    // const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/hearthflame/icon.4bpp");
 
-    const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
-    const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
-    const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
-    // const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp");
+    const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/front.4bpp.lz");
+    const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/normal.gbapal.lz");
+    const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/shiny.gbapal.lz");
+    // const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/cornerstone/icon.4bpp");
 
-    // const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz");
-    // const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz");
-    // const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz");
+    // const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/front.4bpp.lz");
+    // const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/normal.gbapal.lz");
+    // const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/shiny.gbapal.lz");
 
-    // const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz");
-    // const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz");
-    // const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz");
+    // const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/front.4bpp.lz");
+    // const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/normal.gbapal.lz");
+    // const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/shiny.gbapal.lz");
 
-    // const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz");
-    // const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz");
-    // const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz");
+    // const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/front.4bpp.lz");
+    // const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/normal.gbapal.lz");
+    // const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/shiny.gbapal.lz");
 
-    // const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz");
-    // const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz");
-    // const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz");
-    // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
+    // const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/front.4bpp.lz");
+    // const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/normal.gbapal.lz");
+    // const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/back.4bpp.lz");
+    // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/shiny.gbapal.lz");
 #endif //P_FAMILY_OGERPON
 
 #if P_FAMILY_GOUGING_FIRE
-    // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/front.4bpp.lz");
-    // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz");
-    // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz");
-    // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz");
-    // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp");
+    // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/front.4bpp.lz");
+    // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/normal.gbapal.lz");
+    // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/back.4bpp.lz");
+    // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/shiny.gbapal.lz");
+    // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gen_9/gouging_fire/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp");
+    // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gen_9/gouging_fire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_GOUGING_FIRE
 
 #if P_FAMILY_RAGING_BOLT
-    // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/front.4bpp.lz");
-    // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz");
-    // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz");
-    // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz");
-    // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp");
+    // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/front.4bpp.lz");
+    // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/normal.gbapal.lz");
+    // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/back.4bpp.lz");
+    // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/gen_9/pokemon/raging_bolt/shiny.gbapal.lz");
+    // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/gen_9/raging_bolt/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp");
+    // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/gen_9/raging_bolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_RAGING_BOLT
 
 #if P_FAMILY_IRON_BOULDER
-    // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/front.4bpp.lz");
-    // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz");
-    // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz");
-    // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz");
-    // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp");
+    // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/front.4bpp.lz");
+    // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/normal.gbapal.lz");
+    // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/back.4bpp.lz");
+    // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/shiny.gbapal.lz");
+    // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/gen_9/iron_boulder/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp");
+    // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/gen_9/iron_boulder/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_BOULDER
 
 #if P_FAMILY_IRON_CROWN
-    // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/front.4bpp.lz");
-    // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz");
-    // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz");
-    // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz");
-    // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp");
+    // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/front.4bpp.lz");
+    // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/normal.gbapal.lz");
+    // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/back.4bpp.lz");
+    // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/shiny.gbapal.lz");
+    // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/gen_9/iron_crown/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp");
+    // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/gen_9/iron_crown/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_IRON_CROWN
 
 #if P_FAMILY_TERAPAGOS
-    // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/front.4bpp.lz");
-    // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz");
-    // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz");
-    // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz");
-    // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp");
+    // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp");
+    // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz");
-    // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz");
-    // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz");
-    // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz");
-    // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp");
+    // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/terastal/icon.4bpp");
 
-    // 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");
-    // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/back.4bpp.lz");
-    // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/shiny.gbapal.lz");
-    // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/icon.4bpp");
+    // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/front.4bpp.lz");
+    // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/normal.gbapal.lz");
+    // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/back.4bpp.lz");
+    // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/shiny.gbapal.lz");
+    // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/stellar/icon.4bpp");
 #endif //P_FAMILY_TERAPAGOS
 
 #if P_FAMILY_PECHARUNT
-    // const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/front.4bpp.lz");
-    // const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz");
-    // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz");
-    // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz");
-    // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp");
+    // const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/front.4bpp.lz");
+    // const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/normal.gbapal.lz");
+    // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/back.4bpp.lz");
+    // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/gen_9/pokemon/pecharunt/shiny.gbapal.lz");
+    // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/gen_9/pecharunt/icon.4bpp");
 #if P_FOOTPRINTS
-    // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp");
+    // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/gen_9/pecharunt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #endif //P_FAMILY_PECHARUNT
 
diff --git a/src/pokemon.c b/src/pokemon.c
index d02d2941de..5b055e9e80 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -354,10 +354,10 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
 
 const struct SpindaSpot gSpindaSpotGraphics[] =
 {
-    {.x = 16, .y =  7, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_0.1bpp")},
-    {.x = 40, .y =  8, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_1.1bpp")},
-    {.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_2.1bpp")},
-    {.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_3.1bpp")}
+    {.x = 16, .y =  7, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_0.1bpp")},
+    {.x = 40, .y =  8, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_1.1bpp")},
+    {.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_2.1bpp")},
+    {.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_3.1bpp")}
 };
 
 #include "data/pokemon/item_effects.h"