From 051ec7951d5de785102902082272ac29debded75 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Wed, 5 Jan 2022 22:26:14 -0300
Subject: [PATCH] Gen V and VI

---
 .../pokemon_graphics/enemy_mon_elevation.h    | 49 ++++++++++++++++++-
 .../pokemon_graphics/front_pic_coordinates.h  |  6 +--
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index fcc2e2bc44..6971482d6b 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -80,6 +80,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_CRESSELIA] = 3,
     [SPECIES_DARKRAI] = 4,
     // Gen 5
+    [SPECIES_MUNNA] = 7,
+    [SPECIES_MUSHARNA] = 5,
     [SPECIES_WOOBAT] = 19,
     [SPECIES_SWOOBAT] = 12,
     [SPECIES_PETILIL] = 7,
@@ -88,21 +90,35 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_ARCHEOPS] = 8,
     [SPECIES_SOLOSIS] = 14,
     [SPECIES_DUOSION] = 7,
-    [SPECIES_REUNICLUS] = 3,
+    [SPECIES_REUNICLUS] = 8,
     [SPECIES_EMOLGA] = 19,
     [SPECIES_TYNAMO] = 16,
     [SPECIES_EELEKTRIK] = 8,
     [SPECIES_EELEKTROSS] = 8,
+    [SPECIES_CRYOGONAL] = 3,
     [SPECIES_BRAVIARY] = 8,
     [SPECIES_HYDREIGON] = 3,
+    [SPECIES_VOLCARONA] = 6,
     [SPECIES_TORNADUS] = 7,
     [SPECIES_THUNDURUS] = 7,
     [SPECIES_LANDORUS] = 7,
+    [SPECIES_MELOETTA] = 8,
     // Gen 6
     [SPECIES_FLETCHINDER] = 9,
     [SPECIES_TALONFLAME] = 7,
     [SPECIES_VIVILLON] = 9,
+    [SPECIES_FLABEBE] = 6,
+    [SPECIES_FLOETTE] = 4,
+    [SPECIES_HONEDGE] = 4,
+    [SPECIES_DOUBLADE] = 5,
+    [SPECIES_AEGISLASH] = 3,
+    [SPECIES_SPRITZEE] = 14,
+    [SPECIES_INKAY] = 14,
+    [SPECIES_CARBINK] = 4,
+    [SPECIES_KLEFKI] = 5,
+    [SPECIES_PHANTUMP] = 5,
     [SPECIES_NOIBAT] = 8,
+    [SPECIES_YVELTAL] = 5,
     [SPECIES_HOOPA] = 13,
     // Gen 7
     [SPECIES_VIKAVOLT] = 8,
@@ -157,8 +173,37 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_UNOWN_Z] = 8,
     [SPECIES_UNOWN_QMARK] = 8,
     [SPECIES_UNOWN_EMARK] = 8,
-    // Misc Forms
+    // Forms
     [SPECIES_GIRATINA_ORIGIN] = 7,
     [SPECIES_THUNDURUS_THERIAN] = 7,
+    [SPECIES_VIVILLON_POLAR] = 9,
+    [SPECIES_VIVILLON_TUNDRA] = 9,
+    [SPECIES_VIVILLON_CONTINENTAL] = 9,
+    [SPECIES_VIVILLON_GARDEN] = 9,
+    [SPECIES_VIVILLON_ELEGANT] = 9,
+    [SPECIES_VIVILLON_MEADOW] = 9,
+    [SPECIES_VIVILLON_MODERN] = 9,
+    [SPECIES_VIVILLON_MARINE] = 9,
+    [SPECIES_VIVILLON_ARCHIPELAGO] = 9,
+    [SPECIES_VIVILLON_HIGH_PLAINS] = 9,
+    [SPECIES_VIVILLON_SANDSTORM] = 9,
+    [SPECIES_VIVILLON_RIVER] = 9,
+    [SPECIES_VIVILLON_MONSOON] = 9,
+    [SPECIES_VIVILLON_SAVANNA] = 9,
+    [SPECIES_VIVILLON_SUN] = 9,
+    [SPECIES_VIVILLON_OCEAN] = 9,
+    [SPECIES_VIVILLON_JUNGLE] = 9,
+    [SPECIES_VIVILLON_FANCY] = 9,
+    [SPECIES_VIVILLON_POKE_BALL] = 9,
+    [SPECIES_FLABEBE_YELLOW_FLOWER] = 6,
+    [SPECIES_FLABEBE_ORANGE_FLOWER] = 6,
+    [SPECIES_FLABEBE_BLUE_FLOWER] = 6,
+    [SPECIES_FLABEBE_WHITE_FLOWER] = 6,
+    [SPECIES_FLOETTE_YELLOW_FLOWER] = 4,
+    [SPECIES_FLOETTE_ORANGE_FLOWER] = 4,
+    [SPECIES_FLOETTE_BLUE_FLOWER] = 4,
+    [SPECIES_FLOETTE_WHITE_FLOWER] = 4,
+    [SPECIES_FLOETTE_ETERNAL_FLOWER] = 4,
+    [SPECIES_AEGISLASH_BLADE] = 3,
     [SPECIES_ETERNATUS_ETERNAMAX] = 4,
 };
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 22aa6f71aa..f0ea8d81a3 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -2452,12 +2452,12 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_PHIONE] =
     {
         .size = MON_COORDS_SIZE(56, 40),
-        .y_offset = 12,
+        .y_offset = 8,
     },
     [SPECIES_MANAPHY] =
     {
         .size = MON_COORDS_SIZE(64, 40),
-        .y_offset = 13,
+        .y_offset = 10,
     },
     [SPECIES_DARKRAI] =
     {
@@ -2592,7 +2592,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_MUNNA] =
     {
         .size = MON_COORDS_SIZE(32, 32),
-        .y_offset = 16,
+        .y_offset = 14,
     },
     [SPECIES_MUSHARNA] =
     {