diff --git a/graphics/pokemon/mega_abomasnow/back.png b/graphics/pokemon/abomasnow/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_abomasnow/back.png
rename to graphics/pokemon/abomasnow/mega/back.png
diff --git a/graphics/pokemon/mega_abomasnow/front.png b/graphics/pokemon/abomasnow/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_abomasnow/front.png
rename to graphics/pokemon/abomasnow/mega/front.png
diff --git a/graphics/pokemon/mega_abomasnow/icon.png b/graphics/pokemon/abomasnow/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_abomasnow/icon.png
rename to graphics/pokemon/abomasnow/mega/icon.png
diff --git a/graphics/pokemon/mega_abomasnow/normal.pal b/graphics/pokemon/abomasnow/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_abomasnow/normal.pal
rename to graphics/pokemon/abomasnow/mega/normal.pal
diff --git a/graphics/pokemon/mega_abomasnow/shiny.pal b/graphics/pokemon/abomasnow/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_abomasnow/shiny.pal
rename to graphics/pokemon/abomasnow/mega/shiny.pal
diff --git a/graphics/pokemon/mega_absol/back.png b/graphics/pokemon/absol/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_absol/back.png
rename to graphics/pokemon/absol/mega/back.png
diff --git a/graphics/pokemon/mega_absol/front.png b/graphics/pokemon/absol/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_absol/front.png
rename to graphics/pokemon/absol/mega/front.png
diff --git a/graphics/pokemon/mega_absol/icon.png b/graphics/pokemon/absol/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_absol/icon.png
rename to graphics/pokemon/absol/mega/icon.png
diff --git a/graphics/pokemon/mega_absol/normal.pal b/graphics/pokemon/absol/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_absol/normal.pal
rename to graphics/pokemon/absol/mega/normal.pal
diff --git a/graphics/pokemon/mega_absol/shiny.pal b/graphics/pokemon/absol/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_absol/shiny.pal
rename to graphics/pokemon/absol/mega/shiny.pal
diff --git a/graphics/pokemon/mega_aerodactyl/back.png b/graphics/pokemon/aerodactyl/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_aerodactyl/back.png
rename to graphics/pokemon/aerodactyl/mega/back.png
diff --git a/graphics/pokemon/mega_aerodactyl/front.png b/graphics/pokemon/aerodactyl/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_aerodactyl/front.png
rename to graphics/pokemon/aerodactyl/mega/front.png
diff --git a/graphics/pokemon/mega_aerodactyl/icon.png b/graphics/pokemon/aerodactyl/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_aerodactyl/icon.png
rename to graphics/pokemon/aerodactyl/mega/icon.png
diff --git a/graphics/pokemon/mega_aerodactyl/normal.pal b/graphics/pokemon/aerodactyl/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_aerodactyl/normal.pal
rename to graphics/pokemon/aerodactyl/mega/normal.pal
diff --git a/graphics/pokemon/mega_aerodactyl/shiny.pal b/graphics/pokemon/aerodactyl/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_aerodactyl/shiny.pal
rename to graphics/pokemon/aerodactyl/mega/shiny.pal
diff --git a/graphics/pokemon/mega_aggron/back.png b/graphics/pokemon/aggron/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_aggron/back.png
rename to graphics/pokemon/aggron/mega/back.png
diff --git a/graphics/pokemon/mega_aggron/front.png b/graphics/pokemon/aggron/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_aggron/front.png
rename to graphics/pokemon/aggron/mega/front.png
diff --git a/graphics/pokemon/mega_aggron/icon.png b/graphics/pokemon/aggron/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_aggron/icon.png
rename to graphics/pokemon/aggron/mega/icon.png
diff --git a/graphics/pokemon/mega_aggron/normal.pal b/graphics/pokemon/aggron/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_aggron/normal.pal
rename to graphics/pokemon/aggron/mega/normal.pal
diff --git a/graphics/pokemon/mega_aggron/shiny.pal b/graphics/pokemon/aggron/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_aggron/shiny.pal
rename to graphics/pokemon/aggron/mega/shiny.pal
diff --git a/graphics/pokemon/mega_alakazam/back.png b/graphics/pokemon/alakazam/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_alakazam/back.png
rename to graphics/pokemon/alakazam/mega/back.png
diff --git a/graphics/pokemon/mega_alakazam/front.png b/graphics/pokemon/alakazam/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_alakazam/front.png
rename to graphics/pokemon/alakazam/mega/front.png
diff --git a/graphics/pokemon/mega_alakazam/icon.png b/graphics/pokemon/alakazam/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_alakazam/icon.png
rename to graphics/pokemon/alakazam/mega/icon.png
diff --git a/graphics/pokemon/mega_alakazam/normal.pal b/graphics/pokemon/alakazam/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_alakazam/normal.pal
rename to graphics/pokemon/alakazam/mega/normal.pal
diff --git a/graphics/pokemon/mega_alakazam/shiny.pal b/graphics/pokemon/alakazam/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_alakazam/shiny.pal
rename to graphics/pokemon/alakazam/mega/shiny.pal
diff --git a/graphics/pokemon/mega_altaria/back.png b/graphics/pokemon/altaria/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_altaria/back.png
rename to graphics/pokemon/altaria/mega/back.png
diff --git a/graphics/pokemon/mega_altaria/front.png b/graphics/pokemon/altaria/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_altaria/front.png
rename to graphics/pokemon/altaria/mega/front.png
diff --git a/graphics/pokemon/mega_altaria/icon.png b/graphics/pokemon/altaria/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_altaria/icon.png
rename to graphics/pokemon/altaria/mega/icon.png
diff --git a/graphics/pokemon/mega_altaria/normal.pal b/graphics/pokemon/altaria/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_altaria/normal.pal
rename to graphics/pokemon/altaria/mega/normal.pal
diff --git a/graphics/pokemon/mega_altaria/shiny.pal b/graphics/pokemon/altaria/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_altaria/shiny.pal
rename to graphics/pokemon/altaria/mega/shiny.pal
diff --git a/graphics/pokemon/mega_ampharos/back.png b/graphics/pokemon/ampharos/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_ampharos/back.png
rename to graphics/pokemon/ampharos/mega/back.png
diff --git a/graphics/pokemon/mega_ampharos/front.png b/graphics/pokemon/ampharos/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_ampharos/front.png
rename to graphics/pokemon/ampharos/mega/front.png
diff --git a/graphics/pokemon/mega_ampharos/icon.png b/graphics/pokemon/ampharos/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_ampharos/icon.png
rename to graphics/pokemon/ampharos/mega/icon.png
diff --git a/graphics/pokemon/mega_ampharos/normal.pal b/graphics/pokemon/ampharos/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_ampharos/normal.pal
rename to graphics/pokemon/ampharos/mega/normal.pal
diff --git a/graphics/pokemon/mega_ampharos/shiny.pal b/graphics/pokemon/ampharos/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_ampharos/shiny.pal
rename to graphics/pokemon/ampharos/mega/shiny.pal
diff --git a/graphics/pokemon/appletun/icon.png b/graphics/pokemon/appletun/icon.png
index 66de1521a..3b474c0f0 100644
Binary files a/graphics/pokemon/appletun/icon.png and b/graphics/pokemon/appletun/icon.png differ
diff --git a/graphics/pokemon/applin/icon.png b/graphics/pokemon/applin/icon.png
index c518f91a0..ce9fee4a9 100644
Binary files a/graphics/pokemon/applin/icon.png and b/graphics/pokemon/applin/icon.png differ
diff --git a/graphics/pokemon/articuno/galarian/icon.png b/graphics/pokemon/articuno/galarian/icon.png
index ce061cbc0..556bd42b4 100644
Binary files a/graphics/pokemon/articuno/galarian/icon.png and b/graphics/pokemon/articuno/galarian/icon.png differ
diff --git a/graphics/pokemon/mega_audino/back.png b/graphics/pokemon/audino/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_audino/back.png
rename to graphics/pokemon/audino/mega/back.png
diff --git a/graphics/pokemon/mega_audino/front.png b/graphics/pokemon/audino/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_audino/front.png
rename to graphics/pokemon/audino/mega/front.png
diff --git a/graphics/pokemon/mega_audino/icon.png b/graphics/pokemon/audino/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_audino/icon.png
rename to graphics/pokemon/audino/mega/icon.png
diff --git a/graphics/pokemon/mega_audino/normal.pal b/graphics/pokemon/audino/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_audino/normal.pal
rename to graphics/pokemon/audino/mega/normal.pal
diff --git a/graphics/pokemon/mega_audino/shiny.pal b/graphics/pokemon/audino/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_audino/shiny.pal
rename to graphics/pokemon/audino/mega/shiny.pal
diff --git a/graphics/pokemon/mega_banette/back.png b/graphics/pokemon/banette/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_banette/back.png
rename to graphics/pokemon/banette/mega/back.png
diff --git a/graphics/pokemon/mega_banette/front.png b/graphics/pokemon/banette/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_banette/front.png
rename to graphics/pokemon/banette/mega/front.png
diff --git a/graphics/pokemon/mega_banette/icon.png b/graphics/pokemon/banette/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_banette/icon.png
rename to graphics/pokemon/banette/mega/icon.png
diff --git a/graphics/pokemon/mega_banette/normal.pal b/graphics/pokemon/banette/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_banette/normal.pal
rename to graphics/pokemon/banette/mega/normal.pal
diff --git a/graphics/pokemon/mega_banette/shiny.pal b/graphics/pokemon/banette/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_banette/shiny.pal
rename to graphics/pokemon/banette/mega/shiny.pal
diff --git a/graphics/pokemon/mega_beedrill/back.png b/graphics/pokemon/beedrill/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_beedrill/back.png
rename to graphics/pokemon/beedrill/mega/back.png
diff --git a/graphics/pokemon/mega_beedrill/front.png b/graphics/pokemon/beedrill/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_beedrill/front.png
rename to graphics/pokemon/beedrill/mega/front.png
diff --git a/graphics/pokemon/beedrill/mega/icon.png b/graphics/pokemon/beedrill/mega/icon.png
new file mode 100644
index 000000000..9a1788b7e
Binary files /dev/null and b/graphics/pokemon/beedrill/mega/icon.png differ
diff --git a/graphics/pokemon/mega_beedrill/normal.pal b/graphics/pokemon/beedrill/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_beedrill/normal.pal
rename to graphics/pokemon/beedrill/mega/normal.pal
diff --git a/graphics/pokemon/mega_beedrill/shiny.pal b/graphics/pokemon/beedrill/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_beedrill/shiny.pal
rename to graphics/pokemon/beedrill/mega/shiny.pal
diff --git a/graphics/pokemon/mega_blastoise/back.png b/graphics/pokemon/blastoise/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_blastoise/back.png
rename to graphics/pokemon/blastoise/mega/back.png
diff --git a/graphics/pokemon/mega_blastoise/front.png b/graphics/pokemon/blastoise/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_blastoise/front.png
rename to graphics/pokemon/blastoise/mega/front.png
diff --git a/graphics/pokemon/mega_blastoise/icon.png b/graphics/pokemon/blastoise/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_blastoise/icon.png
rename to graphics/pokemon/blastoise/mega/icon.png
diff --git a/graphics/pokemon/mega_blastoise/normal.pal b/graphics/pokemon/blastoise/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_blastoise/normal.pal
rename to graphics/pokemon/blastoise/mega/normal.pal
diff --git a/graphics/pokemon/mega_blastoise/shiny.pal b/graphics/pokemon/blastoise/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_blastoise/shiny.pal
rename to graphics/pokemon/blastoise/mega/shiny.pal
diff --git a/graphics/pokemon/mega_blaziken/back.png b/graphics/pokemon/blaziken/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_blaziken/back.png
rename to graphics/pokemon/blaziken/mega/back.png
diff --git a/graphics/pokemon/mega_blaziken/front.png b/graphics/pokemon/blaziken/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_blaziken/front.png
rename to graphics/pokemon/blaziken/mega/front.png
diff --git a/graphics/pokemon/mega_blaziken/icon.png b/graphics/pokemon/blaziken/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_blaziken/icon.png
rename to graphics/pokemon/blaziken/mega/icon.png
diff --git a/graphics/pokemon/mega_blaziken/normal.pal b/graphics/pokemon/blaziken/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_blaziken/normal.pal
rename to graphics/pokemon/blaziken/mega/normal.pal
diff --git a/graphics/pokemon/mega_blaziken/shiny.pal b/graphics/pokemon/blaziken/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_blaziken/shiny.pal
rename to graphics/pokemon/blaziken/mega/shiny.pal
diff --git a/graphics/pokemon/blipbug/icon.png b/graphics/pokemon/blipbug/icon.png
index e4ce3a937..b3cf1cf79 100644
Binary files a/graphics/pokemon/blipbug/icon.png and b/graphics/pokemon/blipbug/icon.png differ
diff --git a/graphics/pokemon/mega_camerupt/back.png b/graphics/pokemon/camerupt/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_camerupt/back.png
rename to graphics/pokemon/camerupt/mega/back.png
diff --git a/graphics/pokemon/mega_camerupt/front.png b/graphics/pokemon/camerupt/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_camerupt/front.png
rename to graphics/pokemon/camerupt/mega/front.png
diff --git a/graphics/pokemon/mega_camerupt/icon.png b/graphics/pokemon/camerupt/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_camerupt/icon.png
rename to graphics/pokemon/camerupt/mega/icon.png
diff --git a/graphics/pokemon/mega_camerupt/normal.pal b/graphics/pokemon/camerupt/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_camerupt/normal.pal
rename to graphics/pokemon/camerupt/mega/normal.pal
diff --git a/graphics/pokemon/mega_camerupt/shiny.pal b/graphics/pokemon/camerupt/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_camerupt/shiny.pal
rename to graphics/pokemon/camerupt/mega/shiny.pal
diff --git a/graphics/pokemon/mega_charizard_x/back.png b/graphics/pokemon/charizard/mega_x/back.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_x/back.png
rename to graphics/pokemon/charizard/mega_x/back.png
diff --git a/graphics/pokemon/mega_charizard_x/front.png b/graphics/pokemon/charizard/mega_x/front.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_x/front.png
rename to graphics/pokemon/charizard/mega_x/front.png
diff --git a/graphics/pokemon/mega_charizard_x/icon.png b/graphics/pokemon/charizard/mega_x/icon.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_x/icon.png
rename to graphics/pokemon/charizard/mega_x/icon.png
diff --git a/graphics/pokemon/mega_charizard_x/normal.pal b/graphics/pokemon/charizard/mega_x/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_charizard_x/normal.pal
rename to graphics/pokemon/charizard/mega_x/normal.pal
diff --git a/graphics/pokemon/mega_charizard_x/shiny.pal b/graphics/pokemon/charizard/mega_x/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_charizard_x/shiny.pal
rename to graphics/pokemon/charizard/mega_x/shiny.pal
diff --git a/graphics/pokemon/mega_charizard_y/back.png b/graphics/pokemon/charizard/mega_y/back.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_y/back.png
rename to graphics/pokemon/charizard/mega_y/back.png
diff --git a/graphics/pokemon/mega_charizard_y/front.png b/graphics/pokemon/charizard/mega_y/front.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_y/front.png
rename to graphics/pokemon/charizard/mega_y/front.png
diff --git a/graphics/pokemon/mega_charizard_y/icon.png b/graphics/pokemon/charizard/mega_y/icon.png
similarity index 100%
rename from graphics/pokemon/mega_charizard_y/icon.png
rename to graphics/pokemon/charizard/mega_y/icon.png
diff --git a/graphics/pokemon/mega_charizard_y/normal.pal b/graphics/pokemon/charizard/mega_y/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_charizard_y/normal.pal
rename to graphics/pokemon/charizard/mega_y/normal.pal
diff --git a/graphics/pokemon/mega_charizard_y/shiny.pal b/graphics/pokemon/charizard/mega_y/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_charizard_y/shiny.pal
rename to graphics/pokemon/charizard/mega_y/shiny.pal
diff --git a/graphics/pokemon/mega_diancie/back.png b/graphics/pokemon/diancie/mega/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_diancie/back.png
rename to graphics/pokemon/diancie/mega/back.png
diff --git a/graphics/pokemon/mega_diancie/front.png b/graphics/pokemon/diancie/mega/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_diancie/front.png
rename to graphics/pokemon/diancie/mega/front.png
diff --git a/graphics/pokemon/mega_diancie/icon.png b/graphics/pokemon/diancie/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_diancie/icon.png
rename to graphics/pokemon/diancie/mega/icon.png
diff --git a/graphics/pokemon/mega_diancie/normal.pal b/graphics/pokemon/diancie/mega/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_diancie/normal.pal
rename to graphics/pokemon/diancie/mega/normal.pal
diff --git a/graphics/pokemon/mega_diancie/shiny.pal b/graphics/pokemon/diancie/mega/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_diancie/shiny.pal
rename to graphics/pokemon/diancie/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_diglett/back.png b/graphics/pokemon/diglett/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_diglett/back.png
rename to graphics/pokemon/diglett/alolan/back.png
diff --git a/graphics/pokemon/alolan_diglett/front.png b/graphics/pokemon/diglett/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_diglett/front.png
rename to graphics/pokemon/diglett/alolan/front.png
diff --git a/graphics/pokemon/alolan_diglett/icon.png b/graphics/pokemon/diglett/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_diglett/icon.png
rename to graphics/pokemon/diglett/alolan/icon.png
diff --git a/graphics/pokemon/alolan_diglett/normal.pal b/graphics/pokemon/diglett/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_diglett/normal.pal
rename to graphics/pokemon/diglett/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_diglett/shiny.pal b/graphics/pokemon/diglett/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_diglett/shiny.pal
rename to graphics/pokemon/diglett/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_dugtrio/back.png b/graphics/pokemon/dugtrio/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_dugtrio/back.png
rename to graphics/pokemon/dugtrio/alolan/back.png
diff --git a/graphics/pokemon/alolan_dugtrio/front.png b/graphics/pokemon/dugtrio/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_dugtrio/front.png
rename to graphics/pokemon/dugtrio/alolan/front.png
diff --git a/graphics/pokemon/alolan_dugtrio/icon.png b/graphics/pokemon/dugtrio/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_dugtrio/icon.png
rename to graphics/pokemon/dugtrio/alolan/icon.png
diff --git a/graphics/pokemon/alolan_dugtrio/normal.pal b/graphics/pokemon/dugtrio/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_dugtrio/normal.pal
rename to graphics/pokemon/dugtrio/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_dugtrio/shiny.pal b/graphics/pokemon/dugtrio/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_dugtrio/shiny.pal
rename to graphics/pokemon/dugtrio/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_exeggutor/back.png b/graphics/pokemon/exeggutor/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_exeggutor/back.png
rename to graphics/pokemon/exeggutor/alolan/back.png
diff --git a/graphics/pokemon/alolan_exeggutor/front.png b/graphics/pokemon/exeggutor/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_exeggutor/front.png
rename to graphics/pokemon/exeggutor/alolan/front.png
diff --git a/graphics/pokemon/alolan_exeggutor/icon.png b/graphics/pokemon/exeggutor/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_exeggutor/icon.png
rename to graphics/pokemon/exeggutor/alolan/icon.png
diff --git a/graphics/pokemon/alolan_exeggutor/normal.pal b/graphics/pokemon/exeggutor/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_exeggutor/normal.pal
rename to graphics/pokemon/exeggutor/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_exeggutor/shiny.pal b/graphics/pokemon/exeggutor/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_exeggutor/shiny.pal
rename to graphics/pokemon/exeggutor/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_gallade/back.png b/graphics/pokemon/gallade/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_gallade/back.png
rename to graphics/pokemon/gallade/mega/back.png
diff --git a/graphics/pokemon/mega_gallade/front.png b/graphics/pokemon/gallade/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_gallade/front.png
rename to graphics/pokemon/gallade/mega/front.png
diff --git a/graphics/pokemon/mega_gallade/icon.png b/graphics/pokemon/gallade/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_gallade/icon.png
rename to graphics/pokemon/gallade/mega/icon.png
diff --git a/graphics/pokemon/mega_gallade/normal.pal b/graphics/pokemon/gallade/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_gallade/normal.pal
rename to graphics/pokemon/gallade/mega/normal.pal
diff --git a/graphics/pokemon/mega_gallade/shiny.pal b/graphics/pokemon/gallade/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_gallade/shiny.pal
rename to graphics/pokemon/gallade/mega/shiny.pal
diff --git a/graphics/pokemon/mega_garchomp/back.png b/graphics/pokemon/garchomp/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_garchomp/back.png
rename to graphics/pokemon/garchomp/mega/back.png
diff --git a/graphics/pokemon/mega_garchomp/front.png b/graphics/pokemon/garchomp/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_garchomp/front.png
rename to graphics/pokemon/garchomp/mega/front.png
diff --git a/graphics/pokemon/garchomp/mega/icon.png b/graphics/pokemon/garchomp/mega/icon.png
new file mode 100644
index 000000000..4e37e0813
Binary files /dev/null and b/graphics/pokemon/garchomp/mega/icon.png differ
diff --git a/graphics/pokemon/mega_garchomp/normal.pal b/graphics/pokemon/garchomp/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_garchomp/normal.pal
rename to graphics/pokemon/garchomp/mega/normal.pal
diff --git a/graphics/pokemon/mega_garchomp/shiny.pal b/graphics/pokemon/garchomp/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_garchomp/shiny.pal
rename to graphics/pokemon/garchomp/mega/shiny.pal
diff --git a/graphics/pokemon/mega_gardevoir/back.png b/graphics/pokemon/gardevoir/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_gardevoir/back.png
rename to graphics/pokemon/gardevoir/mega/back.png
diff --git a/graphics/pokemon/mega_gardevoir/front.png b/graphics/pokemon/gardevoir/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_gardevoir/front.png
rename to graphics/pokemon/gardevoir/mega/front.png
diff --git a/graphics/pokemon/mega_gardevoir/icon.png b/graphics/pokemon/gardevoir/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_gardevoir/icon.png
rename to graphics/pokemon/gardevoir/mega/icon.png
diff --git a/graphics/pokemon/mega_gardevoir/normal.pal b/graphics/pokemon/gardevoir/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_gardevoir/normal.pal
rename to graphics/pokemon/gardevoir/mega/normal.pal
diff --git a/graphics/pokemon/mega_gardevoir/shiny.pal b/graphics/pokemon/gardevoir/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_gardevoir/shiny.pal
rename to graphics/pokemon/gardevoir/mega/shiny.pal
diff --git a/graphics/pokemon/mega_gengar/back.png b/graphics/pokemon/gengar/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_gengar/back.png
rename to graphics/pokemon/gengar/mega/back.png
diff --git a/graphics/pokemon/mega_gengar/front.png b/graphics/pokemon/gengar/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_gengar/front.png
rename to graphics/pokemon/gengar/mega/front.png
diff --git a/graphics/pokemon/mega_gengar/icon.png b/graphics/pokemon/gengar/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_gengar/icon.png
rename to graphics/pokemon/gengar/mega/icon.png
diff --git a/graphics/pokemon/mega_gengar/normal.pal b/graphics/pokemon/gengar/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_gengar/normal.pal
rename to graphics/pokemon/gengar/mega/normal.pal
diff --git a/graphics/pokemon/mega_gengar/shiny.pal b/graphics/pokemon/gengar/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_gengar/shiny.pal
rename to graphics/pokemon/gengar/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_geodude/back.png b/graphics/pokemon/geodude/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_geodude/back.png
rename to graphics/pokemon/geodude/alolan/back.png
diff --git a/graphics/pokemon/alolan_geodude/front.png b/graphics/pokemon/geodude/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_geodude/front.png
rename to graphics/pokemon/geodude/alolan/front.png
diff --git a/graphics/pokemon/alolan_geodude/icon.png b/graphics/pokemon/geodude/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_geodude/icon.png
rename to graphics/pokemon/geodude/alolan/icon.png
diff --git a/graphics/pokemon/alolan_geodude/normal.pal b/graphics/pokemon/geodude/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_geodude/normal.pal
rename to graphics/pokemon/geodude/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_geodude/shiny.pal b/graphics/pokemon/geodude/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_geodude/shiny.pal
rename to graphics/pokemon/geodude/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_glalie/back.png b/graphics/pokemon/glalie/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_glalie/back.png
rename to graphics/pokemon/glalie/mega/back.png
diff --git a/graphics/pokemon/mega_glalie/front.png b/graphics/pokemon/glalie/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_glalie/front.png
rename to graphics/pokemon/glalie/mega/front.png
diff --git a/graphics/pokemon/glalie/mega/icon.png b/graphics/pokemon/glalie/mega/icon.png
new file mode 100644
index 000000000..d563426c4
Binary files /dev/null and b/graphics/pokemon/glalie/mega/icon.png differ
diff --git a/graphics/pokemon/mega_glalie/normal.pal b/graphics/pokemon/glalie/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_glalie/normal.pal
rename to graphics/pokemon/glalie/mega/normal.pal
diff --git a/graphics/pokemon/mega_glalie/shiny.pal b/graphics/pokemon/glalie/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_glalie/shiny.pal
rename to graphics/pokemon/glalie/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_golem/back.png b/graphics/pokemon/golem/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_golem/back.png
rename to graphics/pokemon/golem/alolan/back.png
diff --git a/graphics/pokemon/alolan_golem/front.png b/graphics/pokemon/golem/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_golem/front.png
rename to graphics/pokemon/golem/alolan/front.png
diff --git a/graphics/pokemon/alolan_golem/icon.png b/graphics/pokemon/golem/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_golem/icon.png
rename to graphics/pokemon/golem/alolan/icon.png
diff --git a/graphics/pokemon/alolan_golem/normal.pal b/graphics/pokemon/golem/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_golem/normal.pal
rename to graphics/pokemon/golem/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_golem/shiny.pal b/graphics/pokemon/golem/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_golem/shiny.pal
rename to graphics/pokemon/golem/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_graveler/back.png b/graphics/pokemon/graveler/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_graveler/back.png
rename to graphics/pokemon/graveler/alolan/back.png
diff --git a/graphics/pokemon/alolan_graveler/front.png b/graphics/pokemon/graveler/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_graveler/front.png
rename to graphics/pokemon/graveler/alolan/front.png
diff --git a/graphics/pokemon/alolan_graveler/icon.png b/graphics/pokemon/graveler/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_graveler/icon.png
rename to graphics/pokemon/graveler/alolan/icon.png
diff --git a/graphics/pokemon/alolan_graveler/normal.pal b/graphics/pokemon/graveler/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_graveler/normal.pal
rename to graphics/pokemon/graveler/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_graveler/shiny.pal b/graphics/pokemon/graveler/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_graveler/shiny.pal
rename to graphics/pokemon/graveler/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_grimer/back.png b/graphics/pokemon/grimer/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_grimer/back.png
rename to graphics/pokemon/grimer/alolan/back.png
diff --git a/graphics/pokemon/alolan_grimer/front.png b/graphics/pokemon/grimer/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_grimer/front.png
rename to graphics/pokemon/grimer/alolan/front.png
diff --git a/graphics/pokemon/alolan_grimer/icon.png b/graphics/pokemon/grimer/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_grimer/icon.png
rename to graphics/pokemon/grimer/alolan/icon.png
diff --git a/graphics/pokemon/alolan_grimer/normal.pal b/graphics/pokemon/grimer/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_grimer/normal.pal
rename to graphics/pokemon/grimer/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_grimer/shiny.pal b/graphics/pokemon/grimer/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_grimer/shiny.pal
rename to graphics/pokemon/grimer/alolan/shiny.pal
diff --git a/graphics/pokemon/primal_groudon/back.png b/graphics/pokemon/groudon/primal/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_groudon/back.png
rename to graphics/pokemon/groudon/primal/back.png
diff --git a/graphics/pokemon/primal_groudon/front.png b/graphics/pokemon/groudon/primal/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_groudon/front.png
rename to graphics/pokemon/groudon/primal/front.png
diff --git a/graphics/pokemon/primal_groudon/icon.png b/graphics/pokemon/groudon/primal/icon.png
similarity index 100%
rename from graphics/pokemon/primal_groudon/icon.png
rename to graphics/pokemon/groudon/primal/icon.png
diff --git a/graphics/pokemon/primal_groudon/normal.pal b/graphics/pokemon/groudon/primal/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_groudon/normal.pal
rename to graphics/pokemon/groudon/primal/normal.pal
diff --git a/graphics/pokemon/primal_groudon/shiny.pal b/graphics/pokemon/groudon/primal/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_groudon/shiny.pal
rename to graphics/pokemon/groudon/primal/shiny.pal
diff --git a/graphics/pokemon/mega_gyarados/back.png b/graphics/pokemon/gyarados/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_gyarados/back.png
rename to graphics/pokemon/gyarados/mega/back.png
diff --git a/graphics/pokemon/mega_gyarados/front.png b/graphics/pokemon/gyarados/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_gyarados/front.png
rename to graphics/pokemon/gyarados/mega/front.png
diff --git a/graphics/pokemon/mega_gyarados/icon.png b/graphics/pokemon/gyarados/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_gyarados/icon.png
rename to graphics/pokemon/gyarados/mega/icon.png
diff --git a/graphics/pokemon/mega_gyarados/normal.pal b/graphics/pokemon/gyarados/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_gyarados/normal.pal
rename to graphics/pokemon/gyarados/mega/normal.pal
diff --git a/graphics/pokemon/mega_gyarados/shiny.pal b/graphics/pokemon/gyarados/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_gyarados/shiny.pal
rename to graphics/pokemon/gyarados/mega/shiny.pal
diff --git a/graphics/pokemon/mega_heracross/back.png b/graphics/pokemon/heracross/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_heracross/back.png
rename to graphics/pokemon/heracross/mega/back.png
diff --git a/graphics/pokemon/mega_heracross/front.png b/graphics/pokemon/heracross/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_heracross/front.png
rename to graphics/pokemon/heracross/mega/front.png
diff --git a/graphics/pokemon/mega_heracross/icon.png b/graphics/pokemon/heracross/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_heracross/icon.png
rename to graphics/pokemon/heracross/mega/icon.png
diff --git a/graphics/pokemon/mega_heracross/normal.pal b/graphics/pokemon/heracross/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_heracross/normal.pal
rename to graphics/pokemon/heracross/mega/normal.pal
diff --git a/graphics/pokemon/mega_heracross/shiny.pal b/graphics/pokemon/heracross/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_heracross/shiny.pal
rename to graphics/pokemon/heracross/mega/shiny.pal
diff --git a/graphics/pokemon/mega_houndoom/back.png b/graphics/pokemon/houndoom/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_houndoom/back.png
rename to graphics/pokemon/houndoom/mega/back.png
diff --git a/graphics/pokemon/mega_houndoom/front.png b/graphics/pokemon/houndoom/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_houndoom/front.png
rename to graphics/pokemon/houndoom/mega/front.png
diff --git a/graphics/pokemon/mega_houndoom/icon.png b/graphics/pokemon/houndoom/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_houndoom/icon.png
rename to graphics/pokemon/houndoom/mega/icon.png
diff --git a/graphics/pokemon/mega_houndoom/normal.pal b/graphics/pokemon/houndoom/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_houndoom/normal.pal
rename to graphics/pokemon/houndoom/mega/normal.pal
diff --git a/graphics/pokemon/mega_houndoom/shiny.pal b/graphics/pokemon/houndoom/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_houndoom/shiny.pal
rename to graphics/pokemon/houndoom/mega/shiny.pal
diff --git a/graphics/pokemon/mega_kangaskhan/back.png b/graphics/pokemon/kangaskhan/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_kangaskhan/back.png
rename to graphics/pokemon/kangaskhan/mega/back.png
diff --git a/graphics/pokemon/mega_kangaskhan/front.png b/graphics/pokemon/kangaskhan/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_kangaskhan/front.png
rename to graphics/pokemon/kangaskhan/mega/front.png
diff --git a/graphics/pokemon/mega_kangaskhan/icon.png b/graphics/pokemon/kangaskhan/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_kangaskhan/icon.png
rename to graphics/pokemon/kangaskhan/mega/icon.png
diff --git a/graphics/pokemon/mega_kangaskhan/normal.pal b/graphics/pokemon/kangaskhan/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_kangaskhan/normal.pal
rename to graphics/pokemon/kangaskhan/mega/normal.pal
diff --git a/graphics/pokemon/mega_kangaskhan/shiny.pal b/graphics/pokemon/kangaskhan/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_kangaskhan/shiny.pal
rename to graphics/pokemon/kangaskhan/mega/shiny.pal
diff --git a/graphics/pokemon/primal_kyogre/back.png b/graphics/pokemon/kyogre/primal/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_kyogre/back.png
rename to graphics/pokemon/kyogre/primal/back.png
diff --git a/graphics/pokemon/primal_kyogre/front.png b/graphics/pokemon/kyogre/primal/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_kyogre/front.png
rename to graphics/pokemon/kyogre/primal/front.png
diff --git a/graphics/pokemon/primal_kyogre/icon.png b/graphics/pokemon/kyogre/primal/icon.png
similarity index 100%
rename from graphics/pokemon/primal_kyogre/icon.png
rename to graphics/pokemon/kyogre/primal/icon.png
diff --git a/graphics/pokemon/primal_kyogre/normal.pal b/graphics/pokemon/kyogre/primal/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_kyogre/normal.pal
rename to graphics/pokemon/kyogre/primal/normal.pal
diff --git a/graphics/pokemon/primal_kyogre/shiny.pal b/graphics/pokemon/kyogre/primal/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/primal_kyogre/shiny.pal
rename to graphics/pokemon/kyogre/primal/shiny.pal
diff --git a/graphics/pokemon/mega_latias/back.png b/graphics/pokemon/latias/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_latias/back.png
rename to graphics/pokemon/latias/mega/back.png
diff --git a/graphics/pokemon/mega_latias/front.png b/graphics/pokemon/latias/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_latias/front.png
rename to graphics/pokemon/latias/mega/front.png
diff --git a/graphics/pokemon/latias/mega/icon.png b/graphics/pokemon/latias/mega/icon.png
new file mode 100644
index 000000000..0d022d802
Binary files /dev/null and b/graphics/pokemon/latias/mega/icon.png differ
diff --git a/graphics/pokemon/mega_latias/normal.pal b/graphics/pokemon/latias/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_latias/normal.pal
rename to graphics/pokemon/latias/mega/normal.pal
diff --git a/graphics/pokemon/mega_latias/shiny.pal b/graphics/pokemon/latias/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_latias/shiny.pal
rename to graphics/pokemon/latias/mega/shiny.pal
diff --git a/graphics/pokemon/mega_latios/back.png b/graphics/pokemon/latios/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_latios/back.png
rename to graphics/pokemon/latios/mega/back.png
diff --git a/graphics/pokemon/mega_latios/front.png b/graphics/pokemon/latios/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_latios/front.png
rename to graphics/pokemon/latios/mega/front.png
diff --git a/graphics/pokemon/latios/mega/icon.png b/graphics/pokemon/latios/mega/icon.png
new file mode 100644
index 000000000..8d594c2fa
Binary files /dev/null and b/graphics/pokemon/latios/mega/icon.png differ
diff --git a/graphics/pokemon/mega_latios/normal.pal b/graphics/pokemon/latios/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_latios/normal.pal
rename to graphics/pokemon/latios/mega/normal.pal
diff --git a/graphics/pokemon/mega_latios/shiny.pal b/graphics/pokemon/latios/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_latios/shiny.pal
rename to graphics/pokemon/latios/mega/shiny.pal
diff --git a/graphics/pokemon/mega_lopunny/back.png b/graphics/pokemon/lopunny/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_lopunny/back.png
rename to graphics/pokemon/lopunny/mega/back.png
diff --git a/graphics/pokemon/mega_lopunny/front.png b/graphics/pokemon/lopunny/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_lopunny/front.png
rename to graphics/pokemon/lopunny/mega/front.png
diff --git a/graphics/pokemon/mega_lopunny/icon.png b/graphics/pokemon/lopunny/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_lopunny/icon.png
rename to graphics/pokemon/lopunny/mega/icon.png
diff --git a/graphics/pokemon/mega_lopunny/normal.pal b/graphics/pokemon/lopunny/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_lopunny/normal.pal
rename to graphics/pokemon/lopunny/mega/normal.pal
diff --git a/graphics/pokemon/mega_lopunny/shiny.pal b/graphics/pokemon/lopunny/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_lopunny/shiny.pal
rename to graphics/pokemon/lopunny/mega/shiny.pal
diff --git a/graphics/pokemon/mega_lucario/back.png b/graphics/pokemon/lucario/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_lucario/back.png
rename to graphics/pokemon/lucario/mega/back.png
diff --git a/graphics/pokemon/mega_lucario/front.png b/graphics/pokemon/lucario/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_lucario/front.png
rename to graphics/pokemon/lucario/mega/front.png
diff --git a/graphics/pokemon/mega_lucario/icon.png b/graphics/pokemon/lucario/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_lucario/icon.png
rename to graphics/pokemon/lucario/mega/icon.png
diff --git a/graphics/pokemon/mega_lucario/normal.pal b/graphics/pokemon/lucario/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_lucario/normal.pal
rename to graphics/pokemon/lucario/mega/normal.pal
diff --git a/graphics/pokemon/mega_lucario/shiny.pal b/graphics/pokemon/lucario/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_lucario/shiny.pal
rename to graphics/pokemon/lucario/mega/shiny.pal
diff --git a/graphics/pokemon/mega_manectric/back.png b/graphics/pokemon/manectric/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_manectric/back.png
rename to graphics/pokemon/manectric/mega/back.png
diff --git a/graphics/pokemon/mega_manectric/front.png b/graphics/pokemon/manectric/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_manectric/front.png
rename to graphics/pokemon/manectric/mega/front.png
diff --git a/graphics/pokemon/mega_manectric/icon.png b/graphics/pokemon/manectric/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_manectric/icon.png
rename to graphics/pokemon/manectric/mega/icon.png
diff --git a/graphics/pokemon/mega_manectric/normal.pal b/graphics/pokemon/manectric/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_manectric/normal.pal
rename to graphics/pokemon/manectric/mega/normal.pal
diff --git a/graphics/pokemon/mega_manectric/shiny.pal b/graphics/pokemon/manectric/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_manectric/shiny.pal
rename to graphics/pokemon/manectric/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_marowak/back.png b/graphics/pokemon/marowak/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_marowak/back.png
rename to graphics/pokemon/marowak/alolan/back.png
diff --git a/graphics/pokemon/alolan_marowak/front.png b/graphics/pokemon/marowak/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_marowak/front.png
rename to graphics/pokemon/marowak/alolan/front.png
diff --git a/graphics/pokemon/alolan_marowak/icon.png b/graphics/pokemon/marowak/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_marowak/icon.png
rename to graphics/pokemon/marowak/alolan/icon.png
diff --git a/graphics/pokemon/alolan_marowak/normal.pal b/graphics/pokemon/marowak/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_marowak/normal.pal
rename to graphics/pokemon/marowak/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_marowak/shiny.pal b/graphics/pokemon/marowak/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_marowak/shiny.pal
rename to graphics/pokemon/marowak/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_mawile/back.png b/graphics/pokemon/mawile/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_mawile/back.png
rename to graphics/pokemon/mawile/mega/back.png
diff --git a/graphics/pokemon/mega_mawile/front.png b/graphics/pokemon/mawile/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_mawile/front.png
rename to graphics/pokemon/mawile/mega/front.png
diff --git a/graphics/pokemon/mawile/mega/icon.png b/graphics/pokemon/mawile/mega/icon.png
new file mode 100644
index 000000000..6fdec15cc
Binary files /dev/null and b/graphics/pokemon/mawile/mega/icon.png differ
diff --git a/graphics/pokemon/mega_mawile/normal.pal b/graphics/pokemon/mawile/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_mawile/normal.pal
rename to graphics/pokemon/mawile/mega/normal.pal
diff --git a/graphics/pokemon/mega_mawile/shiny.pal b/graphics/pokemon/mawile/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_mawile/shiny.pal
rename to graphics/pokemon/mawile/mega/shiny.pal
diff --git a/graphics/pokemon/mega_medicham/back.png b/graphics/pokemon/medicham/mega/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_medicham/back.png
rename to graphics/pokemon/medicham/mega/back.png
diff --git a/graphics/pokemon/mega_medicham/front.png b/graphics/pokemon/medicham/mega/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_medicham/front.png
rename to graphics/pokemon/medicham/mega/front.png
diff --git a/graphics/pokemon/mega_medicham/icon.png b/graphics/pokemon/medicham/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_medicham/icon.png
rename to graphics/pokemon/medicham/mega/icon.png
diff --git a/graphics/pokemon/mega_medicham/normal.pal b/graphics/pokemon/medicham/mega/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_medicham/normal.pal
rename to graphics/pokemon/medicham/mega/normal.pal
diff --git a/graphics/pokemon/mega_medicham/shiny.pal b/graphics/pokemon/medicham/mega/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/mega_medicham/shiny.pal
rename to graphics/pokemon/medicham/mega/shiny.pal
diff --git a/graphics/pokemon/mega_beedrill/icon.png b/graphics/pokemon/mega_beedrill/icon.png
deleted file mode 100644
index 4c5b8fe46..000000000
Binary files a/graphics/pokemon/mega_beedrill/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_garchomp/icon.png b/graphics/pokemon/mega_garchomp/icon.png
deleted file mode 100644
index 168638243..000000000
Binary files a/graphics/pokemon/mega_garchomp/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_glalie/icon.png b/graphics/pokemon/mega_glalie/icon.png
deleted file mode 100644
index 02596508e..000000000
Binary files a/graphics/pokemon/mega_glalie/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_latias/icon.png b/graphics/pokemon/mega_latias/icon.png
deleted file mode 100644
index 9c4c1c20f..000000000
Binary files a/graphics/pokemon/mega_latias/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_latios/icon.png b/graphics/pokemon/mega_latios/icon.png
deleted file mode 100644
index 011c2d8f6..000000000
Binary files a/graphics/pokemon/mega_latios/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_mawile/icon.png b/graphics/pokemon/mega_mawile/icon.png
deleted file mode 100644
index 81e49c897..000000000
Binary files a/graphics/pokemon/mega_mawile/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_pidgeot/icon.png b/graphics/pokemon/mega_pidgeot/icon.png
deleted file mode 100644
index 255fffe58..000000000
Binary files a/graphics/pokemon/mega_pidgeot/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_scizor/icon.png b/graphics/pokemon/mega_scizor/icon.png
deleted file mode 100644
index e6a4eb065..000000000
Binary files a/graphics/pokemon/mega_scizor/icon.png and /dev/null differ
diff --git a/graphics/pokemon/mega_slowbro/icon.png b/graphics/pokemon/mega_slowbro/icon.png
deleted file mode 100644
index 621fe4184..000000000
Binary files a/graphics/pokemon/mega_slowbro/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_meowth/back.png b/graphics/pokemon/meowth/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_meowth/back.png
rename to graphics/pokemon/meowth/alolan/back.png
diff --git a/graphics/pokemon/alolan_meowth/front.png b/graphics/pokemon/meowth/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_meowth/front.png
rename to graphics/pokemon/meowth/alolan/front.png
diff --git a/graphics/pokemon/alolan_meowth/icon.png b/graphics/pokemon/meowth/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_meowth/icon.png
rename to graphics/pokemon/meowth/alolan/icon.png
diff --git a/graphics/pokemon/alolan_meowth/normal.pal b/graphics/pokemon/meowth/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_meowth/normal.pal
rename to graphics/pokemon/meowth/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_meowth/shiny.pal b/graphics/pokemon/meowth/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_meowth/shiny.pal
rename to graphics/pokemon/meowth/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_metagross/back.png b/graphics/pokemon/metagross/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_metagross/back.png
rename to graphics/pokemon/metagross/mega/back.png
diff --git a/graphics/pokemon/mega_metagross/front.png b/graphics/pokemon/metagross/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_metagross/front.png
rename to graphics/pokemon/metagross/mega/front.png
diff --git a/graphics/pokemon/mega_metagross/icon.png b/graphics/pokemon/metagross/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_metagross/icon.png
rename to graphics/pokemon/metagross/mega/icon.png
diff --git a/graphics/pokemon/mega_metagross/normal.pal b/graphics/pokemon/metagross/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_metagross/normal.pal
rename to graphics/pokemon/metagross/mega/normal.pal
diff --git a/graphics/pokemon/mega_metagross/shiny.pal b/graphics/pokemon/metagross/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_metagross/shiny.pal
rename to graphics/pokemon/metagross/mega/shiny.pal
diff --git a/graphics/pokemon/mega_mewtwo_x/back.png b/graphics/pokemon/mewtwo/mega_x/back.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_x/back.png
rename to graphics/pokemon/mewtwo/mega_x/back.png
diff --git a/graphics/pokemon/mega_mewtwo_x/front.png b/graphics/pokemon/mewtwo/mega_x/front.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_x/front.png
rename to graphics/pokemon/mewtwo/mega_x/front.png
diff --git a/graphics/pokemon/mega_mewtwo_x/icon.png b/graphics/pokemon/mewtwo/mega_x/icon.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_x/icon.png
rename to graphics/pokemon/mewtwo/mega_x/icon.png
diff --git a/graphics/pokemon/mega_mewtwo_x/normal.pal b/graphics/pokemon/mewtwo/mega_x/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_x/normal.pal
rename to graphics/pokemon/mewtwo/mega_x/normal.pal
diff --git a/graphics/pokemon/mega_mewtwo_x/shiny.pal b/graphics/pokemon/mewtwo/mega_x/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_x/shiny.pal
rename to graphics/pokemon/mewtwo/mega_x/shiny.pal
diff --git a/graphics/pokemon/mega_mewtwo_y/back.png b/graphics/pokemon/mewtwo/mega_y/back.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_y/back.png
rename to graphics/pokemon/mewtwo/mega_y/back.png
diff --git a/graphics/pokemon/mega_mewtwo_y/front.png b/graphics/pokemon/mewtwo/mega_y/front.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_y/front.png
rename to graphics/pokemon/mewtwo/mega_y/front.png
diff --git a/graphics/pokemon/mega_mewtwo_y/icon.png b/graphics/pokemon/mewtwo/mega_y/icon.png
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_y/icon.png
rename to graphics/pokemon/mewtwo/mega_y/icon.png
diff --git a/graphics/pokemon/mega_mewtwo_y/normal.pal b/graphics/pokemon/mewtwo/mega_y/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_y/normal.pal
rename to graphics/pokemon/mewtwo/mega_y/normal.pal
diff --git a/graphics/pokemon/mega_mewtwo_y/shiny.pal b/graphics/pokemon/mewtwo/mega_y/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_mewtwo_y/shiny.pal
rename to graphics/pokemon/mewtwo/mega_y/shiny.pal
diff --git a/graphics/pokemon/moltres/galarian/icon.png b/graphics/pokemon/moltres/galarian/icon.png
index 90edae521..0f469cbf5 100644
Binary files a/graphics/pokemon/moltres/galarian/icon.png and b/graphics/pokemon/moltres/galarian/icon.png differ
diff --git a/graphics/pokemon/alolan_muk/back.png b/graphics/pokemon/muk/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_muk/back.png
rename to graphics/pokemon/muk/alolan/back.png
diff --git a/graphics/pokemon/alolan_muk/front.png b/graphics/pokemon/muk/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_muk/front.png
rename to graphics/pokemon/muk/alolan/front.png
diff --git a/graphics/pokemon/alolan_muk/icon.png b/graphics/pokemon/muk/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_muk/icon.png
rename to graphics/pokemon/muk/alolan/icon.png
diff --git a/graphics/pokemon/alolan_muk/normal.pal b/graphics/pokemon/muk/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_muk/normal.pal
rename to graphics/pokemon/muk/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_muk/shiny.pal b/graphics/pokemon/muk/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_muk/shiny.pal
rename to graphics/pokemon/muk/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_ninetales/back.png b/graphics/pokemon/ninetales/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_ninetales/back.png
rename to graphics/pokemon/ninetales/alolan/back.png
diff --git a/graphics/pokemon/alolan_ninetales/front.png b/graphics/pokemon/ninetales/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_ninetales/front.png
rename to graphics/pokemon/ninetales/alolan/front.png
diff --git a/graphics/pokemon/alolan_ninetales/icon.png b/graphics/pokemon/ninetales/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_ninetales/icon.png
rename to graphics/pokemon/ninetales/alolan/icon.png
diff --git a/graphics/pokemon/alolan_ninetales/normal.pal b/graphics/pokemon/ninetales/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_ninetales/normal.pal
rename to graphics/pokemon/ninetales/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_ninetales/shiny.pal b/graphics/pokemon/ninetales/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_ninetales/shiny.pal
rename to graphics/pokemon/ninetales/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_persian/back.png b/graphics/pokemon/persian/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_persian/back.png
rename to graphics/pokemon/persian/alolan/back.png
diff --git a/graphics/pokemon/alolan_persian/front.png b/graphics/pokemon/persian/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_persian/front.png
rename to graphics/pokemon/persian/alolan/front.png
diff --git a/graphics/pokemon/alolan_persian/icon.png b/graphics/pokemon/persian/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_persian/icon.png
rename to graphics/pokemon/persian/alolan/icon.png
diff --git a/graphics/pokemon/alolan_persian/normal.pal b/graphics/pokemon/persian/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_persian/normal.pal
rename to graphics/pokemon/persian/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_persian/shiny.pal b/graphics/pokemon/persian/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_persian/shiny.pal
rename to graphics/pokemon/persian/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_pidgeot/back.png b/graphics/pokemon/pidgeot/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_pidgeot/back.png
rename to graphics/pokemon/pidgeot/mega/back.png
diff --git a/graphics/pokemon/mega_pidgeot/front.png b/graphics/pokemon/pidgeot/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_pidgeot/front.png
rename to graphics/pokemon/pidgeot/mega/front.png
diff --git a/graphics/pokemon/pidgeot/mega/icon.png b/graphics/pokemon/pidgeot/mega/icon.png
new file mode 100644
index 000000000..32cb6e1f1
Binary files /dev/null and b/graphics/pokemon/pidgeot/mega/icon.png differ
diff --git a/graphics/pokemon/mega_pidgeot/normal.pal b/graphics/pokemon/pidgeot/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_pidgeot/normal.pal
rename to graphics/pokemon/pidgeot/mega/normal.pal
diff --git a/graphics/pokemon/mega_pidgeot/shiny.pal b/graphics/pokemon/pidgeot/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_pidgeot/shiny.pal
rename to graphics/pokemon/pidgeot/mega/shiny.pal
diff --git a/graphics/pokemon/mega_pinsir/back.png b/graphics/pokemon/pinsir/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_pinsir/back.png
rename to graphics/pokemon/pinsir/mega/back.png
diff --git a/graphics/pokemon/mega_pinsir/front.png b/graphics/pokemon/pinsir/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_pinsir/front.png
rename to graphics/pokemon/pinsir/mega/front.png
diff --git a/graphics/pokemon/mega_pinsir/icon.png b/graphics/pokemon/pinsir/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_pinsir/icon.png
rename to graphics/pokemon/pinsir/mega/icon.png
diff --git a/graphics/pokemon/mega_pinsir/normal.pal b/graphics/pokemon/pinsir/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_pinsir/normal.pal
rename to graphics/pokemon/pinsir/mega/normal.pal
diff --git a/graphics/pokemon/mega_pinsir/shiny.pal b/graphics/pokemon/pinsir/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_pinsir/shiny.pal
rename to graphics/pokemon/pinsir/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_raichu/back.png b/graphics/pokemon/raichu/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raichu/back.png
rename to graphics/pokemon/raichu/alolan/back.png
diff --git a/graphics/pokemon/alolan_raichu/front.png b/graphics/pokemon/raichu/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raichu/front.png
rename to graphics/pokemon/raichu/alolan/front.png
diff --git a/graphics/pokemon/alolan_raichu/icon.png b/graphics/pokemon/raichu/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raichu/icon.png
rename to graphics/pokemon/raichu/alolan/icon.png
diff --git a/graphics/pokemon/alolan_raichu/normal.pal b/graphics/pokemon/raichu/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raichu/normal.pal
rename to graphics/pokemon/raichu/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_raichu/shiny.pal b/graphics/pokemon/raichu/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raichu/shiny.pal
rename to graphics/pokemon/raichu/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_raticate/back.png b/graphics/pokemon/raticate/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raticate/back.png
rename to graphics/pokemon/raticate/alolan/back.png
diff --git a/graphics/pokemon/alolan_raticate/front.png b/graphics/pokemon/raticate/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raticate/front.png
rename to graphics/pokemon/raticate/alolan/front.png
diff --git a/graphics/pokemon/alolan_raticate/icon.png b/graphics/pokemon/raticate/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raticate/icon.png
rename to graphics/pokemon/raticate/alolan/icon.png
diff --git a/graphics/pokemon/alolan_raticate/normal.pal b/graphics/pokemon/raticate/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raticate/normal.pal
rename to graphics/pokemon/raticate/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_raticate/shiny.pal b/graphics/pokemon/raticate/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_raticate/shiny.pal
rename to graphics/pokemon/raticate/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_rattata/back.png b/graphics/pokemon/rattata/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_rattata/back.png
rename to graphics/pokemon/rattata/alolan/back.png
diff --git a/graphics/pokemon/alolan_rattata/front.png b/graphics/pokemon/rattata/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_rattata/front.png
rename to graphics/pokemon/rattata/alolan/front.png
diff --git a/graphics/pokemon/alolan_rattata/icon.png b/graphics/pokemon/rattata/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_rattata/icon.png
rename to graphics/pokemon/rattata/alolan/icon.png
diff --git a/graphics/pokemon/alolan_rattata/normal.pal b/graphics/pokemon/rattata/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_rattata/normal.pal
rename to graphics/pokemon/rattata/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_rattata/shiny.pal b/graphics/pokemon/rattata/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_rattata/shiny.pal
rename to graphics/pokemon/rattata/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_rayquaza/back.png b/graphics/pokemon/rayquaza/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_rayquaza/back.png
rename to graphics/pokemon/rayquaza/mega/back.png
diff --git a/graphics/pokemon/mega_rayquaza/front.png b/graphics/pokemon/rayquaza/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_rayquaza/front.png
rename to graphics/pokemon/rayquaza/mega/front.png
diff --git a/graphics/pokemon/mega_rayquaza/icon.png b/graphics/pokemon/rayquaza/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_rayquaza/icon.png
rename to graphics/pokemon/rayquaza/mega/icon.png
diff --git a/graphics/pokemon/mega_rayquaza/normal.pal b/graphics/pokemon/rayquaza/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_rayquaza/normal.pal
rename to graphics/pokemon/rayquaza/mega/normal.pal
diff --git a/graphics/pokemon/mega_rayquaza/shiny.pal b/graphics/pokemon/rayquaza/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_rayquaza/shiny.pal
rename to graphics/pokemon/rayquaza/mega/shiny.pal
diff --git a/graphics/pokemon/regidrago/icon.png b/graphics/pokemon/regidrago/icon.png
index b6cfa5d9d..3b994684b 100644
Binary files a/graphics/pokemon/regidrago/icon.png and b/graphics/pokemon/regidrago/icon.png differ
diff --git a/graphics/pokemon/regieleki/icon.png b/graphics/pokemon/regieleki/icon.png
index 268208caf..bf3b3f3a8 100644
Binary files a/graphics/pokemon/regieleki/icon.png and b/graphics/pokemon/regieleki/icon.png differ
diff --git a/graphics/pokemon/mega_sableye/back.png b/graphics/pokemon/sableye/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_sableye/back.png
rename to graphics/pokemon/sableye/mega/back.png
diff --git a/graphics/pokemon/mega_sableye/front.png b/graphics/pokemon/sableye/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_sableye/front.png
rename to graphics/pokemon/sableye/mega/front.png
diff --git a/graphics/pokemon/mega_sableye/icon.png b/graphics/pokemon/sableye/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_sableye/icon.png
rename to graphics/pokemon/sableye/mega/icon.png
diff --git a/graphics/pokemon/mega_sableye/normal.pal b/graphics/pokemon/sableye/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_sableye/normal.pal
rename to graphics/pokemon/sableye/mega/normal.pal
diff --git a/graphics/pokemon/mega_sableye/shiny.pal b/graphics/pokemon/sableye/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_sableye/shiny.pal
rename to graphics/pokemon/sableye/mega/shiny.pal
diff --git a/graphics/pokemon/mega_salamence/back.png b/graphics/pokemon/salamence/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_salamence/back.png
rename to graphics/pokemon/salamence/mega/back.png
diff --git a/graphics/pokemon/mega_salamence/front.png b/graphics/pokemon/salamence/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_salamence/front.png
rename to graphics/pokemon/salamence/mega/front.png
diff --git a/graphics/pokemon/mega_salamence/icon.png b/graphics/pokemon/salamence/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_salamence/icon.png
rename to graphics/pokemon/salamence/mega/icon.png
diff --git a/graphics/pokemon/mega_salamence/normal.pal b/graphics/pokemon/salamence/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_salamence/normal.pal
rename to graphics/pokemon/salamence/mega/normal.pal
diff --git a/graphics/pokemon/mega_salamence/shiny.pal b/graphics/pokemon/salamence/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_salamence/shiny.pal
rename to graphics/pokemon/salamence/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_sandshrew/back.png b/graphics/pokemon/sandshrew/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandshrew/back.png
rename to graphics/pokemon/sandshrew/alolan/back.png
diff --git a/graphics/pokemon/alolan_sandshrew/front.png b/graphics/pokemon/sandshrew/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandshrew/front.png
rename to graphics/pokemon/sandshrew/alolan/front.png
diff --git a/graphics/pokemon/alolan_sandshrew/icon.png b/graphics/pokemon/sandshrew/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandshrew/icon.png
rename to graphics/pokemon/sandshrew/alolan/icon.png
diff --git a/graphics/pokemon/alolan_sandshrew/normal.pal b/graphics/pokemon/sandshrew/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandshrew/normal.pal
rename to graphics/pokemon/sandshrew/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_sandshrew/shiny.pal b/graphics/pokemon/sandshrew/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandshrew/shiny.pal
rename to graphics/pokemon/sandshrew/alolan/shiny.pal
diff --git a/graphics/pokemon/alolan_sandslash/back.png b/graphics/pokemon/sandslash/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandslash/back.png
rename to graphics/pokemon/sandslash/alolan/back.png
diff --git a/graphics/pokemon/alolan_sandslash/front.png b/graphics/pokemon/sandslash/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandslash/front.png
rename to graphics/pokemon/sandslash/alolan/front.png
diff --git a/graphics/pokemon/alolan_sandslash/icon.png b/graphics/pokemon/sandslash/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandslash/icon.png
rename to graphics/pokemon/sandslash/alolan/icon.png
diff --git a/graphics/pokemon/alolan_sandslash/normal.pal b/graphics/pokemon/sandslash/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandslash/normal.pal
rename to graphics/pokemon/sandslash/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_sandslash/shiny.pal b/graphics/pokemon/sandslash/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_sandslash/shiny.pal
rename to graphics/pokemon/sandslash/alolan/shiny.pal
diff --git a/graphics/pokemon/mega_sceptile/back.png b/graphics/pokemon/sceptile/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_sceptile/back.png
rename to graphics/pokemon/sceptile/mega/back.png
diff --git a/graphics/pokemon/mega_sceptile/front.png b/graphics/pokemon/sceptile/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_sceptile/front.png
rename to graphics/pokemon/sceptile/mega/front.png
diff --git a/graphics/pokemon/mega_sceptile/icon.png b/graphics/pokemon/sceptile/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_sceptile/icon.png
rename to graphics/pokemon/sceptile/mega/icon.png
diff --git a/graphics/pokemon/mega_sceptile/normal.pal b/graphics/pokemon/sceptile/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_sceptile/normal.pal
rename to graphics/pokemon/sceptile/mega/normal.pal
diff --git a/graphics/pokemon/mega_sceptile/shiny.pal b/graphics/pokemon/sceptile/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_sceptile/shiny.pal
rename to graphics/pokemon/sceptile/mega/shiny.pal
diff --git a/graphics/pokemon/mega_scizor/back.png b/graphics/pokemon/scizor/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_scizor/back.png
rename to graphics/pokemon/scizor/mega/back.png
diff --git a/graphics/pokemon/mega_scizor/front.png b/graphics/pokemon/scizor/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_scizor/front.png
rename to graphics/pokemon/scizor/mega/front.png
diff --git a/graphics/pokemon/scizor/mega/icon.png b/graphics/pokemon/scizor/mega/icon.png
new file mode 100644
index 000000000..2ba3e8243
Binary files /dev/null and b/graphics/pokemon/scizor/mega/icon.png differ
diff --git a/graphics/pokemon/mega_scizor/normal.pal b/graphics/pokemon/scizor/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_scizor/normal.pal
rename to graphics/pokemon/scizor/mega/normal.pal
diff --git a/graphics/pokemon/mega_scizor/shiny.pal b/graphics/pokemon/scizor/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_scizor/shiny.pal
rename to graphics/pokemon/scizor/mega/shiny.pal
diff --git a/graphics/pokemon/scorbunny/icon.png b/graphics/pokemon/scorbunny/icon.png
index 84c83b301..9009f3e1d 100644
Binary files a/graphics/pokemon/scorbunny/icon.png and b/graphics/pokemon/scorbunny/icon.png differ
diff --git a/graphics/pokemon/scyther/anim_front.png b/graphics/pokemon/scyther/anim_front.png
index 60828d6f7..673dc2d22 100644
Binary files a/graphics/pokemon/scyther/anim_front.png and b/graphics/pokemon/scyther/anim_front.png differ
diff --git a/graphics/pokemon/scyther/front.png b/graphics/pokemon/scyther/front.png
index 125139577..abf81a063 100644
Binary files a/graphics/pokemon/scyther/front.png and b/graphics/pokemon/scyther/front.png differ
diff --git a/graphics/pokemon/mega_sharpedo/back.png b/graphics/pokemon/sharpedo/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_sharpedo/back.png
rename to graphics/pokemon/sharpedo/mega/back.png
diff --git a/graphics/pokemon/mega_sharpedo/front.png b/graphics/pokemon/sharpedo/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_sharpedo/front.png
rename to graphics/pokemon/sharpedo/mega/front.png
diff --git a/graphics/pokemon/mega_sharpedo/icon.png b/graphics/pokemon/sharpedo/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_sharpedo/icon.png
rename to graphics/pokemon/sharpedo/mega/icon.png
diff --git a/graphics/pokemon/mega_sharpedo/normal.pal b/graphics/pokemon/sharpedo/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_sharpedo/normal.pal
rename to graphics/pokemon/sharpedo/mega/normal.pal
diff --git a/graphics/pokemon/mega_sharpedo/shiny.pal b/graphics/pokemon/sharpedo/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_sharpedo/shiny.pal
rename to graphics/pokemon/sharpedo/mega/shiny.pal
diff --git a/graphics/pokemon/mega_slowbro/back.png b/graphics/pokemon/slowbro/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_slowbro/back.png
rename to graphics/pokemon/slowbro/mega/back.png
diff --git a/graphics/pokemon/mega_slowbro/front.png b/graphics/pokemon/slowbro/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_slowbro/front.png
rename to graphics/pokemon/slowbro/mega/front.png
diff --git a/graphics/pokemon/slowbro/mega/icon.png b/graphics/pokemon/slowbro/mega/icon.png
new file mode 100644
index 000000000..826f0bcce
Binary files /dev/null and b/graphics/pokemon/slowbro/mega/icon.png differ
diff --git a/graphics/pokemon/mega_slowbro/normal.pal b/graphics/pokemon/slowbro/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_slowbro/normal.pal
rename to graphics/pokemon/slowbro/mega/normal.pal
diff --git a/graphics/pokemon/mega_slowbro/shiny.pal b/graphics/pokemon/slowbro/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_slowbro/shiny.pal
rename to graphics/pokemon/slowbro/mega/shiny.pal
diff --git a/graphics/pokemon/mega_steelix/back.png b/graphics/pokemon/steelix/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_steelix/back.png
rename to graphics/pokemon/steelix/mega/back.png
diff --git a/graphics/pokemon/mega_steelix/front.png b/graphics/pokemon/steelix/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_steelix/front.png
rename to graphics/pokemon/steelix/mega/front.png
diff --git a/graphics/pokemon/mega_steelix/icon.png b/graphics/pokemon/steelix/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_steelix/icon.png
rename to graphics/pokemon/steelix/mega/icon.png
diff --git a/graphics/pokemon/mega_steelix/normal.pal b/graphics/pokemon/steelix/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_steelix/normal.pal
rename to graphics/pokemon/steelix/mega/normal.pal
diff --git a/graphics/pokemon/mega_steelix/shiny.pal b/graphics/pokemon/steelix/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_steelix/shiny.pal
rename to graphics/pokemon/steelix/mega/shiny.pal
diff --git a/graphics/pokemon/mega_swampert/back.png b/graphics/pokemon/swampert/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_swampert/back.png
rename to graphics/pokemon/swampert/mega/back.png
diff --git a/graphics/pokemon/mega_swampert/front.png b/graphics/pokemon/swampert/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_swampert/front.png
rename to graphics/pokemon/swampert/mega/front.png
diff --git a/graphics/pokemon/mega_swampert/icon.png b/graphics/pokemon/swampert/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_swampert/icon.png
rename to graphics/pokemon/swampert/mega/icon.png
diff --git a/graphics/pokemon/mega_swampert/normal.pal b/graphics/pokemon/swampert/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_swampert/normal.pal
rename to graphics/pokemon/swampert/mega/normal.pal
diff --git a/graphics/pokemon/mega_swampert/shiny.pal b/graphics/pokemon/swampert/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_swampert/shiny.pal
rename to graphics/pokemon/swampert/mega/shiny.pal
diff --git a/graphics/pokemon/mega_tyranitar/back.png b/graphics/pokemon/tyranitar/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_tyranitar/back.png
rename to graphics/pokemon/tyranitar/mega/back.png
diff --git a/graphics/pokemon/mega_tyranitar/front.png b/graphics/pokemon/tyranitar/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_tyranitar/front.png
rename to graphics/pokemon/tyranitar/mega/front.png
diff --git a/graphics/pokemon/mega_tyranitar/icon.png b/graphics/pokemon/tyranitar/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_tyranitar/icon.png
rename to graphics/pokemon/tyranitar/mega/icon.png
diff --git a/graphics/pokemon/mega_tyranitar/normal.pal b/graphics/pokemon/tyranitar/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_tyranitar/normal.pal
rename to graphics/pokemon/tyranitar/mega/normal.pal
diff --git a/graphics/pokemon/mega_tyranitar/shiny.pal b/graphics/pokemon/tyranitar/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_tyranitar/shiny.pal
rename to graphics/pokemon/tyranitar/mega/shiny.pal
diff --git a/graphics/pokemon/mega_venusaur/back.png b/graphics/pokemon/venusaur/mega/back.png
similarity index 100%
rename from graphics/pokemon/mega_venusaur/back.png
rename to graphics/pokemon/venusaur/mega/back.png
diff --git a/graphics/pokemon/mega_venusaur/front.png b/graphics/pokemon/venusaur/mega/front.png
similarity index 100%
rename from graphics/pokemon/mega_venusaur/front.png
rename to graphics/pokemon/venusaur/mega/front.png
diff --git a/graphics/pokemon/mega_venusaur/icon.png b/graphics/pokemon/venusaur/mega/icon.png
similarity index 100%
rename from graphics/pokemon/mega_venusaur/icon.png
rename to graphics/pokemon/venusaur/mega/icon.png
diff --git a/graphics/pokemon/mega_venusaur/normal.pal b/graphics/pokemon/venusaur/mega/normal.pal
similarity index 100%
rename from graphics/pokemon/mega_venusaur/normal.pal
rename to graphics/pokemon/venusaur/mega/normal.pal
diff --git a/graphics/pokemon/mega_venusaur/shiny.pal b/graphics/pokemon/venusaur/mega/shiny.pal
similarity index 100%
rename from graphics/pokemon/mega_venusaur/shiny.pal
rename to graphics/pokemon/venusaur/mega/shiny.pal
diff --git a/graphics/pokemon/alolan_vulpix/back.png b/graphics/pokemon/vulpix/alolan/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_vulpix/back.png
rename to graphics/pokemon/vulpix/alolan/back.png
diff --git a/graphics/pokemon/alolan_vulpix/front.png b/graphics/pokemon/vulpix/alolan/front.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_vulpix/front.png
rename to graphics/pokemon/vulpix/alolan/front.png
diff --git a/graphics/pokemon/alolan_vulpix/icon.png b/graphics/pokemon/vulpix/alolan/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_vulpix/icon.png
rename to graphics/pokemon/vulpix/alolan/icon.png
diff --git a/graphics/pokemon/alolan_vulpix/normal.pal b/graphics/pokemon/vulpix/alolan/normal.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_vulpix/normal.pal
rename to graphics/pokemon/vulpix/alolan/normal.pal
diff --git a/graphics/pokemon/alolan_vulpix/shiny.pal b/graphics/pokemon/vulpix/alolan/shiny.pal
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokemon/alolan_vulpix/shiny.pal
rename to graphics/pokemon/vulpix/alolan/shiny.pal
diff --git a/graphics/pokemon/zapdos/galarian/icon.png b/graphics/pokemon/zapdos/galarian/icon.png
index df9bb29b5..2d9f031ff 100644
Binary files a/graphics/pokemon/zapdos/galarian/icon.png and b/graphics/pokemon/zapdos/galarian/icon.png differ
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 05332ea45..e53f6e7f4 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -912,74 +912,74 @@ const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/fron
 const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz");
 const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz");
 const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz");
