From 787b9a040243852c46b1d4419af299ba2d2925c5 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 8 Jan 2022 18:24:21 -0300
Subject: [PATCH] Gen VIII and missing forms

---
 .../pokemon_graphics/enemy_mon_elevation.h    | 61 +++++++++++++------
 .../pokemon_graphics/front_pic_coordinates.h  |  4 +-
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index 7204ab40d4..59da792ab1 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -140,27 +140,44 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_POIPOLE] = 9,
     [SPECIES_NAGANADEL] = 7,
     // Gen 8
-    [SPECIES_CORVISQUIRE] = 6,
+    [SPECIES_CORVISQUIRE] = 10,
+    [SPECIES_ORBEETLE] = 8,
+    [SPECIES_FLAPPLE] = 9,
+    [SPECIES_SINISTEA] = 9,
+    [SPECIES_POLTEAGEIST] = 11,
+    [SPECIES_RUNERIGUS] = 5,
+    [SPECIES_MILCERY] = 10,
+    [SPECIES_FROSMOTH] = 7,
+    [SPECIES_DREEPY] = 5,
+    [SPECIES_DRAKLOAK] = 5,
     [SPECIES_DRAGAPULT] = 3,
-    [SPECIES_FROSMOTH] = 3,
+    [SPECIES_ETERNATUS] = 4,
+    [SPECIES_REGIELEKI] = 8,
+    [SPECIES_REGIDRAGO] = 5,
     // Megas
+    [SPECIES_BEEDRILL_MEGA] = 5,
+    [SPECIES_PIDGEOT_MEGA] = 8,
+    [SPECIES_ALAKAZAM_MEGA] = 7,
+    [SPECIES_PINSIR_MEGA] = 4,
+    [SPECIES_GYARADOS_MEGA] = 6,
+    [SPECIES_AERODACTYL_MEGA] = 7,
+    [SPECIES_MEWTWO_MEGA_Y] = 3,
+    [SPECIES_SHARPEDO_MEGA] = 1,
+    [SPECIES_ALTARIA_MEGA] = 6,
+    [SPECIES_BANETTE_MEGA] = 5,
+    [SPECIES_GLALIE_MEGA] = 8,
+    [SPECIES_METAGROSS_MEGA] = 4,
     [SPECIES_LATIAS_MEGA] = 8,
     [SPECIES_LATIOS_MEGA] = 8,
-    [SPECIES_METAGROSS_MEGA] = 4,
-    [SPECIES_GLALIE_MEGA] = 8,
-    [SPECIES_ALTARIA_MEGA] = 6,
-    [SPECIES_SHARPEDO_MEGA] = 1,
-    [SPECIES_PIDGEOT_MEGA] = 8,
-    [SPECIES_BEEDRILL_MEGA] = 5,
-    [SPECIES_BANETTE_MEGA] = 5,
-    [SPECIES_MEWTWO_MEGA_Y] = 3,
-    [SPECIES_AERODACTYL_MEGA] = 3,
-    [SPECIES_GYARADOS_MEGA] = 6,
-    [SPECIES_PINSIR_MEGA] = 4,
-    [SPECIES_ALAKAZAM_MEGA] = 7,
+    [SPECIES_RAYQUAZA_MEGA] = 4,
+    // Alolan Forms
+    [SPECIES_RAICHU_ALOLAN] = 4,
+    [SPECIES_GEODUDE_ALOLAN] = 16,
     // Galarian Forms
-    [SPECIES_WEEZING_GALARIAN] = 3,
+    [SPECIES_WEEZING_GALARIAN] = 6,
+    [SPECIES_ARTICUNO_GALARIAN] = 10,
     [SPECIES_YAMASK_GALARIAN] = 4,
+    // Other Forms
     [SPECIES_UNOWN_B] = 8,
     [SPECIES_UNOWN_C] = 8,
     [SPECIES_UNOWN_D] = 8,
@@ -188,9 +205,17 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_UNOWN_Z] = 8,
     [SPECIES_UNOWN_QMARK] = 8,
     [SPECIES_UNOWN_EMARK] = 8,
-    // Forms
+    [SPECIES_CASTFORM_SUNNY] = 5,
+    [SPECIES_CASTFORM_RAINY] = 5,
+    [SPECIES_CASTFORM_SNOWY] = 5,
+    [SPECIES_ROTOM_HEAT] = 6,
+    [SPECIES_ROTOM_WASH] = 6,
+    [SPECIES_ROTOM_FROST] = 6,
+    [SPECIES_ROTOM_FAN] = 6,
+    [SPECIES_ROTOM_MOW] = 6,
     [SPECIES_GIRATINA_ORIGIN] = 7,
     [SPECIES_THUNDURUS_THERIAN] = 7,
+    [SPECIES_MELOETTA_PIROUETTE] = 5,
     [SPECIES_VIVILLON_POLAR] = 9,
     [SPECIES_VIVILLON_TUNDRA] = 9,
     [SPECIES_VIVILLON_CONTINENTAL] = 9,
@@ -235,5 +260,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_MINIOR_CORE_VIOLET] = 17,
     [SPECIES_NECROZMA_DAWN_WINGS] = 6,
     [SPECIES_NECROZMA_ULTRA] = 5,
-    [SPECIES_ETERNATUS_ETERNAMAX] = 4,
+    [SPECIES_SINISTEA_ANTIQUE] = 10,
+    [SPECIES_POLTEAGEIST_ANTIQUE] = 12,
+    [SPECIES_ETERNATUS_ETERNAMAX] = 13,
 };
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 09c37cec6a..02a0e06135 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -4237,7 +4237,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_ARROKUDA] =
     {
         .size = MON_COORDS_SIZE(56, 32),
-        .y_offset = 17,
+        .y_offset = 13,
     },
     [SPECIES_BARRASKEWDA] =
     {
@@ -5249,7 +5249,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_ROTOM_MOW] =
     {
         .size = MON_COORDS_SIZE(56, 64),
-        .y_offset = 3,
+        .y_offset = 12,
     },
     // Giratina
     [SPECIES_GIRATINA_ORIGIN] =