diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-14 14:19:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-14 14:19:37 -0600 |
| commit | 69a662de660bf075e97521c4d220c893b96b793b (patch) | |
| tree | 4708fd4bd0d504186af7496608bc85130d94fb4e /src/field/daycare.c | |
| parent | dbe9b11ce67e8ec70ffffa0c6b0e12236656f644 (diff) | |
| parent | c1ac08ddf3d48c4db93d240f2e1518d6b4d6853b (diff) | |
Merge pull request #534 from camthesaxman/tmhm_macros
improve TM/HM constants and add macro for TM/HM learnsets
Diffstat (limited to 'src/field/daycare.c')
| -rw-r--r-- | src/field/daycare.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/daycare.c b/src/field/daycare.c index 7e4530906..36dd7ec03 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -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]); |