-const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/front.4bpp.lz");
-const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/front.4bpp.lz");
-const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/front.4bpp.lz");
-const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/mega_blastoise/front.4bpp.lz");
-const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/mega_beedrill/front.4bpp.lz");
-const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/mega_pidgeot/front.4bpp.lz");
-const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/mega_alakazam/front.4bpp.lz");
-const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/mega_slowbro/front.4bpp.lz");
-const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/mega_gengar/front.4bpp.lz");
-const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/mega_kangaskhan/front.4bpp.lz");
-const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/mega_pinsir/front.4bpp.lz");
-const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/mega_gyarados/front.4bpp.lz");
-const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/mega_aerodactyl/front.4bpp.lz");
-const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_x/front.4bpp.lz");
-const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_y/front.4bpp.lz");
-const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/mega_ampharos/front.4bpp.lz");
-const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/mega_steelix/front.4bpp.lz");
-const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/mega_scizor/front.4bpp.lz");
-const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/mega_heracross/front.4bpp.lz");
-const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/mega_houndoom/front.4bpp.lz");
-const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/mega_tyranitar/front.4bpp.lz");
-const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/mega_sceptile/front.4bpp.lz");
-const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/mega_blaziken/front.4bpp.lz");
-const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/mega_swampert/front.4bpp.lz");
-const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/mega_gardevoir/front.4bpp.lz");
-const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/mega_sableye/front.4bpp.lz");
-const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mega_mawile/front.4bpp.lz");
-const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/mega_aggron/front.4bpp.lz");
-const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/mega_medicham/front.4bpp.lz");
-const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/mega_manectric/front.4bpp.lz");
-const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/mega_sharpedo/front.4bpp.lz");
-const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/mega_camerupt/front.4bpp.lz");
-const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/mega_altaria/front.4bpp.lz");
-const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/mega_banette/front.4bpp.lz");
-const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/mega_absol/front.4bpp.lz");
-const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/mega_glalie/front.4bpp.lz");
-const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/mega_salamence/front.4bpp.lz");
-const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/mega_metagross/front.4bpp.lz");
-const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/mega_latias/front.4bpp.lz");
-const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/mega_latios/front.4bpp.lz");
-const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/mega_lopunny/front.4bpp.lz");
-const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/mega_garchomp/front.4bpp.lz");
-const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/mega_lucario/front.4bpp.lz");
-const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/mega_abomasnow/front.4bpp.lz");
-const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/mega_gallade/front.4bpp.lz");
-const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/mega_audino/front.4bpp.lz");
-const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/mega_diancie/front.4bpp.lz");
-const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/mega_rayquaza/front.4bpp.lz");
-const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/primal_kyogre/front.4bpp.lz");
-const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/primal_groudon/front.4bpp.lz");
-const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/alolan_rattata/front.4bpp.lz");
-const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raticate/front.4bpp.lz");
-const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raichu/front.4bpp.lz");
-const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/front.4bpp.lz");
-const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/front.4bpp.lz");
-const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/front.4bpp.lz");
-const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/front.4bpp.lz");
-const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/alolan_diglett/front.4bpp.lz");
-const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/front.4bpp.lz");
-const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/alolan_meowth/front.4bpp.lz");
-const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/alolan_persian/front.4bpp.lz");
-const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/alolan_geodude/front.4bpp.lz");
-const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_graveler/front.4bpp.lz");
-const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/alolan_golem/front.4bpp.lz");
-const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_grimer/front.4bpp.lz");
-const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/alolan_muk/front.4bpp.lz");
-const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/front.4bpp.lz");
-const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/alolan_marowak/front.4bpp.lz");
+const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz");
+const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz");
+const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/front.4bpp.lz");
+const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/front.4bpp.lz");
+const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/front.4bpp.lz");
+const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/front.4bpp.lz");
+const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/front.4bpp.lz");
+const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/front.4bpp.lz");
+const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/front.4bpp.lz");
+const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/front.4bpp.lz");
+const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/front.4bpp.lz");
+const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/front.4bpp.lz");
+const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/front.4bpp.lz");
+const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/front.4bpp.lz");
+const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/front.4bpp.lz");
+const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/front.4bpp.lz");
+const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/front.4bpp.lz");
+const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/front.4bpp.lz");
+const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/front.4bpp.lz");
+const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/front.4bpp.lz");
+const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/front.4bpp.lz");
+const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/front.4bpp.lz");
+const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz");
+const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz");
+const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz");
+const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/front.4bpp.lz");
+const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz");
+const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz");
+const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz");
+const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz");
+const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz");
+const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz");
+const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz");
+const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/front.4bpp.lz");
+const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz");
 const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/front.4bpp.lz");
 const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz");
 const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/front.4bpp.lz");
