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

Add family defines

Browse source
This commit is contained in:
Bassoonian 2023-12-23 00:41:47 +01:00
parent db0a9484ae
commit 662939d5f9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/berry.c
View file

@ -2543,22 +2543,22 @@ static u16 GetBerryPestSpecies(u8 berryId)
switch(berry->color)
{
case BERRY_COLOR_RED:
return SPECIES_LEDYBA;
return P_FAMILY_LEDYBA ? SPECIES_LEDYBA : SPECIES_NONE;
break;
case BERRY_COLOR_BLUE:
return SPECIES_VOLBEAT;
return P_FAMILY_VOLBEAT_ILLUMISE ? SPECIES_VOLBEAT : SPECIES_NONE;
break;
case BERRY_COLOR_PURPLE:
return SPECIES_ILLUMISE;
return P_FAMILY_VOLBEAT_ILLUMISE ? SPECIES_ILLUMISE : SPECIES_NONE;
break;
case BERRY_COLOR_GREEN:
return SPECIES_BURMY_PLANT_CLOAK;
return P_FAMILY_BURMY ? SPECIES_BURMY_PLANT_CLOAK : SPECIES_NONE;
break;
case BERRY_COLOR_YELLOW:
return SPECIES_COMBEE;
return P_FAMILY_COMBEE ? SPECIES_COMBEE : SPECIES_NONE;
break;
case BERRY_COLOR_PINK:
return SPECIES_SPEWPA;
return P_FAMILY_SCATTERBUG ? SPECIES_SPEWPA : SPECIES_NONE;
break;
}
#endif