diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
| commit | e86234ff99ffa4b60df180d462c2af0f1ed4d447 (patch) | |
| tree | 0d7240ce350146c6fa2189bf89aa96b08f3a6fdc /src/field/daycare.c | |
| parent | 1ff1e8ce9547d646b17b135b3013a516d17f35db (diff) | |
| parent | 7e3495747035d13f72ba869195b21f4e61ee283a (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/field/daycare.c')
| -rw-r--r-- | src/field/daycare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/daycare.c b/src/field/daycare.c index 5811461ae..36dd7ec03 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -341,7 +341,7 @@ u16 GetEggSpecies(u16 species) { for (k = 0; k < 5; k++) { - if (gEvolutionTable[j].evolutions[k].targetSpecies == species) + if (gEvolutionTable[j][k].targetSpecies == species) { species = j; found = TRUE; @@ -557,7 +557,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP { for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++) { - if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j)) + if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { if (GiveMoveToMon(egg, gHatchedEggFatherMoves[i]) == 0xffff) DeleteFirstMoveAndGiveMoveToMon(egg, gHatchedEggFatherMoves[i]); |