@@ -2064,74 +2064,74 @@ const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.
 const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz");
 const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz");
 const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz");
-const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/back.4bpp.lz");
-const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/back.4bpp.lz");
-const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/back.4bpp.lz");
-const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/mega_blastoise/back.4bpp.lz");
-const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/mega_beedrill/back.4bpp.lz");
-const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/mega_pidgeot/back.4bpp.lz");
-const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/mega_alakazam/back.4bpp.lz");
-const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/mega_slowbro/back.4bpp.lz");
-const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/mega_gengar/back.4bpp.lz");
-const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/mega_kangaskhan/back.4bpp.lz");
-const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/mega_pinsir/back.4bpp.lz");
-const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/mega_gyarados/back.4bpp.lz");
-const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/mega_aerodactyl/back.4bpp.lz");
-const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_x/back.4bpp.lz");
-const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_y/back.4bpp.lz");
-const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/mega_ampharos/back.4bpp.lz");
-const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/mega_steelix/back.4bpp.lz");
-const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/mega_scizor/back.4bpp.lz");
-const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/mega_heracross/back.4bpp.lz");
-const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/mega_houndoom/back.4bpp.lz");
-const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/mega_tyranitar/back.4bpp.lz");
-const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/mega_sceptile/back.4bpp.lz");
-const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/mega_blaziken/back.4bpp.lz");
-const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/mega_swampert/back.4bpp.lz");
-const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/mega_gardevoir/back.4bpp.lz");
-const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/mega_sableye/back.4bpp.lz");
-const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mega_mawile/back.4bpp.lz");
-const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/mega_aggron/back.4bpp.lz");
-const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/mega_medicham/back.4bpp.lz");
-const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/mega_manectric/back.4bpp.lz");
-const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/mega_sharpedo/back.4bpp.lz");
-const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/mega_camerupt/back.4bpp.lz");
-const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/mega_altaria/back.4bpp.lz");
-const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/mega_banette/back.4bpp.lz");
-const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/mega_absol/back.4bpp.lz");
-const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/mega_glalie/back.4bpp.lz");
-const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/mega_salamence/back.4bpp.lz");
-const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/mega_metagross/back.4bpp.lz");
-const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/mega_latias/back.4bpp.lz");
-const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/mega_latios/back.4bpp.lz");
-const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/mega_lopunny/back.4bpp.lz");
-const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/mega_garchomp/back.4bpp.lz");
-const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/mega_lucario/back.4bpp.lz");
-const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/mega_abomasnow/back.4bpp.lz");
-const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/mega_gallade/back.4bpp.lz");
-const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/mega_audino/back.4bpp.lz");
-const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/mega_diancie/back.4bpp.lz");
-const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/mega_rayquaza/back.4bpp.lz");
-const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/primal_kyogre/back.4bpp.lz");
-const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/primal_groudon/back.4bpp.lz");
-const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/alolan_rattata/back.4bpp.lz");
-const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raticate/back.4bpp.lz");
-const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raichu/back.4bpp.lz");
-const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/back.4bpp.lz");
-const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/back.4bpp.lz");
-const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/back.4bpp.lz");
-const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/back.4bpp.lz");
-const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/alolan_diglett/back.4bpp.lz");
-const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/back.4bpp.lz");
-const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/alolan_meowth/back.4bpp.lz");
-const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/alolan_persian/back.4bpp.lz");
-const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/alolan_geodude/back.4bpp.lz");
-const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_graveler/back.4bpp.lz");
-const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/alolan_golem/back.4bpp.lz");
-const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_grimer/back.4bpp.lz");
-const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/alolan_muk/back.4bpp.lz");
-const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/back.4bpp.lz");
-const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/alolan_marowak/back.4bpp.lz");
+const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz");
+const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz");
+const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/back.4bpp.lz");
+const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/back.4bpp.lz");
+const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/back.4bpp.lz");
+const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/back.4bpp.lz");
+const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/back.4bpp.lz");
+const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/back.4bpp.lz");
+const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/back.4bpp.lz");
+const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/back.4bpp.lz");
+const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/back.4bpp.lz");
+const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/back.4bpp.lz");
+const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/back.4bpp.lz");
+const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/back.4bpp.lz");
+const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/back.4bpp.lz");
+const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/back.4bpp.lz");
+const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/back.4bpp.lz");
+const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/back.4bpp.lz");
+const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/back.4bpp.lz");
+const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/back.4bpp.lz");
+const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/back.4bpp.lz");
+const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/back.4bpp.lz");
+const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/back.4bpp.lz");
+const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/back.4bpp.lz");
+const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/back.4bpp.lz");
+const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/back.4bpp.lz");
+const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/back.4bpp.lz");
+const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/back.4bpp.lz");
+const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/back.4bpp.lz");
+const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/back.4bpp.lz");
+const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/back.4bpp.lz");
+const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/back.4bpp.lz");
+const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/back.4bpp.lz");
+const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/back.4bpp.lz");
+const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/back.4bpp.lz");
+const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/back.4bpp.lz");
+const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/back.4bpp.lz");
+const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/back.4bpp.lz");
+const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz");
+const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/back.4bpp.lz");
+const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/back.4bpp.lz");
+const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/back.4bpp.lz");
+const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/back.4bpp.lz");
+const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz");
+const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/back.4bpp.lz");
+const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/back.4bpp.lz");
+const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/back.4bpp.lz");
+const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/back.4bpp.lz");
+const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz");
+const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/back.4bpp.lz");
+const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/back.4bpp.lz");
+const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/back.4bpp.lz");
+const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/back.4bpp.lz");
+const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/back.4bpp.lz");
+const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/back.4bpp.lz");
+const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/back.4bpp.lz");
+const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/back.4bpp.lz");
+const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/back.4bpp.lz");
+const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/back.4bpp.lz");
+const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/back.4bpp.lz");
+const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/back.4bpp.lz");
+const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/back.4bpp.lz");
+const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/back.4bpp.lz");
+const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/back.4bpp.lz");
+const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/back.4bpp.lz");
+const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/back.4bpp.lz");
+const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/back.4bpp.lz");
+const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/back.4bpp.lz");
 const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/back.4bpp.lz");
 const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/back.4bpp.lz");
 const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/back.4bpp.lz");
