diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-17 08:37:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 08:37:44 -0700 |
| commit | 27a2cd4808a1ade422c71d911498daa1578e6b97 (patch) | |
| tree | ac331cab350f5fb64672162ed850ccf9dea3d31e /src | |
| parent | 43f7bec067280fd558f0e6b824302954a145df9c (diff) | |
| parent | 19006431bc57bfcecd51c71e14b661448bf39f79 (diff) | |
Merge pull request #614 from Deokishisu/patch-1
Add EGG_HATCH_LEVEL define and use when appropriate
Diffstat (limited to 'src')
| -rw-r--r-- | src/daycare.c | 4 | ||||
| -rw-r--r-- | src/egg_hatch.c | 2 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/daycare.c b/src/daycare.c index a77b6c5f5..5220a3738 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1036,7 +1036,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setMetLocation) u8 metLocation; u8 isEgg; - CreateMon(mon, species, 5, 0x20, FALSE, 0, FALSE, 0); + CreateMon(mon, species, EGG_HATCH_LEVEL, 0x20, FALSE, 0, FALSE, 0); metLevel = 0; ball = ITEM_POKE_BALL; language = LANGUAGE_JAPANESE; @@ -1063,7 +1063,7 @@ static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare * u8 language; personality = daycare->misc.countersEtc.pendingEggPersonality | (Random() << 16); - CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0); + CreateMon(mon, species, EGG_HATCH_LEVEL, 0x20, TRUE, personality, FALSE, 0); metLevel = 0; ball = ITEM_POKE_BALL; language = LANGUAGE_JAPANESE; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 43dfa6864..eb66f299d 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -244,7 +244,7 @@ static void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp) markings = GetMonData(egg, MON_DATA_MARKINGS); pokerus = GetMonData(egg, MON_DATA_POKERUS); - CreateMon(temp, species, 5, 32, TRUE, personality, 0, 0); + CreateMon(temp, species, EGG_HATCH_LEVEL, 32, TRUE, personality, 0, 0); for (i = 0; i < 4; i++) { diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index a463e8054..6ad5c507c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -30,6 +30,7 @@ #include "task.h" #include "tv.h" #include "scanline_effect.h" +#include "daycare.h" static void sub_809FC0C(void); static void sub_809FEB8(void); @@ -3052,7 +3053,7 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, if (GetMonData(mon, MON_DATA_MET_LEVEL) == 0) { - ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, 5); + ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, EGG_HATCH_LEVEL); *ptr = CHAR_NEWLINE; ptr++; |