atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ported female differences

Browse source
This commit is contained in:
Eduardo Quezada 2022-11-28 21:45:49 -03:00
parent a993c6c793
commit 755df9b1cf
9 changed files with 57 additions and 1463 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/data.c
View file

@ -302,18 +302,11 @@ const union AnimCmd *const gAnims_MonPic[] =
#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
#include "data/pokemon_graphics/back_pic_table.h"
#include "data/pokemon_graphics/palette_table.h"
#include "data/pokemon_graphics/shiny_palette_table.h"
#include "data/trainer_graphics/front_pic_anims.h"
#include "data/trainer_graphics/front_pic_tables.h"
#include "data/trainer_graphics/back_pic_anims.h"
#include "data/trainer_graphics/back_pic_tables.h"
//#include "data/pokemon_graphics/front_pic_anims.h"
#include "data/pokemon_graphics/front_pic_table.h"
#include "data/trainer_parties.h"
#include "data/text/trainer_class_names.h"
#include "data/trainers.h"

53
src/data/pokemon/base_stats.h
View file

@ -28,19 +28,33 @@
.frontPicSize = MON_COORDS_SIZE(width,height), \
.frontPicYOffset = y_offset
#define FRONT_SPRITE_FEMALE(name) \
.frontPicFemale = gMonFrontPic_##name
#define BACK_SPRITE(name, width, height, y_offset)\
.backPic = gMonBackPic_##name, \
.backPicSize = MON_COORDS_SIZE(width,height), \
.backPicYOffset = y_offset
#define BACK_SPRITE_FEMALE(name) \
.backPicFemale = gMonBackPic_##name
#define PALETTES(name) \
.palette = gMonPalette_##name, \
.shinyPalette = gMonShinyPalette_##name
#define PALETTES_FEMALE(name) \
.paletteFemale = gMonPalette_##name, \
.shinyPaletteFemale = gMonShinyPalette_##name
#define ICON(name, palId) \
.iconSprite = gMonIcon_##name, \
.iconPalIndex = palId
#define ICON_FEMALE(name, palId) \
.iconSpriteFemale = gMonIcon_##name,\
.iconPalIndexFemale = palId
#define FOOTPRINT(name) \
.footprint = gMonFootprint_##name
@ -6054,7 +6068,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(3, 65),
LEARNSETS(Eevee),
FRONT_SPRITE(Eevee, 40, 48, 11),
FRONT_SPRITE_FEMALE(EeveeF),
BACK_SPRITE(Eevee, 56, 48, 10),
BACK_SPRITE_FEMALE(EeveeF),
PALETTES(Eevee),
ICON(Eevee, 2),
FOOTPRINT(Eevee),
@ -16996,7 +17012,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(3, 20),
LEARNSETS(Starly),
FRONT_SPRITE(Starly, 40, 40, 12),
FRONT_SPRITE_FEMALE(StarlyF),
BACK_SPRITE(Starly, 56, 48, 11),
BACK_SPRITE_FEMALE(StarlyF),
PALETTES(Starly),
ICON(Starly, 0),
FOOTPRINT(Starly),
@ -17031,7 +17049,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(6, 155),
LEARNSETS(Staravia),
FRONT_SPRITE(Staravia, 40, 48, 8),
FRONT_SPRITE_FEMALE(StaraviaF),
BACK_SPRITE(Staravia, 64, 64, 6),
BACK_SPRITE_FEMALE(StaraviaF),
PALETTES(Staravia),
ICON(Staravia, 0),
FOOTPRINT(Staravia),
@ -17070,6 +17090,7 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(12, 249),
LEARNSETS(Staraptor),
FRONT_SPRITE(Staraptor, 56, 64, 3),
FRONT_SPRITE_FEMALE(StaraptorF),
BACK_SPRITE(Staraptor, 64, 64, 3),
PALETTES(Staraptor),
ICON(Staraptor, 0),
@ -17105,7 +17126,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(5, 200),
LEARNSETS(Bidoof),
FRONT_SPRITE(Bidoof, 40, 40, 12),
FRONT_SPRITE_FEMALE(BidoofF),
BACK_SPRITE(Bidoof, 64, 40, 13),
BACK_SPRITE_FEMALE(BidoofF),
PALETTES(Bidoof),
ICON(Bidoof, 2),
FOOTPRINT(Bidoof),
@ -17176,7 +17199,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(3, 22),
LEARNSETS(Kricketot),
FRONT_SPRITE(Kricketot, 48, 48, 11),
FRONT_SPRITE_FEMALE(KricketotF),
BACK_SPRITE(Kricketot, 48, 56, 6),
BACK_SPRITE_FEMALE(KricketotF),
PALETTES(Kricketot),
ICON(Kricketot, 2),
FOOTPRINT(Kricketot),
@ -17212,7 +17237,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(10, 255),
LEARNSETS(Kricketune),
FRONT_SPRITE(Kricketune, 56, 56, 7),
FRONT_SPRITE_FEMALE(KricketuneF),
BACK_SPRITE(Kricketune, 56, 64, 3),
BACK_SPRITE_FEMALE(KricketuneF),
PALETTES(Kricketune),
ICON(Kricketune, 2),
FOOTPRINT(Kricketune),
@ -17247,7 +17274,9 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(5, 95),
LEARNSETS(Shinx),
FRONT_SPRITE(Shinx, 48, 40, 13),
FRONT_SPRITE_FEMALE(ShinxF),
BACK_SPRITE(Shinx, 64, 48, 8),
BACK_SPRITE_FEMALE(ShinxF),
PALETTES(Shinx),
ICON(Shinx, 0),
FOOTPRINT(Shinx),
@ -17747,6 +17776,7 @@ const struct BaseStats gBaseStats[] =
.enemyMonElevation = 8,
BACK_SPRITE(Combee, 64, 48, 22),
PALETTES(Combee),
PALETTES_FEMALE(CombeeF),
ICON(Combee, 0),
FOOTPRINT(Combee),
ANIMATIONS(COMBEE, 0, ANIM_V_SLIDE_WOBBLE, BACK_ANIM_NONE),
@ -19072,7 +19102,11 @@ const struct BaseStats gBaseStats[] =
FRONT_SPRITE(Hippopotas, 64, 40, 12),
BACK_SPRITE(Hippopotas, 64, 40, 14),
PALETTES(Hippopotas),
PALETTES_FEMALE(HippopotasF),
ICON(Hippopotas, 1),
#if P_HIPPO_GENDER_DIFF_ICONS == TRUE
ICON_FEMALE(HippopotasF, 1),
#endif
FOOTPRINT(Hippopotas),
ANIMATIONS(HIPPOPOTAS, 0, ANIM_V_STRETCH, BACK_ANIM_NONE),
},
@ -19107,7 +19141,11 @@ const struct BaseStats gBaseStats[] =
FRONT_SPRITE(Hippowdon, 64, 56, 6),
BACK_SPRITE(Hippowdon, 64, 56, 6),
PALETTES(Hippowdon),
PALETTES_FEMALE(HippowdonF),
ICON(Hippowdon, 1),
#if P_HIPPO_GENDER_DIFF_ICONS == TRUE
ICON_FEMALE(HippowdonF, 1),
#endif
FOOTPRINT(Hippowdon),
ANIMATIONS(HIPPOWDON, 0, ANIM_V_SHAKE_TWICE, BACK_ANIM_NONE),
},
@ -22016,9 +22054,13 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(12, 290),
LEARNSETS(Unfezant),
FRONT_SPRITE(Unfezant, 56, 64, 0),
FRONT_SPRITE_FEMALE(UnfezantF),
BACK_SPRITE(Unfezant, 64, 64, 1),
BACK_SPRITE_FEMALE(UnfezantF),
PALETTES(Unfezant),
PALETTES_FEMALE(UnfezantF),
ICON(Unfezant, 1),
ICON_FEMALE(UnfezantF, 1),
FOOTPRINT(Unfezant),
ANIMATIONS(UNFEZANT, 0, ANIM_SHRINK_GROW, BACK_ANIM_NONE),
},
@ -24894,9 +24936,13 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(12, 330),
LEARNSETS(Frillish),
FRONT_SPRITE(Frillish, 56, 56, 5),
FRONT_SPRITE_FEMALE(FrillishF),
BACK_SPRITE(Frillish, 40, 56, 7),
BACK_SPRITE_FEMALE(FrillishF),
PALETTES(Frillish),
PALETTES_FEMALE(FrillishF),
ICON(Frillish, 0),
ICON_FEMALE(FrillishF, 1),
FOOTPRINT(Frillish),
ANIMATIONS(FRILLISH, 0, ANIM_RISING_WOBBLE, BACK_ANIM_NONE),
},
@ -24929,9 +24975,13 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(22, 1350),
LEARNSETS(Jellicent),
FRONT_SPRITE(Jellicent, 64, 64, 4),
FRONT_SPRITE_FEMALE(JellicentF),
BACK_SPRITE(Jellicent, 64, 48, 10),
BACK_SPRITE_FEMALE(JellicentF),
PALETTES(Jellicent),
PALETTES_FEMALE(JellicentF),
ICON(Jellicent, 0),
ICON_FEMALE(JellicentF, 1),
FOOTPRINT(Jellicent),
ANIMATIONS(JELLICENT, 0, ANIM_V_SQUISH_AND_BOUNCE, BACK_ANIM_NONE),
},
@ -27934,9 +27984,12 @@ const struct BaseStats gBaseStats[] =
HEIGHT_WEIGHT(15, 815),
LEARNSETS(Pyroar),
FRONT_SPRITE(Pyroar, 64, 64, 0),
FRONT_SPRITE_FEMALE(PyroarF),
BACK_SPRITE(Pyroar, 64, 64, 3),
BACK_SPRITE_FEMALE(PyroarF),
PALETTES(Pyroar),
ICON(Pyroar, 2),
ICON_FEMALE(PyroarF, 2),
FOOTPRINT(Pyroar),
ANIMATIONS(PYROAR, 0, ANIM_V_SHAKE, BACK_ANIM_NONE),
},