@@ -3208,74 +3208,74 @@ const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/norma
 const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz");
 const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz");
 const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz");
-const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/normal.gbapal.lz");
-const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/normal.gbapal.lz");
-const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/normal.gbapal.lz");
-const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/mega_blastoise/normal.gbapal.lz");
-const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/mega_beedrill/normal.gbapal.lz");
-const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/mega_pidgeot/normal.gbapal.lz");
-const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/mega_alakazam/normal.gbapal.lz");
-const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/mega_slowbro/normal.gbapal.lz");
-const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/mega_gengar/normal.gbapal.lz");
-const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/mega_kangaskhan/normal.gbapal.lz");
-const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/mega_pinsir/normal.gbapal.lz");
-const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/mega_gyarados/normal.gbapal.lz");
-const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/mega_aerodactyl/normal.gbapal.lz");
-const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_x/normal.gbapal.lz");
-const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_y/normal.gbapal.lz");
-const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/mega_ampharos/normal.gbapal.lz");
-const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/mega_steelix/normal.gbapal.lz");
-const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/mega_scizor/normal.gbapal.lz");
-const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/mega_heracross/normal.gbapal.lz");
-const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/mega_houndoom/normal.gbapal.lz");
-const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/mega_tyranitar/normal.gbapal.lz");
-const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/mega_sceptile/normal.gbapal.lz");
-const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/mega_blaziken/normal.gbapal.lz");
-const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/mega_swampert/normal.gbapal.lz");
-const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/mega_gardevoir/normal.gbapal.lz");
-const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/mega_sableye/normal.gbapal.lz");
-const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mega_mawile/normal.gbapal.lz");
-const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/mega_aggron/normal.gbapal.lz");
-const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/mega_medicham/normal.gbapal.lz");
-const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/mega_manectric/normal.gbapal.lz");
-const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/mega_sharpedo/normal.gbapal.lz");
-const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/mega_camerupt/normal.gbapal.lz");
-const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/mega_altaria/normal.gbapal.lz");
-const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/mega_banette/normal.gbapal.lz");
-const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/mega_absol/normal.gbapal.lz");
-const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/mega_glalie/normal.gbapal.lz");
-const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/mega_salamence/normal.gbapal.lz");
-const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/mega_metagross/normal.gbapal.lz");
-const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/mega_latias/normal.gbapal.lz");
-const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/mega_latios/normal.gbapal.lz");
-const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/mega_lopunny/normal.gbapal.lz");
-const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/mega_garchomp/normal.gbapal.lz");
-const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/mega_lucario/normal.gbapal.lz");
-const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/mega_abomasnow/normal.gbapal.lz");
-const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/mega_gallade/normal.gbapal.lz");
-const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/mega_audino/normal.gbapal.lz");
-const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/mega_diancie/normal.gbapal.lz");
-const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/mega_rayquaza/normal.gbapal.lz");
-const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/primal_kyogre/normal.gbapal.lz");
-const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/primal_groudon/normal.gbapal.lz");
-const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/alolan_rattata/normal.gbapal.lz");
-const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raticate/normal.gbapal.lz");
-const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raichu/normal.gbapal.lz");
-const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/normal.gbapal.lz");
-const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/normal.gbapal.lz");
-const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/normal.gbapal.lz");
-const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/normal.gbapal.lz");
-const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/alolan_diglett/normal.gbapal.lz");
-const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/normal.gbapal.lz");
-const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/alolan_meowth/normal.gbapal.lz");
-const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/alolan_persian/normal.gbapal.lz");
-const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/alolan_geodude/normal.gbapal.lz");
-const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_graveler/normal.gbapal.lz");
-const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/alolan_golem/normal.gbapal.lz");
-const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_grimer/normal.gbapal.lz");
-const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/alolan_muk/normal.gbapal.lz");
-const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/normal.gbapal.lz");
-const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/alolan_marowak/normal.gbapal.lz");
+const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz");
+const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz");
+const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/normal.gbapal.lz");
+const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/normal.gbapal.lz");
+const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/normal.gbapal.lz");
+const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/normal.gbapal.lz");
+const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/normal.gbapal.lz");
+const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/normal.gbapal.lz");
+const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/normal.gbapal.lz");
+const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/normal.gbapal.lz");
+const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/normal.gbapal.lz");
+const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/normal.gbapal.lz");
+const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/normal.gbapal.lz");
+const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/normal.gbapal.lz");
+const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/normal.gbapal.lz");
+const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/normal.gbapal.lz");
+const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/normal.gbapal.lz");
+const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/normal.gbapal.lz");
+const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/normal.gbapal.lz");
+const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/normal.gbapal.lz");
+const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/normal.gbapal.lz");
+const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/normal.gbapal.lz");
+const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/normal.gbapal.lz");
+const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/normal.gbapal.lz");
+const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/normal.gbapal.lz");
+const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/normal.gbapal.lz");
+const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/normal.gbapal.lz");
+const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/normal.gbapal.lz");
+const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/normal.gbapal.lz");
+const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/normal.gbapal.lz");
+const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/normal.gbapal.lz");
+const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/normal.gbapal.lz");
+const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/normal.gbapal.lz");
+const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/normal.gbapal.lz");
+const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/normal.gbapal.lz");
+const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/normal.gbapal.lz");
+const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/normal.gbapal.lz");
+const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/normal.gbapal.lz");
+const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/normal.gbapal.lz");
+const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/normal.gbapal.lz");
+const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/normal.gbapal.lz");
+const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/normal.gbapal.lz");
+const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/normal.gbapal.lz");
+const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/normal.gbapal.lz");
+const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/normal.gbapal.lz");
+const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/normal.gbapal.lz");
+const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/normal.gbapal.lz");
+const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/normal.gbapal.lz");
+const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/normal.gbapal.lz");
+const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/normal.gbapal.lz");
+const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/normal.gbapal.lz");
+const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/normal.gbapal.lz");
+const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/normal.gbapal.lz");
+const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/normal.gbapal.lz");
+const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/normal.gbapal.lz");
+const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/normal.gbapal.lz");
+const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/normal.gbapal.lz");
+const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/normal.gbapal.lz");
+const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/normal.gbapal.lz");
+const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/normal.gbapal.lz");
+const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/normal.gbapal.lz");
+const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/normal.gbapal.lz");
+const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/normal.gbapal.lz");
+const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/normal.gbapal.lz");
+const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/normal.gbapal.lz");
+const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/normal.gbapal.lz");
+const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/normal.gbapal.lz");
+const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/normal.gbapal.lz");
 const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/normal.gbapal.lz");
 const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/normal.gbapal.lz");
 const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/normal.gbapal.lz");
