ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimized SpeciesHasGenderDifference into Base Stat flag

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2022-01-01 19:24:34 -03:00
parent 1d12b01615
commit 3bbaf5a15d
8 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/constants/species.h
View File

@ -2472,8 +2472,9 @@
#define HOENN_DEX_COUNT 212 #define HOENN_DEX_COUNT 212
// species flags // species flags
#define F_ULTRA_BEAST (1 << 0) #define FLAG_ULTRA_BEAST (1 << 0)
#define F_ALOLAN_FORM (1 << 1) #define FLAG_ALOLAN_FORM (1 << 1)
#define F_GALARIAN_FORM (1 << 2) #define FLAG_GALARIAN_FORM (1 << 2)
#define FLAG_GENDER_DIFFERENCE (1 << 3)
#endif // GUARD_CONSTANTS_SPECIES_H #endif // GUARD_CONSTANTS_SPECIES_H

1
include/data.h
View File

@ -124,7 +124,6 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
extern const union AnimCmd *const *const gMonFrontAnimsPtrTable[]; extern const union AnimCmd *const *const gMonFrontAnimsPtrTable[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct CompressedSpriteSheet gMonFrontPicTableFemale[]; extern const struct CompressedSpriteSheet gMonFrontPicTableFemale[];
extern const bool8 SpeciesHasGenderDifference[NUM_SPECIES];
extern const struct Trainer gTrainers[]; extern const struct Trainer gTrainers[];
extern const u8 gTrainerClassNames[][13]; extern const u8 gTrainerClassNames[][13];

19
src/data.c
View File

@ -302,25 +302,6 @@ const union AnimCmd *const gAnims_MonPic[] =
#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species} #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG} #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
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,
[SPECIES_UNFEZANT] = TRUE,
[SPECIES_FRILLISH] = TRUE,
[SPECIES_JELLICENT] = TRUE,
[SPECIES_PYROAR] = TRUE,
};
#include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/front_pic_coordinates.h"
#include "data/pokemon_graphics/back_pic_coordinates.h" #include "data/pokemon_graphics/back_pic_coordinates.h"

113
src/data/pokemon/base_stats.h
View File

