From 1d2f6841f2320eea7ef47b35b50520847b5c3c18 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 14 Oct 2020 19:10:04 -0300 Subject: [PATCH] Added breeding effects for Incenses. --- src/daycare.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/daycare.c b/src/daycare.c index 31014bf7f4..cbd7737e82 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -728,20 +728,41 @@ void RejectEggFromDayCare(void) static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare) { u16 motherItem, fatherItem; - if (*species == SPECIES_WYNAUT || *species == SPECIES_AZURILL) - { - motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM); - fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM); - if (*species == SPECIES_WYNAUT && motherItem != ITEM_LAX_INCENSE && fatherItem != ITEM_LAX_INCENSE) - { - *species = SPECIES_WOBBUFFET; - } + motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM); + fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM); - if (*species == SPECIES_AZURILL && motherItem != ITEM_SEA_INCENSE && fatherItem != ITEM_SEA_INCENSE) - { - *species = SPECIES_MARILL; - } - } + if (*species == SPECIES_WYNAUT && motherItem != ITEM_LAX_INCENSE && fatherItem != ITEM_LAX_INCENSE) + *species = SPECIES_WOBBUFFET; + else if (*species == SPECIES_AZURILL && motherItem != ITEM_SEA_INCENSE && fatherItem != ITEM_SEA_INCENSE) + *species = SPECIES_MARILL; + #ifdef SPECIES_MUNCHLAX + else if (*species == SPECIES_MUNCHLAX && motherItem != ITEM_FULL_INCENSE && fatherItem != ITEM_FULL_INCENSE) + *species = SPECIES_SNORLAX; + #endif + #ifdef SPECIES_HAPPINY + else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE) + *species = SPECIES_CHANSEY; + #endif + #ifdef SPECIES_MIMEJR + else if (*species == SPECIES_MIMEJR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) + *species = SPECIES_MR_MIME; + #endif + #ifdef SPECIES_CHINGLING + else if (*species == SPECIES_CHINGLING && motherItem != ITEM_PURE_INCENSE && fatherItem != ITEM_PURE_INCENSE) + *species = SPECIES_CHIMECHO; + #endif + #ifdef SPECIES_BONSLY + else if (*species == SPECIES_BONSLY && motherItem != ITEM_ROCK_INCENSE && fatherItem != ITEM_ROCK_INCENSE) + *species = SPECIES_SUDOWOODO; + #endif + #ifdef SPECIES_BUDEW + else if (*species == SPECIES_BUDEW && motherItem != ITEM_ROSE_INCENSE && fatherItem != ITEM_ROSE_INCENSE) + *species = SPECIES_ROSELIA; + #endif + #ifdef SPECIES_MANTYKE + else if (*species == SPECIES_MANTYKE && motherItem != ITEM_WAVE_INCENSE && fatherItem != ITEM_WAVE_INCENSE) + *species = SPECIES_MANTINE; + #endif } static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)