From bc4bff6cda425998598bbd119d59af2f522d9656 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Wed, 16 May 2018 21:36:50 -0400 Subject: Update pokemon_summary_screen.c to use EGG_HATCH_LEVEL define To be consistent with pokeemerald. --- src/pokemon_summary_screen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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++; -- cgit v1.2.3 From 9f66fe082bd5745a59ec703fd4dc912af7b4bb85 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Wed, 16 May 2018 21:39:43 -0400 Subject: Update daycare.c to use EGG_HATCH_LEVEL define To be consistent with pokeemerald. --- src/daycare.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.3 From 19006431bc57bfcecd51c71e14b661448bf39f79 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Wed, 16 May 2018 21:41:42 -0400 Subject: Update egg_hatch.c to use EGG_HATCH_LEVEL define To be consistent with pokeemerald. --- src/egg_hatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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++) { -- cgit v1.2.3