ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1935 from LOuroboros/someGenderDiffs

Browse Source 
Added gender differences for a couple of Gen. 4 Pokémon
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-18 13:46:23 -03:00 committed by GitHub
commit 39ef356be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/bidoof/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 852 B

BIN
graphics/pokemon/bidoof/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

BIN
graphics/pokemon/kricketot/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
graphics/pokemon/kricketot/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 625 B

BIN
graphics/pokemon/kricketune/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/kricketune/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

BIN
graphics/pokemon/shinx/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 986 B

After

Width:  |  Height:  |  Size: 984 B

BIN
graphics/pokemon/shinx/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 981 B

BIN
graphics/pokemon/shinx/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 728 B

After

Width:  |  Height:  |  Size: 729 B

BIN
graphics/pokemon/shinx/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 728 B

BIN
graphics/pokemon/staraptor/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/staravia/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1012 B

BIN
graphics/pokemon/staravia/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 675 B

BIN
graphics/pokemon/starly/anim_frontf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 993 B

BIN
graphics/pokemon/starly/backf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 699 B

13
include/graphics.h
View File

@ -434,13 +434,20 @@ 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_KricketuneF[];
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 +1587,19 @@ 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_KricketuneF[];
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[];

7
src/data.c
View File

@ -305,6 +305,13 @@ 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_KRICKETUNE] = TRUE,
[SPECIES_SHINX] = TRUE,
[SPECIES_COMBEE] = TRUE,
[SPECIES_HIPPOPOTAS] = TRUE,
[SPECIES_HIPPOWDON] = TRUE,

13
src/data/graphics/pokemon.h
View File

@ -397,13 +397,20 @@ 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_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/anim_frontf.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 +1550,19 @@ 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_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/backf.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");

7
src/data/pokemon_graphics/back_pic_table.h
View File

@ -1278,6 +1278,13 @@ 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(KRICKETUNE, gMonBackPic_KricketuneF),
SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF),
SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF),
SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF),

7
src/data/pokemon_graphics/front_pic_table.h
View File

@ -1278,6 +1278,13 @@ 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(KRICKETUNE, gMonFrontPic_KricketuneF),
SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF),
SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF),
SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF),
SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon),

7
src/data/pokemon_graphics/palette_table.h
View File

@ -1279,6 +1279,13 @@ 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(KRICKETUNE, gMonPalette_Kricketune),
SPECIES_PAL(SHINX, gMonPalette_Shinx),
SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF),
SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF),
SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF),

7
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -1278,6 +1278,13 @@ 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(KRICKETUNE, gMonShinyPalette_Kricketune),
SPECIES_SHINY_PAL(SHINX, gMonShinyPalette_Shinx),
SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF),
SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF),

13
src/pokemon_icon.c
View File

@ -1243,6 +1243,13 @@ 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_KRICKETUNE] = gMonIcon_Kricketune,
[SPECIES_SHINX] = gMonIcon_Shinx,
[SPECIES_COMBEE] = gMonIcon_Combee,
[SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas,
[SPECIES_HIPPOWDON] = gMonIcon_Hippowdon,
@ -2431,6 +2438,12 @@ const u8 gMonIconPaletteIndices[] =
const u8 gMonIconPaletteIndicesFemale[] =
{
[SPECIES_EEVEE] = 2,
[SPECIES_STARLY] = 0,
[SPECIES_STARAVIA] = 0,
[SPECIES_BIDOOF] = 2,
[SPECIES_KRICKETOT] = 2,
[SPECIES_KRICKETUNE] = 2,
[SPECIES_SHINX] = 0,
[SPECIES_COMBEE] = 0,
[SPECIES_HIPPOPOTAS] = 1,
[SPECIES_HIPPOWDON] = 1,