ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 09:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2061 from Jaizu/patch-22

Browse Source 
Fix MIME_JR #ifdef
This commit is contained in:
Eduardo Quezada D'Ottone 2022-02-18 16:29:37 -03:00 committed by GitHub
commit 466cd9f69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daycare.c
View File

@ -751,8 +751,8 @@ static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare
else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE) else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE)
*species = SPECIES_CHANSEY; *species = SPECIES_CHANSEY;
#endif #endif
#ifdef SPECIES_MIMEJR #ifdef SPECIES_MIME_JR
else if (*species == SPECIES_MIMEJR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) else if (*species == SPECIES_MIME_JR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE)
*species = SPECIES_MR_MIME; *species = SPECIES_MR_MIME;
#endif #endif
#ifdef SPECIES_CHINGLING #ifdef SPECIES_CHINGLING