@ -3790,6 +3790,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_VAPOREON] = [SPECIES_VAPOREON] =
@ -11194,6 +11195,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_STARAVIA] = [SPECIES_STARAVIA] =
@ -11222,6 +11224,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_STARAPTOR] = [SPECIES_STARAPTOR] =
@ -11282,6 +11285,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_BIBAREL] = [SPECIES_BIBAREL] =
@ -11337,6 +11341,7 @@ const struct BaseStats gBaseStats[] =
.abilities = {ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_RUN_AWAY}, .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_RUN_AWAY},
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_KRICKETUNE] = [SPECIES_KRICKETUNE] =
@ -11368,6 +11373,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_SHINX] = [SPECIES_SHINX] =
@ -11396,6 +11402,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_LUXIO] = [SPECIES_LUXIO] =
@ -11736,6 +11743,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_VESPIQUEN] = [SPECIES_VESPIQUEN] =
@ -12672,6 +12680,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_HIPPOWDON] = [SPECIES_HIPPOWDON] =
@ -12700,6 +12709,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_SKORUPI] = [SPECIES_SKORUPI] =
@ -14676,6 +14686,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_BLITZLE] = [SPECIES_BLITZLE] =
@ -16767,6 +16778,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_JELLICENT] = [SPECIES_JELLICENT] =
@ -16795,6 +16807,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_ALOMOMOLA] = [SPECIES_ALOMOMOLA] =
@ -18879,6 +18892,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
}, },
[SPECIES_FLABEBE] = [SPECIES_FLABEBE] =
@ -22437,7 +22451,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_BUZZWOLE] = [SPECIES_BUZZWOLE] =
@ -22467,7 +22481,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_PHEROMOSA] = [SPECIES_PHEROMOSA] =
@ -22496,7 +22510,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_XURKITREE] = [SPECIES_XURKITREE] =
@ -22525,7 +22539,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_CELESTEELA] = [SPECIES_CELESTEELA] =
@ -22556,7 +22570,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_KARTANA] = [SPECIES_KARTANA] =
@ -22585,7 +22599,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_GUZZLORD] = [SPECIES_GUZZLORD] =
@ -22614,7 +22628,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_NECROZMA] = [SPECIES_NECROZMA] =
@ -22729,7 +22743,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_NAGANADEL] = [SPECIES_NAGANADEL] =
@ -22758,7 +22772,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_STAKATAKA] = [SPECIES_STAKATAKA] =
@ -22787,7 +22801,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = TRUE, .noFlip = TRUE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_BLACEPHALON] = [SPECIES_BLACEPHALON] =
@ -22816,7 +22830,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE, .noFlip = TRUE,
.flags = F_ULTRA_BEAST, .flags = FLAG_ULTRA_BEAST,
}, },
[SPECIES_ZERAORA] = [SPECIES_ZERAORA] =
@ -26779,7 +26793,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_RATICATE_ALOLAN] = [SPECIES_RATICATE_ALOLAN] =
@ -26809,7 +26823,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_RAICHU_ALOLAN] = [SPECIES_RAICHU_ALOLAN] =
@ -26838,7 +26852,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_SANDSHREW_ALOLAN] = [SPECIES_SANDSHREW_ALOLAN] =
@ -26870,7 +26884,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_SANDSLASH_ALOLAN] = [SPECIES_SANDSLASH_ALOLAN] =
@ -26899,7 +26913,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_VULPIX_ALOLAN] = [SPECIES_VULPIX_ALOLAN] =
@ -26931,7 +26945,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_NINETALES_ALOLAN] = [SPECIES_NINETALES_ALOLAN] =
@ -26961,7 +26975,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_DIGLETT_ALOLAN] = [SPECIES_DIGLETT_ALOLAN] =
@ -26991,7 +27005,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_DUGTRIO_ALOLAN] = [SPECIES_DUGTRIO_ALOLAN] =
@ -27021,7 +27035,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = TRUE, .noFlip = TRUE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_MEOWTH_ALOLAN] = [SPECIES_MEOWTH_ALOLAN] =
@ -27051,7 +27065,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_PERSIAN_ALOLAN] = [SPECIES_PERSIAN_ALOLAN] =
@ -27081,7 +27095,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_GEODUDE_ALOLAN] = [SPECIES_GEODUDE_ALOLAN] =
@ -27113,7 +27127,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_GRAVELER_ALOLAN] = [SPECIES_GRAVELER_ALOLAN] =
@ -27145,7 +27159,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_GOLEM_ALOLAN] = [SPECIES_GOLEM_ALOLAN] =
@ -27174,7 +27188,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_GRIMER_ALOLAN] = [SPECIES_GRIMER_ALOLAN] =
@ -27206,7 +27220,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_MUK_ALOLAN] = [SPECIES_MUK_ALOLAN] =
@ -27236,7 +27250,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = TRUE, .noFlip = TRUE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_EXEGGUTOR_ALOLAN] = [SPECIES_EXEGGUTOR_ALOLAN] =
@ -27265,7 +27279,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_MAROWAK_ALOLAN] = [SPECIES_MAROWAK_ALOLAN] =
@ -27294,7 +27308,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_ALOLAN_FORM, .flags = FLAG_ALOLAN_FORM,
}, },
[SPECIES_MEOWTH_GALARIAN] = [SPECIES_MEOWTH_GALARIAN] =
@ -27323,7 +27337,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_PONYTA_GALARIAN] = [SPECIES_PONYTA_GALARIAN] =
@ -27352,7 +27366,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_RAPIDASH_GALARIAN] = [SPECIES_RAPIDASH_GALARIAN] =
@ -27381,7 +27395,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_SLOWPOKE_GALARIAN] = [SPECIES_SLOWPOKE_GALARIAN] =
@ -27410,10 +27424,9 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_SLOWBRO_GALARIAN] = [SPECIES_SLOWBRO_GALARIAN] =
{ {
.baseHP = 95, .baseHP = 95,
@ -27440,7 +27453,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_FARFETCHD_GALARIAN] = [SPECIES_FARFETCHD_GALARIAN] =
@ -27470,7 +27483,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_WEEZING_GALARIAN] = [SPECIES_WEEZING_GALARIAN] =
@ -27502,7 +27515,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_MR_MIME_GALARIAN] = [SPECIES_MR_MIME_GALARIAN] =
@ -27531,7 +27544,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_ARTICUNO_GALARIAN] = [SPECIES_ARTICUNO_GALARIAN] =
@ -27560,7 +27573,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_ZAPDOS_GALARIAN] = [SPECIES_ZAPDOS_GALARIAN] =
@ -27589,7 +27602,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_MOLTRES_GALARIAN] = [SPECIES_MOLTRES_GALARIAN] =
@ -27618,7 +27631,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_SLOWKING_GALARIAN] = [SPECIES_SLOWKING_GALARIAN] =
@ -27647,7 +27660,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_CORSOLA_GALARIAN] = [SPECIES_CORSOLA_GALARIAN] =
@ -27676,7 +27689,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_ZIGZAGOON_GALARIAN] = [SPECIES_ZIGZAGOON_GALARIAN] =
@ -27705,7 +27718,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_LINOONE_GALARIAN] = [SPECIES_LINOONE_GALARIAN] =
@ -27734,7 +27747,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_DARUMAKA_GALARIAN] = [SPECIES_DARUMAKA_GALARIAN] =
@ -27759,7 +27772,7 @@ const struct BaseStats gBaseStats[] =
.abilities = {ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS}, .abilities = {ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS},
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_DARMANITAN_GALARIAN] = [SPECIES_DARMANITAN_GALARIAN] =
@ -27788,7 +27801,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_YAMASK_GALARIAN] = [SPECIES_YAMASK_GALARIAN] =
@ -27817,7 +27830,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_STUNFISK_GALARIAN] = [SPECIES_STUNFISK_GALARIAN] =
@ -27846,7 +27859,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_PIKACHU_COSPLAY] = [SPECIES_PIKACHU_COSPLAY] =
@ -29976,7 +29989,7 @@ const struct BaseStats gBaseStats[] =
#endif #endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
.flags = F_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
[SPECIES_DEERLING_SUMMER] = [SPECIES_DEERLING_SUMMER] =

