diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
| commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
| tree | 656599caae716c6cc8e81121f2b1cd061927b99e /src/egg_hatch.c | |
| parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
fix pokeblock conflicts
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 032607806..a31eb0520 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -58,7 +58,7 @@ extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; extern u8 sav1_map_get_name(void); -extern s8 sub_8198C58(void); +extern s8 ProcessMenuInputNoWrap_(void); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); extern void sub_806A068(u16, u8); extern void fade_screen(u8, u8); @@ -669,7 +669,7 @@ static void CB2_EggHatch_1(void) } break; case 10: - switch (sub_8198C58()) + switch (ProcessMenuInputNoWrap_()) { case 0: GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3); |