0
src/data/pokemon_graphics/back_pic_coordinates.h
View file

28
src/data/pokemon_graphics/back_pic_table.h
View file

@ -1,28 +0,0 @@
const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
{
SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF),
#if P_GEN_4_POKEMON == TRUE
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_Hippopotas),
SPECIES_SPRITE(HIPPOWDON, gMonBackPic_Hippowdon),
#endif
#if P_GEN_5_POKEMON == TRUE
SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF),
SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
#endif
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonBackPic_QuestionMark), //gMonBackPic_BasculegionF),
#endif
};

32
src/data/pokemon_graphics/front_pic_table.h
View file

@ -1,32 +0,0 @@
const struct CompressedSpriteSheet gMonFrontPicTable[] =
{
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
{
SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF),
#if P_GEN_4_POKEMON == TRUE
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_Combee),
SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_Hippopotas),
SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon),
#endif
#if P_GEN_5_POKEMON == TRUE
SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF),
SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF),
#endif
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_QuestionMark), //gMonFrontPic_BasculegionF),
#endif
};

27
src/data/pokemon_graphics/palette_table.h
View file

@ -1,27 +0,0 @@
const struct CompressedSpritePalette gMonPaletteTableFemale[] =
{
SPECIES_PAL(EEVEE, gMonPalette_Eevee),
#if P_GEN_4_POKEMON == TRUE
SPECIES_PAL(COMBEE, gMonPalette_CombeeF),
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),
#endif
#if P_GEN_5_POKEMON == TRUE
SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF),
SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
#endif
#if P_GEN_6_POKEMON == TRUE
SPECIES_PAL(PYROAR, gMonPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_PAL(BASCULEGION, gMonPalette_QuestionMark), // gMonPalette_BasculegionF),
#endif
};

