diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index 46f1414613..fcc2e2bc44 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -14,7 +14,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_MAGNETON] = 9,
     [SPECIES_GASTLY] = 10,
     [SPECIES_HAUNTER] = 11,
-    [SPECIES_ELECTRODE] = 12,
     [SPECIES_KOFFING] = 14,
     [SPECIES_WEEZING] = 6,
     [SPECIES_AERODACTYL] = 9,
@@ -30,6 +29,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_MISDREAVUS] = 12,
     [SPECIES_UNOWN] = 8,
     [SPECIES_GLIGAR] = 8,
+    [SPECIES_MANTINE] = 6,
+    [SPECIES_PORYGON2] = 9,
     [SPECIES_LUGIA] = 6,
     [SPECIES_HO_OH] = 6,
     [SPECIES_CELEBI] = 15,
@@ -40,13 +41,12 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_WINGULL] = 15,
     [SPECIES_PELIPPER] = 8,
     [SPECIES_MASQUERAIN] = 10,
-    [SPECIES_BALTOY] = 1,
+    [SPECIES_BALTOY] = 5,
     [SPECIES_CLAYDOL] = 10,
     [SPECIES_FLYGON] = 7,
     [SPECIES_GLALIE] = 12,
     [SPECIES_LUNATONE] = 13,
     [SPECIES_SOLROCK] = 4,
-    [SPECIES_SWABLU] = 12,
     [SPECIES_ALTARIA] = 8,
     [SPECIES_DUSKULL] = 13,
     [SPECIES_SHUPPET] = 14,
@@ -65,11 +65,14 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     [SPECIES_DRIFLOON] = 5,
     [SPECIES_DRIFBLIM] = 7,
     [SPECIES_MISMAGIUS] = 3,
+    [SPECIES_CHINGLING] = 5,
     [SPECIES_BRONZONG] = 4,
     [SPECIES_MAGNEZONE] = 4,
     [SPECIES_TOGEKISS] = 14,
     [SPECIES_YANMEGA] = 6,
-    [SPECIES_GLISCOR] = 6,
+    [SPECIES_GLISCOR] = 9,
+    [SPECIES_PORYGON_Z] = 12,
+    [SPECIES_PROBOPASS] = 6,
     [SPECIES_ROTOM] = 10,
     [SPECIES_UXIE] = 6,
     [SPECIES_MESPRIT] = 6,
@@ -127,6 +130,33 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
     // Galarian Forms
     [SPECIES_WEEZING_GALARIAN] = 3,
     [SPECIES_YAMASK_GALARIAN] = 4,
+    [SPECIES_UNOWN_B] = 8,
+    [SPECIES_UNOWN_C] = 8,
+    [SPECIES_UNOWN_D] = 8,
+    [SPECIES_UNOWN_E] = 8,
+    [SPECIES_UNOWN_F] = 8,
+    [SPECIES_UNOWN_G] = 8,
+    [SPECIES_UNOWN_H] = 8,
+    [SPECIES_UNOWN_I] = 8,
+    [SPECIES_UNOWN_J] = 8,
+    [SPECIES_UNOWN_K] = 8,
+    [SPECIES_UNOWN_L] = 8,
+    [SPECIES_UNOWN_M] = 8,
+    [SPECIES_UNOWN_N] = 8,
+    [SPECIES_UNOWN_O] = 8,
+    [SPECIES_UNOWN_P] = 8,
+    [SPECIES_UNOWN_Q] = 8,
+    [SPECIES_UNOWN_R] = 8,
+    [SPECIES_UNOWN_S] = 8,
+    [SPECIES_UNOWN_T] = 8,
+    [SPECIES_UNOWN_U] = 8,
+    [SPECIES_UNOWN_V] = 8,
+    [SPECIES_UNOWN_W] = 8,
+    [SPECIES_UNOWN_X] = 8,
+    [SPECIES_UNOWN_Y] = 8,
+    [SPECIES_UNOWN_Z] = 8,
+    [SPECIES_UNOWN_QMARK] = 8,
+    [SPECIES_UNOWN_EMARK] = 8,
     // Misc Forms
     [SPECIES_GIRATINA_ORIGIN] = 7,
     [SPECIES_THUNDURUS_THERIAN] = 7,
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index e4dff6784f..22aa6f71aa 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -512,7 +512,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_ELECTRODE] =
     {
         .size = MON_COORDS_SIZE(48, 48),
-        .y_offset = 11,
+        .y_offset = 8,
     },
     [SPECIES_EXEGGCUTE] =
     {
@@ -1137,7 +1137,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_MANTINE] =
     {
         .size = MON_COORDS_SIZE(64, 56),
-        .y_offset = 10,
+        .y_offset = 9,
     },
     [SPECIES_SKARMORY] =
     {
@@ -1242,7 +1242,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_PUPITAR] =
     {
         .size = MON_COORDS_SIZE(40, 48),
-        .y_offset = 11,
+        .y_offset = 9,
     },
     [SPECIES_TYRANITAR] =
     {
@@ -1472,7 +1472,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_BALTOY] =
     {
         .size = MON_COORDS_SIZE(40, 40),
-        .y_offset = 14,
+        .y_offset = 11,
     },
     [SPECIES_CLAYDOL] =
     {
@@ -1497,7 +1497,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_BARBOACH] =
     {
         .size = MON_COORDS_SIZE(48, 40),
-        .y_offset = 15,
+        .y_offset = 11,
     },
     [SPECIES_WHISCASH] =
     {
@@ -1507,7 +1507,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_LUVDISC] =
     {
         .size = MON_COORDS_SIZE(32, 40),
-        .y_offset = 14,
+        .y_offset = 11,
     },
     [SPECIES_CORPHISH] =
     {
@@ -1672,7 +1672,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_SWABLU] =
     {
         .size = MON_COORDS_SIZE(48, 40),
-        .y_offset = 14,
+        .y_offset = 12,
     },
     [SPECIES_ALTARIA] =
     {
@@ -2172,7 +2172,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_CHINGLING] =
     {
         .size = MON_COORDS_SIZE(40, 40),
-        .y_offset = 15,
+        .y_offset = 12,
     },
     [SPECIES_STUNKY] =
     {
@@ -2392,7 +2392,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_DUSKNOIR] =
     {
         .size = MON_COORDS_SIZE(64, 64),
-        .y_offset = 4,
+        .y_offset = 2,
     },
     [SPECIES_FROSLASS] =
     {