diff --git a/graphics/pokemon/hippopotas/icon_m.png b/graphics/pokemon/hippopotas/icon.png similarity index 100% rename from graphics/pokemon/hippopotas/icon_m.png rename to graphics/pokemon/hippopotas/icon.png diff --git a/graphics/pokemon/hippopotas/icon_f.png b/graphics/pokemon/hippopotas/icon_f.png deleted file mode 100644 index cfb2b90fd..000000000 Binary files a/graphics/pokemon/hippopotas/icon_f.png and /dev/null differ diff --git a/graphics/pokemon/hippowdon/icon_m.png b/graphics/pokemon/hippowdon/icon.png similarity index 100% rename from graphics/pokemon/hippowdon/icon_m.png rename to graphics/pokemon/hippowdon/icon.png diff --git a/graphics/pokemon/hippowdon/icon_f.png b/graphics/pokemon/hippowdon/icon_f.png deleted file mode 100644 index 80460903a..000000000 Binary files a/graphics/pokemon/hippowdon/icon_f.png and /dev/null differ diff --git a/include/graphics.h b/include/graphics.h index 95f64b062..4a441f526 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5106,10 +5106,8 @@ extern const u8 gMonIcon_Garchomp[]; extern const u8 gMonIcon_Munchlax[]; extern const u8 gMonIcon_Riolu[]; extern const u8 gMonIcon_Lucario[]; -extern const u8 gMonIcon_Hippopotas_M[]; -extern const u8 gMonIcon_Hippopotas_F[]; -extern const u8 gMonIcon_Hippowdon_M[]; -extern const u8 gMonIcon_Hippowdon_F[]; +extern const u8 gMonIcon_Hippopotas[]; +extern const u8 gMonIcon_Hippowdon[]; extern const u8 gMonIcon_Skorupi[]; extern const u8 gMonIcon_Drapion[]; extern const u8 gMonIcon_Croagunk[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index afd1760d7..a988832a2 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -5069,10 +5069,8 @@ const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/icon.4bpp"); const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp"); const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); -const u8 gMonIcon_Hippopotas_M[] = INCBIN_U8("graphics/pokemon/hippopotas/icon_m.4bpp"); -const u8 gMonIcon_Hippopotas_F[] = INCBIN_U8("graphics/pokemon/hippopotas/icon_f.4bpp"); -const u8 gMonIcon_Hippowdon_M[] = INCBIN_U8("graphics/pokemon/hippowdon/icon_m.4bpp"); -const u8 gMonIcon_Hippowdon_F[] = INCBIN_U8("graphics/pokemon/hippowdon/icon_f.4bpp"); +const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp"); +const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp"); const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 6dfc04f6a..89006562f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -476,8 +476,8 @@ const u8 *const gMonIconTable[] = [SPECIES_MUNCHLAX] = gMonIcon_Munchlax, [SPECIES_RIOLU] = gMonIcon_Riolu, [SPECIES_LUCARIO] = gMonIcon_Lucario, - [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas_M, - [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon_M, + [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, + [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, [SPECIES_SKORUPI] = gMonIcon_Skorupi, [SPECIES_DRAPION] = gMonIcon_Drapion, [SPECIES_CROAGUNK] = gMonIcon_Croagunk, @@ -1241,8 +1241,8 @@ const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, [SPECIES_COMBEE] = gMonIcon_Combee, - [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas_F, - [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon_F, + [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, + [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, [SPECIES_UNFEZANT] = gMonIcon_Unfezant_F, [SPECIES_FRILLISH] = gMonIcon_Frillish_F, [SPECIES_JELLICENT] = gMonIcon_Jellicent_F,