diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
| commit | ebd88b36060e8958fbf5f3b2028629575c79a243 (patch) | |
| tree | 101cf777ea827ff7e68069c5ad45822a629ea75c /src/egg_hatch.c | |
| parent | 1605f6253564e4e5f67dd295a1ac70145e5c1c9d (diff) | |
| parent | e2932a38ded59a6b794d10024498db718c0b0bb9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
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 b78b9433e..e64a98ab1 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -63,7 +63,7 @@ extern void FadeScreen(u8, u8); extern void overworld_free_bg_tilemaps(void); extern void sub_80AF168(void); extern void ScanlineEffect_Stop(void); -extern void c2_exit_to_overworld_2_switch(void); +extern void CB2_ReturnToField(void); extern void play_some_sound(void); extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback); extern u16 sub_80D22D0(void); @@ -564,7 +564,7 @@ static void EggHatchSetMonNickname(void) SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3); FreeMonSpritesGfx(); Free(sEggHatchData); - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); } static void Task_EggHatchPlayBGM(u8 taskID) @@ -688,7 +688,7 @@ static void CB2_EggHatch_1(void) UnsetBgTilemapBuffer(0); UnsetBgTilemapBuffer(1); Free(sEggHatchData); - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); } break; } |