diff --git a/graphics/pokemon/bidoof/anim_frontf.png b/graphics/pokemon/bidoof/anim_frontf.png new file mode 100644 index 000000000..9585a6015 Binary files /dev/null and b/graphics/pokemon/bidoof/anim_frontf.png differ diff --git a/graphics/pokemon/bidoof/backf.png b/graphics/pokemon/bidoof/backf.png new file mode 100644 index 000000000..5f6bc7e8b Binary files /dev/null and b/graphics/pokemon/bidoof/backf.png differ diff --git a/graphics/pokemon/kricketot/anim_frontf.png b/graphics/pokemon/kricketot/anim_frontf.png new file mode 100644 index 000000000..86b2f773a Binary files /dev/null and b/graphics/pokemon/kricketot/anim_frontf.png differ diff --git a/graphics/pokemon/kricketot/backf.png b/graphics/pokemon/kricketot/backf.png new file mode 100644 index 000000000..9bafab879 Binary files /dev/null and b/graphics/pokemon/kricketot/backf.png differ diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/shinx/anim_front.png index 33a28bf20..16221a2a2 100644 Binary files a/graphics/pokemon/shinx/anim_front.png and b/graphics/pokemon/shinx/anim_front.png differ diff --git a/graphics/pokemon/shinx/anim_frontf.png b/graphics/pokemon/shinx/anim_frontf.png new file mode 100644 index 000000000..226c6f3bd Binary files /dev/null and b/graphics/pokemon/shinx/anim_frontf.png differ diff --git a/graphics/pokemon/shinx/back.png b/graphics/pokemon/shinx/back.png index 24108fbf3..5d693fca8 100644 Binary files a/graphics/pokemon/shinx/back.png and b/graphics/pokemon/shinx/back.png differ diff --git a/graphics/pokemon/shinx/backf.png b/graphics/pokemon/shinx/backf.png new file mode 100644 index 000000000..24108fbf3 Binary files /dev/null and b/graphics/pokemon/shinx/backf.png differ diff --git a/graphics/pokemon/staraptor/anim_frontf.png b/graphics/pokemon/staraptor/anim_frontf.png new file mode 100644 index 000000000..9bfd99e80 Binary files /dev/null and b/graphics/pokemon/staraptor/anim_frontf.png differ diff --git a/graphics/pokemon/staravia/anim_frontf.png b/graphics/pokemon/staravia/anim_frontf.png new file mode 100644 index 000000000..1d4359a4d Binary files /dev/null and b/graphics/pokemon/staravia/anim_frontf.png differ diff --git a/graphics/pokemon/staravia/backf.png b/graphics/pokemon/staravia/backf.png new file mode 100644 index 000000000..eab9fd834 Binary files /dev/null and b/graphics/pokemon/staravia/backf.png differ diff --git a/graphics/pokemon/starly/anim_frontf.png b/graphics/pokemon/starly/anim_frontf.png new file mode 100644 index 000000000..f604a8387 Binary files /dev/null and b/graphics/pokemon/starly/anim_frontf.png differ diff --git a/graphics/pokemon/starly/backf.png b/graphics/pokemon/starly/backf.png new file mode 100644 index 000000000..c65bf27b0 Binary files /dev/null and b/graphics/pokemon/starly/backf.png differ diff --git a/include/graphics.h b/include/graphics.h index 8d28bef55..67f07a1b1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -434,13 +434,19 @@ extern const u32 gMonFrontPic_Piplup[]; extern const u32 gMonFrontPic_Prinplup[]; extern const u32 gMonFrontPic_Empoleon[]; extern const u32 gMonFrontPic_Starly[]; +extern const u32 gMonFrontPic_StarlyF[]; extern const u32 gMonFrontPic_Staravia[]; +extern const u32 gMonFrontPic_StaraviaF[]; extern const u32 gMonFrontPic_Staraptor[]; +extern const u32 gMonFrontPic_StaraptorF[]; extern const u32 gMonFrontPic_Bidoof[]; +extern const u32 gMonFrontPic_BidoofF[]; extern const u32 gMonFrontPic_Bibarel[]; extern const u32 gMonFrontPic_Kricketot[]; +extern const u32 gMonFrontPic_KricketotF[]; extern const u32 gMonFrontPic_Kricketune[]; extern const u32 gMonFrontPic_Shinx[]; +extern const u32 gMonFrontPic_ShinxF[]; extern const u32 gMonFrontPic_Luxio[]; extern const u32 gMonFrontPic_Luxray[]; extern const u32 gMonFrontPic_Budew[]; @@ -1580,13 +1586,18 @@ extern const u32 gMonBackPic_Piplup[]; extern const u32 gMonBackPic_Prinplup[]; extern const u32 gMonBackPic_Empoleon[]; extern const u32 gMonBackPic_Starly[]; +extern const u32 gMonBackPic_StarlyF[]; extern const u32 gMonBackPic_Staravia[]; +extern const u32 gMonBackPic_StaraviaF[]; extern const u32 gMonBackPic_Staraptor[]; extern const u32 gMonBackPic_Bidoof[]; +extern const u32 gMonBackPic_BidoofF[]; extern const u32 gMonBackPic_Bibarel[]; extern const u32 gMonBackPic_Kricketot[]; +extern const u32 gMonBackPic_KricketotF[]; extern const u32 gMonBackPic_Kricketune[]; extern const u32 gMonBackPic_Shinx[]; +extern const u32 gMonBackPic_ShinxF[]; extern const u32 gMonBackPic_Luxio[]; extern const u32 gMonBackPic_Luxray[]; extern const u32 gMonBackPic_Budew[]; diff --git a/src/data.c b/src/data.c index e551ddcce..586f1e63b 100644 --- a/src/data.c +++ b/src/data.c @@ -305,6 +305,12 @@ const union AnimCmd *const gAnims_MonPic[] = const bool8 SpeciesHasGenderDifference[NUM_SPECIES] = { [SPECIES_EEVEE] = TRUE, + [SPECIES_STARLY] = TRUE, + [SPECIES_STARAVIA] = TRUE, + [SPECIES_STARAPTOR] = TRUE, + [SPECIES_BIDOOF] = TRUE, + [SPECIES_KRICKETOT] = TRUE, + [SPECIES_SHINX] = TRUE, [SPECIES_COMBEE] = TRUE, [SPECIES_HIPPOPOTAS] = TRUE, [SPECIES_HIPPOWDON] = TRUE, diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 7d29936eb..c698e3a78 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -397,13 +397,19 @@ const u32 gMonFrontPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/anim_front const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/anim_front.4bpp.lz"); const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/anim_front.4bpp.lz"); +const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/anim_front.4bpp.lz"); +const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/anim_front.4bpp.lz"); const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/anim_front.4bpp.lz"); const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/anim_front.4bpp.lz"); @@ -1543,13 +1549,18 @@ const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/back.4bpp.l const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/back.4bpp.lz"); const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/back.4bpp.lz"); const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/back.4bpp.lz"); +const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/backf.4bpp.lz"); const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); +const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/back.4bpp.lz"); const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/back.4bpp.lz"); +const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/backf.4bpp.lz"); const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/back.4bpp.lz"); const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/back.4bpp.lz"); +const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/backf.4bpp.lz"); const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/back.4bpp.lz"); const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/back.4bpp.lz"); +const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/back.4bpp.lz"); const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/back.4bpp.lz"); const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/back.4bpp.lz"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 9d108ce83..1e6e2839d 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1278,6 +1278,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), + SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), + SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), + SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor), + SPECIES_SPRITE(BIDOOF, gMonBackPic_BidoofF), + SPECIES_SPRITE(KRICKETOT, gMonBackPic_KricketotF), + SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 788afc744..c925f0a86 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1278,6 +1278,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), + SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), + SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), + SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), + SPECIES_SPRITE(BIDOOF, gMonFrontPic_BidoofF), + SPECIES_SPRITE(KRICKETOT, gMonFrontPic_KricketotF), + SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF), SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index cc8717e90..d07a58487 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1279,6 +1279,12 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), SPECIES_PAL(COMBEE, gMonPalette_Combee), + SPECIES_PAL(STARLY, gMonPalette_Starly), + SPECIES_PAL(STARAVIA, gMonPalette_Staravia), + SPECIES_PAL(STARAPTOR, gMonPalette_Staraptor), + SPECIES_PAL(BIDOOF, gMonPalette_Bidoof), + SPECIES_PAL(KRICKETOT, gMonPalette_Kricketot), + SPECIES_PAL(SHINX, gMonPalette_Shinx), SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index b8324bdd5..341aecbab 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1278,6 +1278,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), + SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly), + SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), + SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor), + SPECIES_SHINY_PAL(BIDOOF, gMonShinyPalette_Bidoof), + SPECIES_SHINY_PAL(KRICKETOT, gMonShinyPalette_Kricketot), + SPECIES_SHINY_PAL(SHINX, gMonShinyPalette_Shinx), SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 2a872a9e4..9cda049ce 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1240,6 +1240,12 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, + [SPECIES_STARLY] = gMonIcon_Starly, + [SPECIES_STARAVIA] = gMonIcon_Staravia, + [SPECIES_STARAPTOR] = gMonIcon_Staraptor, + [SPECIES_BIDOOF] = gMonIcon_Bidoof, + [SPECIES_KRICKETOT] = gMonIcon_Kricketot, + [SPECIES_SHINX] = gMonIcon_Shinx, [SPECIES_COMBEE] = gMonIcon_Combee, [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, @@ -2428,6 +2434,11 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { [SPECIES_EEVEE] = 2, + [SPECIES_STARLY] = 0, + [SPECIES_STARAVIA] = 0, + [SPECIES_BIDOOF] = 2, + [SPECIES_KRICKETOT] = 2, + [SPECIES_SHINX] = 0, [SPECIES_COMBEE] = 0, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1,