Merge pull request #1513 from Blackforest92/pokemon_expansion

Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
rh-hideout · Jul 15, 2021 · 96b0700 · 96b0700
2 parents efdc513 + d126116
commit 96b0700
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 2 deletions.
diff --git a/graphics/pokemon/minior/icon.png b/graphics/pokemon/minior/icon.png
diff --git a/graphics/pokemon/popplio/back.png b/graphics/pokemon/popplio/back.png
diff --git a/graphics/pokemon/popplio/front.png b/graphics/pokemon/popplio/front.png
diff --git a/graphics/pokemon/popplio/normal.pal b/graphics/pokemon/popplio/normal.pal
@@ -7,7 +7,7 @@ JASC-PAL
 112 152 216
 136 48 112
 232 112 192
-248 200 232
+152 208 224
 184 80 144
 56 72 144
 16 16 16

diff --git a/graphics/pokemon/shroomish/back.png b/graphics/pokemon/shroomish/back.png
diff --git a/graphics/pokemon/xerneas/active/back.png b/graphics/pokemon/xerneas/active/back.png
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
@@ -2017,7 +2017,7 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_PYUKUMUKU] = 0,
     [SPECIES_TYPE_NULL] = 0,
     [SPECIES_SILVALLY] = 0,
-    [SPECIES_MINIOR] = 0,
+    [SPECIES_MINIOR] = 2,
     [SPECIES_KOMALA] = 2,
     [SPECIES_TURTONATOR] = 0,
     [SPECIES_TOGEDEMARU] = 2,
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ JASC-PAL @@
 152 216
 48 112
 112 192
-200 232
+208 224
 80 144
 72 144
 16 16
@@ Expand Down @@