@@ -4379,74 +4379,74 @@ const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/
 const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz");
-const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/shiny.gbapal.lz");
-const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/mega_blastoise/shiny.gbapal.lz");
-const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/mega_beedrill/shiny.gbapal.lz");
-const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/mega_pidgeot/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/mega_alakazam/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/mega_slowbro/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/mega_gengar/shiny.gbapal.lz");
-const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/mega_kangaskhan/shiny.gbapal.lz");
-const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/mega_pinsir/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/mega_gyarados/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/mega_aerodactyl/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_x/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mega_mewtwo_y/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/mega_ampharos/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/mega_steelix/shiny.gbapal.lz");
-const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/mega_scizor/shiny.gbapal.lz");
-const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/mega_heracross/shiny.gbapal.lz");
-const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/mega_houndoom/shiny.gbapal.lz");
-const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/mega_tyranitar/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/mega_sceptile/shiny.gbapal.lz");
-const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/mega_blaziken/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/mega_swampert/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/mega_gardevoir/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/mega_sableye/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mega_mawile/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/mega_aggron/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/mega_medicham/shiny.gbapal.lz");
-const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/mega_manectric/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/mega_sharpedo/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/mega_camerupt/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/mega_altaria/shiny.gbapal.lz");
-const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/mega_banette/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/mega_absol/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/mega_glalie/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/mega_salamence/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/mega_metagross/shiny.gbapal.lz");
-const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/mega_latias/shiny.gbapal.lz");
-const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/mega_latios/shiny.gbapal.lz");
-const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/mega_lopunny/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/mega_garchomp/shiny.gbapal.lz");
-const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/mega_lucario/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/mega_abomasnow/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/mega_gallade/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/mega_audino/shiny.gbapal.lz");
-const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/mega_diancie/shiny.gbapal.lz");
-const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/mega_rayquaza/shiny.gbapal.lz");
-const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/primal_kyogre/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/primal_groudon/shiny.gbapal.lz");
-const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/alolan_rattata/shiny.gbapal.lz");
-const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raticate/shiny.gbapal.lz");
-const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/alolan_raichu/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/shiny.gbapal.lz");
-const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/shiny.gbapal.lz");
-const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/shiny.gbapal.lz");
-const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/alolan_diglett/shiny.gbapal.lz");
-const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/alolan_meowth/shiny.gbapal.lz");
-const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/alolan_persian/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/alolan_geodude/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_graveler/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/alolan_golem/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/alolan_grimer/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/alolan_muk/shiny.gbapal.lz");
-const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/alolan_marowak/shiny.gbapal.lz");
+const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/shiny.gbapal.lz");
+const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/shiny.gbapal.lz");
 const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/shiny.gbapal.lz");
 const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/shiny.gbapal.lz");
 const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/shiny.gbapal.lz");
