From ae8e89a10ddfb736afc23a2477c20b6897b0313d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 5 Feb 2018 17:39:26 +0100 Subject: move some pokemon data to c --- src/daycare.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/daycare.c') diff --git a/src/daycare.c b/src/daycare.c index 59ee562bd..346241a42 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]); -- cgit v1.2.3