Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-02-09 11:37:56 -03:00 committed by GitHub
parent d45a6487ab
commit d3417b00a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event_object_movement.c
View File

@ -1989,8 +1989,10 @@ static u32 LoadDynamicFollowerPalette(u32 species, bool32 shiny, bool32 female)
{ {
struct SpritePalette spritePalette; struct SpritePalette spritePalette;
u16 palTag = species + OBJ_EVENT_MON + (shiny ? OBJ_EVENT_MON_SHINY : 0); u16 palTag = species + OBJ_EVENT_MON + (shiny ? OBJ_EVENT_MON_SHINY : 0);
#if P_GENDER_DIFFERENCES
if (female && gSpeciesInfo[species].overworldShinyPaletteFemale != NULL) if (female && gSpeciesInfo[species].overworldShinyPaletteFemale != NULL)
palTag += OBJ_EVENT_MON_FEMALE; palTag += OBJ_EVENT_MON_FEMALE;
#endif
// palette already loaded // palette already loaded
if ((paletteNum = IndexOfSpritePaletteTag(palTag)) < 16) if ((paletteNum = IndexOfSpritePaletteTag(palTag)) < 16)
return paletteNum; return paletteNum;