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

Add ClearHatchedEggMoves per SBird's suggestion

Browse Source 
Co-Authored-By: Philipp AUER <SBird1337@users.noreply.github.com>
This commit is contained in:
Bassoonian 2023-04-30 11:45:24 +02:00
parent acf4529d8b
commit 21fa91b80b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/daycare.c
View File

@ -165,6 +165,14 @@ static s8 Daycare_FindEmptySpot(struct DayCare *daycare)
return -1; return -1;
} }
static void ClearHatchedEggMoves(void)
{
u16 i;
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++)
sHatchedEggEggMoves[i] = MOVE_NONE;
}
static void TransferEggMoves(void) static void TransferEggMoves(void)
{ {
u32 i, j, k, l; u32 i, j, k, l;
@ -176,10 +184,8 @@ static void TransferEggMoves(void)
if (!GetBoxMonData(&gSaveBlock1Ptr->daycare.mons[i].mon, MON_DATA_SANITY_HAS_SPECIES)) if (!GetBoxMonData(&gSaveBlock1Ptr->daycare.mons[i].mon, MON_DATA_SANITY_HAS_SPECIES))
continue; continue;
// Get list of egg moves for mon
BoxMonToMon(&gSaveBlock1Ptr->daycare.mons[i].mon, &mon); BoxMonToMon(&gSaveBlock1Ptr->daycare.mons[i].mon, &mon);
for (j = 0; j < EGG_MOVES_ARRAY_COUNT; j++) ClearHatchedEggMoves();
sHatchedEggEggMoves[j] = MOVE_NONE;
numEggMoves = GetEggMoves(&mon, sHatchedEggEggMoves); numEggMoves = GetEggMoves(&mon, sHatchedEggEggMoves);
for (j = 0; j < numEggMoves; j++) for (j = 0; j < numEggMoves; j++)
{ {
@ -753,8 +759,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
sHatchedEggFatherMoves[i] = MOVE_NONE; sHatchedEggFatherMoves[i] = MOVE_NONE;
sHatchedEggFinalMoves[i] = MOVE_NONE; sHatchedEggFinalMoves[i] = MOVE_NONE;
} }
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++) ClearHatchedEggMoves();
sHatchedEggEggMoves[i] = MOVE_NONE;
for (i = 0; i < EGG_LVL_UP_MOVES_ARRAY_COUNT; i++) for (i = 0; i < EGG_LVL_UP_MOVES_ARRAY_COUNT; i++)
sHatchedEggLevelUpMoves[i] = MOVE_NONE; sHatchedEggLevelUpMoves[i] = MOVE_NONE;