1313
src/data/pokemon_graphics/shiny_palette_table.h
View file

File diff suppressed because it is too large Load diff

8
src/pokemon_debug.c
View file

@ -687,14 +687,14 @@ static const u32 *GetMonSpritePalStructCustom(u16 species, bool8 isFemale, bool8
{
if (isShiny)
{
if ((SpeciesHasGenderDifferences(species)) && isFemale)
if (gBaseStats[species].shinyPaletteFemale != NULL && isFemale)
return gBaseStats[species].shinyPaletteFemale;
else
return gBaseStats[species].shinyPalette;
}
else
{
if ((SpeciesHasGenderDifferences(species)) && isFemale)
if (gBaseStats[species].paletteFemale != NULL && isFemale)
return gBaseStats[species].paletteFemale;
else
return gBaseStats[species].palette;
@ -710,14 +710,14 @@ static void BattleLoadOpponentMonSpriteGfxCustom(u16 species, bool8 isFemale, bo
if (isShiny)
{
if ((SpeciesHasGenderDifferences(species)) && isFemale)
if (gBaseStats[species].shinyPaletteFemale != NULL && isFemale)
lzPaletteData = gBaseStats[species].shinyPaletteFemale;
else
lzPaletteData = gBaseStats[species].shinyPalette;
}
else
{
if ((SpeciesHasGenderDifferences(species)) && isFemale)
if (gBaseStats[species].paletteFemale != NULL && isFemale)
lzPaletteData = gBaseStats[species].paletteFemale;
else
lzPaletteData = gBaseStats[species].palette;

52
src/pokemon_icon.c
View file

@ -24,58 +24,6 @@ struct MonIconSpriteTemplate
static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
static void FreeAndDestroyMonIconSprite_(struct Sprite *sprite);
const u8 *const gMonIconTableFemale[] =
{
[SPECIES_EEVEE] = gMonIcon_Eevee,
#if P_GEN_4_POKEMON == TRUE
[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,
#if P_HIPPO_GENDER_DIFF_ICONS == TRUE
[SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF,
[SPECIES_HIPPOWDON] = gMonIcon_HippowdonF,
#else
[SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas,
[SPECIES_HIPPOWDON] = gMonIcon_Hippowdon,
#endif
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_UNFEZANT] = gMonIcon_UnfezantF,
[SPECIES_FRILLISH] = gMonIcon_FrillishF,
[SPECIES_JELLICENT] = gMonIcon_JellicentF,
#endif
#if P_GEN_6_POKEMON == TRUE
[SPECIES_PYROAR] = gMonIcon_PyroarF,
#endif
#if P_GEN_8_POKEMON == TRUE
[SPECIES_BASCULEGION] = gMonIcon_BasculegionF,
#endif
};
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,
[SPECIES_UNFEZANT] = 1,
[SPECIES_FRILLISH] = 1,
[SPECIES_JELLICENT] = 1,
[SPECIES_PYROAR] = 2,
[SPECIES_BASCULEGION] = 0,
};
const struct SpritePalette gMonIconPaletteTable[] =
{
{ gMonIconPalettes[0], POKE_ICON_BASE_PAL_TAG + 0 },