diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/egg_hatch.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 43beef442..4b7ee9a61 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -305,7 +305,7 @@ static void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp) u32 personality, pokerus; u8 i, friendship, language, gameMet, markings, obedience; u16 moves[4]; - u32 ivs[6]; + u32 ivs[NUM_STATS]; species = GetMonData(egg, MON_DATA_SPECIES); @@ -317,7 +317,7 @@ static void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp) personality = GetMonData(egg, MON_DATA_PERSONALITY); - for (i = 0; i < 6; i++) + for (i = 0; i < NUM_STATS; i++) { ivs[i] = GetMonData(egg, MON_DATA_HP_IV + i); } @@ -335,7 +335,7 @@ static void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp) SetMonData(temp, MON_DATA_MOVE1 + i, &moves[i]); } - for (i = 0; i < 6; i++) + for (i = 0; i < NUM_STATS; i++) { SetMonData(temp, MON_DATA_HP_IV + i, &ivs[i]); } |