From 4d4b111327f2d5d404bb0a44bd0f071a45855233 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Fri, 6 Nov 2020 16:21:45 -0300 Subject: [PATCH] Front pic gender differences for Eevee --- graphics/pokemon/eevee/anim_frontf.png | Bin 0 -> 945 bytes include/data.h | 2 ++ include/graphics.h | 1 + src/data.c | 5 +++++ src/data/graphics/pokemon.h | 1 + src/data/pokemon_graphics/front_pic_table.h | 5 +++++ src/decompress.c | 2 ++ 7 files changed, 16 insertions(+) create mode 100644 graphics/pokemon/eevee/anim_frontf.png diff --git a/graphics/pokemon/eevee/anim_frontf.png b/graphics/pokemon/eevee/anim_frontf.png new file mode 100644 index 0000000000000000000000000000000000000000..e923202b400a88f86bd877a15894bcdf928209b5 GIT binary patch literal 945 zcmV;i15W&jP)$I>7c!j%rL~rr;b;XDeuWA_X@GD`ED9+z1wb->{7C|GA+uE)RSAE5Hg@f9kwS|+ zjh;9FxA*Rzp-kjN@>84h@jd4*aGy&d(+0qBfaCfuhrF=ni3T1vrW8WJJtz_crhTBS zAGX`Nw51UO2;r<5m@R|>pb!`i5OzS-08R(SE+JnVWAhmD5dpBPZ4C|1IRHuGbb$B_ zPq|pb0)>bak%uYlI>|=>OvyZBOY@{T0E()Qq1Bz{aGQMjkn`n2YT_|<1^DPl%5!po z7SK>2Rh|JE{%SAs)br}tjp1G35Qq3ri`fYVE<{O6Cm47fkQUPk2DnFKF%HlP zhCN}yqaifsOD7l=Yb>S@9DnZwqY`K_rRnu}u$^F71b&Qf`@qI*;8ZtwJ_|m+<^AKc z5e(D=XdxO&=>e@^)TKeeNC=4ue+Q6o3<3pX3j$HajiR^?5^f+5GvqJ8tPilOO>GSr z2ndFVC`V}x1O)>WW$G4a3`FPP4~3YLM|8L}75YP@JSVv3YK{Kj^@D>y{PXb(dr|ED Tvv~?@00000NkvXXu0mjf6?}*z literal 0 HcmV?d00001 diff --git a/include/data.h b/include/data.h index 3d2169200c..544bbfd1de 100644 --- a/include/data.h +++ b/include/data.h @@ -108,6 +108,8 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES]; extern const union AnimCmd *const *const gMonFrontAnimsPtrTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonFrontPicTableFemale[]; +extern const bool8 SpeciesHasGenderDifference[NUM_SPECIES]; extern const struct Trainer gTrainers[]; extern const u8 gTrainerClassNames[][13]; diff --git a/include/graphics.h b/include/graphics.h index ce4a502634..856c06ef1e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -169,6 +169,7 @@ extern const u32 gMonFrontPic_Gyarados[]; extern const u32 gMonFrontPic_Lapras[]; extern const u32 gMonFrontPic_Ditto[]; extern const u32 gMonFrontPic_Eevee[]; +extern const u32 gMonFrontPic_EeveeF[]; extern const u32 gMonFrontPic_Vaporeon[]; extern const u32 gMonFrontPic_Jolteon[]; extern const u32 gMonFrontPic_Flareon[]; diff --git a/src/data.c b/src/data.c index 3d36bd0b89..89866cc13a 100644 --- a/src/data.c +++ b/src/data.c @@ -300,6 +300,11 @@ const union AnimCmd *const gUnknown_082FF70C[] = #define TRAINER_BACK_PAL(trainerPic, pal) [TRAINER_BACK_PIC_##trainerPic] = {pal, TRAINER_BACK_PIC_##trainerPic} +const bool8 SpeciesHasGenderDifference[NUM_SPECIES] = +{ + [SPECIES_EEVEE] = TRUE, +}; + #include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/back_pic_coordinates.h" diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index be20ff6ab8..ce501b3db1 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -132,6 +132,7 @@ const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_f const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz"); const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index a3466ebe94..580db22964 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -943,3 +943,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(UNOWN_EMARK, gMonFrontPic_UnownExclamationMark), SPECIES_SPRITE(UNOWN_QMARK, gMonFrontPic_UnownQuestionMark), }; + +const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = +{ + SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), +}; \ No newline at end of file diff --git a/src/decompress.c b/src/decompress.c index a4cd2f66b7..c40d32d4fa 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -363,6 +363,8 @@ void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src } else if (species > NUM_SPECIES) // is species unknown? draw the ? icon LZ77UnCompWram(gMonFrontPicTable[0].data, dest); + else if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) + LZ77UnCompWram(gMonFrontPicTableFemale[species].data, dest); else LZ77UnCompWram(src->data, dest);