@@ -5540,74 +5540,74 @@ const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"
 const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp");
 const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp");
 //const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp");
-const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp");
-const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp");
-const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/mega_charizard_y/icon.4bpp");
-const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/mega_blastoise/icon.4bpp");
-const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/mega_beedrill/icon.4bpp");
-const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/mega_pidgeot/icon.4bpp");
-const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/mega_alakazam/icon.4bpp");
-const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/mega_slowbro/icon.4bpp");
-const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/mega_gengar/icon.4bpp");
-const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/mega_kangaskhan/icon.4bpp");
-const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/mega_pinsir/icon.4bpp");
-const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/mega_gyarados/icon.4bpp");
-const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/mega_aerodactyl/icon.4bpp");
-const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/mega_mewtwo_x/icon.4bpp");
-const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/mega_mewtwo_y/icon.4bpp");
-const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/mega_ampharos/icon.4bpp");
-const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/mega_steelix/icon.4bpp");
-const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/mega_scizor/icon.4bpp");
-const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/mega_heracross/icon.4bpp");
-const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/mega_houndoom/icon.4bpp");
-const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/mega_tyranitar/icon.4bpp");
-const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/mega_sceptile/icon.4bpp");
-const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/mega_blaziken/icon.4bpp");
-const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/mega_swampert/icon.4bpp");
-const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/mega_gardevoir/icon.4bpp");
-const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/mega_sableye/icon.4bpp");
-const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/mega_mawile/icon.4bpp");
-const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/mega_aggron/icon.4bpp");
-const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/mega_medicham/icon.4bpp");
-const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/mega_manectric/icon.4bpp");
-const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/mega_sharpedo/icon.4bpp");
-const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/mega_camerupt/icon.4bpp");
-const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/mega_altaria/icon.4bpp");
-const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/mega_banette/icon.4bpp");
-const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/mega_absol/icon.4bpp");
-const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/mega_glalie/icon.4bpp");
-const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/mega_salamence/icon.4bpp");
-const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/mega_metagross/icon.4bpp");
-const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/mega_latias/icon.4bpp");
-const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/mega_latios/icon.4bpp");
-const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/mega_lopunny/icon.4bpp");
-const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/mega_garchomp/icon.4bpp");
-const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/mega_lucario/icon.4bpp");
-const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/mega_abomasnow/icon.4bpp");
-const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/mega_gallade/icon.4bpp");
-const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/mega_audino/icon.4bpp");
-const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/mega_diancie/icon.4bpp");
-const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/mega_rayquaza/icon.4bpp");
-const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/primal_kyogre/icon.4bpp");
-const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/primal_groudon/icon.4bpp");
-const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/alolan_rattata/icon.4bpp");
-const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/alolan_raticate/icon.4bpp");
-const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/alolan_raichu/icon.4bpp");
-const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/alolan_sandshrew/icon.4bpp");
-const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/alolan_sandslash/icon.4bpp");
-const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/alolan_vulpix/icon.4bpp");
-const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/alolan_ninetales/icon.4bpp");
-const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/alolan_diglett/icon.4bpp");
-const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/alolan_dugtrio/icon.4bpp");
-const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/alolan_meowth/icon.4bpp");
-const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/alolan_persian/icon.4bpp");
-const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/alolan_geodude/icon.4bpp");
-const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/alolan_graveler/icon.4bpp");
-const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/alolan_golem/icon.4bpp");
-const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/alolan_grimer/icon.4bpp");
-const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/alolan_muk/icon.4bpp");
-const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/alolan_exeggutor/icon.4bpp");
-const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/alolan_marowak/icon.4bpp");
+const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp");
+const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp");
+const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/icon.4bpp");
+const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/blastoise/mega/icon.4bpp");
+const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/beedrill/mega/icon.4bpp");
+const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/pidgeot/mega/icon.4bpp");
+const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/alakazam/mega/icon.4bpp");
+const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/slowbro/mega/icon.4bpp");
+const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gengar/mega/icon.4bpp");
+const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/kangaskhan/mega/icon.4bpp");
+const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/pinsir/mega/icon.4bpp");
+const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gyarados/mega/icon.4bpp");
+const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/aerodactyl/mega/icon.4bpp");
+const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_x/icon.4bpp");
+const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_y/icon.4bpp");
+const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/ampharos/mega/icon.4bpp");
+const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/steelix/mega/icon.4bpp");
+const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/scizor/mega/icon.4bpp");
+const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/heracross/mega/icon.4bpp");
+const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/houndoom/mega/icon.4bpp");
+const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/tyranitar/mega/icon.4bpp");
+const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/sceptile/mega/icon.4bpp");
+const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/blaziken/mega/icon.4bpp");
+const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/swampert/mega/icon.4bpp");
+const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gardevoir/mega/icon.4bpp");
+const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/sableye/mega/icon.4bpp");
+const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/mawile/mega/icon.4bpp");
+const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/aggron/mega/icon.4bpp");
+const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/medicham/mega/icon.4bpp");
+const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/manectric/mega/icon.4bpp");
+const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/sharpedo/mega/icon.4bpp");
+const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/camerupt/mega/icon.4bpp");
+const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/altaria/mega/icon.4bpp");
+const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/banette/mega/icon.4bpp");
+const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/absol/mega/icon.4bpp");
+const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/glalie/mega/icon.4bpp");
+const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/salamence/mega/icon.4bpp");
+const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp");
+const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/mega/icon.4bpp");
+const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/latios/mega/icon.4bpp");
+const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp");
+const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/mega/icon.4bpp");
+const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp");
+const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/mega/icon.4bpp");
+const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gallade/mega/icon.4bpp");
+const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp");
+const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/diancie/mega/icon.4bpp");
+const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp");
+const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/icon.4bpp");
+const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/groudon/primal/icon.4bpp");
+const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/rattata/alolan/icon.4bpp");
+const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/raticate/alolan/icon.4bpp");
+const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/raichu/alolan/icon.4bpp");
+const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/sandshrew/alolan/icon.4bpp");
+const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/sandslash/alolan/icon.4bpp");
+const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/vulpix/alolan/icon.4bpp");
+const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/ninetales/alolan/icon.4bpp");
+const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/diglett/alolan/icon.4bpp");
+const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/dugtrio/alolan/icon.4bpp");
+const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/meowth/alolan/icon.4bpp");
+const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/persian/alolan/icon.4bpp");
+const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/geodude/alolan/icon.4bpp");
+const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/graveler/alolan/icon.4bpp");
+const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/golem/alolan/icon.4bpp");
+const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/grimer/alolan/icon.4bpp");
+const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/muk/alolan/icon.4bpp");
+const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/exeggutor/alolan/icon.4bpp");
+const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/marowak/alolan/icon.4bpp");
 const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp");
 const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp");
 const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp");
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 0faebfe74..b8c443584 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -2155,7 +2155,7 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_URSHIFU] = 2,
     [SPECIES_ZARUDE] = 1,
     [SPECIES_REGIELEKI] = 0,
-    [SPECIES_REGIDRAGO] = 2,
+    [SPECIES_REGIDRAGO] = 0,
     [SPECIES_GLASTRIER] = 0,
     [SPECIES_SPECTRIER] = 0,
     [SPECIES_CALYREX] = 0,