From a7c9e6e2307ab11934d3602a7abc42585b967473 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Thu, 9 Dec 2021 00:24:31 +0700 Subject: [PATCH] Reverse both Hippopotas and Hippowdon icons to use male only --- .../pokemon/hippopotas/{icon_m.png => icon.png} | Bin graphics/pokemon/hippopotas/icon_f.png | Bin 330 -> 0 bytes .../pokemon/hippowdon/{icon_m.png => icon.png} | Bin graphics/pokemon/hippowdon/icon_f.png | Bin 315 -> 0 bytes include/graphics.h | 6 ++---- src/data/graphics/pokemon.h | 6 ++---- src/pokemon_icon.c | 8 ++++---- 7 files changed, 8 insertions(+), 12 deletions(-) rename graphics/pokemon/hippopotas/{icon_m.png => icon.png} (100%) delete mode 100644 graphics/pokemon/hippopotas/icon_f.png rename graphics/pokemon/hippowdon/{icon_m.png => icon.png} (100%) delete mode 100644 graphics/pokemon/hippowdon/icon_f.png 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 cfb2b90fd2e4fa42a0c5aba6afa42db2c9ce7371..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc0002h zNkl; zV3>KE&F`1hc~5Xf%t4+qa5eQdih($N+splFeN`CZ`zXv~nM#Cl-%f;a&x*nXKcX;lB~0|g3zPWagh~8ZgvtDv ch56{m6Dm;DnQd5T2mk;807*qoM6N<$f(v<%JOBUy 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 80460903abe5cb1f7bf75e897d2aaeaae471b192..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc0002S zNklJCBPO-byeO1pJyEO~k6&f;`L|9z(A19+hz ziZ})y2rL1OHxLvF<{_P!!Ly-p>7WTP&m1b&2LSlJIg55p({u_x8ab4 z5gu4wV}0hlNp`>rS&?B#EJQtprlp&%ph25&6XYpjgCcbMmZnHQOW{&)W0_psIrY;K z08tf`b7;?M=hWgW$E%(z7REmcv-hJHMzrkx*b3vE`lBDYcoqG*A1``E*wSZ)6Tkof N002ovPDHLkV1lhKifsS@ diff --git a/include/graphics.h b/include/graphics.h index 95f64b062f..4a441f5268 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 afd1760d79..a988832a20 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 6dfc04f6ad..89006562f4 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,