diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
| commit | f9f64fff422a245536a3baadc02c120474af1957 (patch) | |
| tree | 26483531fb97102fe728ca8793bde039473b90aa /src/pokemon_summary_screen.c | |
| parent | a24ffb13213b7cd8761cd501bc4c052da66f57c4 (diff) | |
| parent | 2ecbe252a29b9d58bfd2df82c01f94be7b69a7b0 (diff) | |
Resolve conflicts
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3ebdc3d6d..834ca6f7d 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -26,6 +26,7 @@ #include "international_string_util.h" #include "scanline_effect.h" #include "menu_helpers.h" +#include "daycare.h" struct ContestMove { @@ -3024,7 +3025,7 @@ void sub_81C31F0(u8 *a) { u8 level = gUnknown_0203CF1C->summary.metLevel; if (level == 0) - level = 5; + level = EGG_HATCH_LEVEL; ConvertIntToDecimalStringN(a, level, 0, 3); UnkTextUtil_SetPtrI(3, a); } |