ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada 2023-01-08 18:42:39 -03:00
parent 9250f8c994
commit c5ea97ecc3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/daycare.c
View File

@ -743,9 +743,9 @@ void RejectEggFromDayCare(void)
}
static const struct {
u16 noIncenseSpecies;
u16 currSpecies;
u16 item;
u16 incenseSpecies;
u16 babySpecies;
} IncenseBabyTable[][3] =
{
// Regular offspring, Item, Incense Offspring
@ -769,8 +769,8 @@ static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare
for (i = 0; i < ARRAY_COUNT(IncenseBabyTable); i++)
{
if (IncenseBabyTable[i]->incenseSpecies == *species && motherItem != IncenseBabyTable[i]->item && fatherItem != IncenseBabyTable[i]->item)
*species = IncenseBabyTable[i]->noIncenseSpecies;
if (IncenseBabyTable[i]->babySpecies == *species && motherItem != IncenseBabyTable[i]->item && fatherItem != IncenseBabyTable[i]->item)
*species = IncenseBabyTable[i]->currSpecies;
}
}
@ -780,7 +780,7 @@ static const struct {
u16 move;
} BreedingSpecialMoveItemTable[][3] =
{
// Offspring Item Move
// Offspring, Item, Move
{ SPECIES_PICHU, ITEM_LIGHT_BALL, MOVE_VOLT_TACKLE },
};