From 662939d5f9d09bd50ba6d7b4a9b9fa145141b4c6 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sat, 23 Dec 2023 00:41:47 +0100 Subject: [PATCH] Add family defines --- src/berry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/berry.c b/src/berry.c index bd4daaeb54..f1f567e180 100644 --- a/src/berry.c +++ b/src/berry.c @@ -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