4
src/decompress.c
View File

@ -70,7 +70,7 @@ void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffe
void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality) void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality)
{ {
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
DecompressPicFromTable(&gMonFrontPicTableFemale[species], buffer, species); DecompressPicFromTable(&gMonFrontPicTableFemale[species], buffer, species);
else else
DecompressPicFromTable(&gMonFrontPicTable[species], buffer, species); DecompressPicFromTable(&gMonFrontPicTable[species], buffer, species);
@ -101,7 +101,7 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
} }
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon else if (species > NUM_SPECIES) // is species unknown? draw the ? icon
LZ77UnCompWram(gMonFrontPicTable[0].data, dest); LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
else if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) else if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
{ {
if (isFrontPic) if (isFrontPic)
LZ77UnCompWram(gMonFrontPicTableFemale[species].data, dest); LZ77UnCompWram(gMonFrontPicTableFemale[species].data, dest);

8
src/pokemon.c
View File

@ -7513,14 +7513,14 @@ const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 p
shinyValue = GET_SHINY_VALUE(otId, personality); shinyValue = GET_SHINY_VALUE(otId, personality);
if (shinyValue < SHINY_ODDS) if (shinyValue < SHINY_ODDS)
{ {
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
return gMonShinyPaletteTableFemale[species].data; return gMonShinyPaletteTableFemale[species].data;
else else
return gMonShinyPaletteTable[species].data; return gMonShinyPaletteTable[species].data;
} }
else else
{ {
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
return gMonPaletteTableFemale[species].data; return gMonPaletteTableFemale[species].data;
else else
return gMonPaletteTable[species].data; return gMonPaletteTable[species].data;
@ -7542,14 +7542,14 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u
shinyValue = GET_SHINY_VALUE(otId, personality); shinyValue = GET_SHINY_VALUE(otId, personality);
if (shinyValue < SHINY_ODDS) if (shinyValue < SHINY_ODDS)
{ {
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
return &gMonShinyPaletteTableFemale[species]; return &gMonShinyPaletteTableFemale[species];
else else
return &gMonShinyPaletteTable[species]; return &gMonShinyPaletteTable[species];
} }
else else
{ {
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
return &gMonPaletteTableFemale[species]; return &gMonPaletteTableFemale[species];
else else
return &gMonPaletteTable[species]; return &gMonPaletteTable[species];

4
src/pokemon_icon.c
View File

@ -2581,7 +2581,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
if (species > NUM_SPECIES) if (species > NUM_SPECIES)
iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG; iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG;
else if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) else if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndicesFemale[species]; iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndicesFemale[species];
spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority); spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
@ -2758,7 +2758,7 @@ void SpriteCB_MonIcon(struct Sprite *sprite)
const u8* GetMonIconTiles(u16 species, u32 personality) const u8* GetMonIconTiles(u16 species, u32 personality)
{ {
const u8* iconSprite = gMonIconTable[species]; const u8* iconSprite = gMonIconTable[species];
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
{ {
iconSprite = gMonIconTableFemale[species]; iconSprite = gMonIconTableFemale[species];
} }

4
src/pokemon_storage_system.c
View File

@ -5120,7 +5120,7 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality)
u16 i, offset; u16 i, offset;
// Treat female mons as a seperate species as they may have a different icon than males // Treat female mons as a seperate species as they may have a different icon than males
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
species |= 0x8000; // 1 << 15 species |= 0x8000; // 1 << 15
// Search icon list for this species // Search icon list for this species
@ -5187,7 +5187,7 @@ static struct Sprite *CreateMonIconSprite(u16 species, u32 personality, s16 x, s
struct SpriteTemplate template = sSpriteTemplate_MonIcon; struct SpriteTemplate template = sSpriteTemplate_MonIcon;
species = GetIconSpecies(species, personality); species = GetIconSpecies(species, personality);
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
{ {
template.paletteTag = PALTAG_MON_ICON_0 + gMonIconPaletteIndicesFemale[species]; template.paletteTag = PALTAG_MON_ICON_0 + gMonIconPaletteIndicesFemale[species];
} }