diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-08 14:06:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 14:06:57 -0600 |
| commit | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (patch) | |
| tree | 155bfcbf888984db4f648bebe92e47d73008b0da /src/daycare.c | |
| parent | 250538fcae79e4d11c6efb4f4bfb34080f72bd48 (diff) | |
| parent | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (diff) | |
Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
Diffstat (limited to 'src/daycare.c')
| -rw-r--r-- | src/daycare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daycare.c b/src/daycare.c index f7d1825fd..89c0a48d8 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -413,7 +413,7 @@ static u16 GetEggSpecies(u16 species) { for (k = 0; k < EVOS_PER_MON; k++) { - if (gEvolutionTable[j].evolutions[k].targetSpecies == species) + if (gEvolutionTable[j][k].targetSpecies == species) { species = j; found = TRUE; @@ -694,7 +694,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++) { - if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j)) + if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); |