diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-15 17:04:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 17:04:55 -0600 |
| commit | cfec30413c36f3a571d80162796c11a030f42767 (patch) | |
| tree | 4a6cb4912d0ecd13efa6c0c887d850853763d875 /src/egg_hatch.c | |
| parent | fcf3f97da94515a34eda2dc1b564f4bc01adc383 (diff) | |
| parent | 824699f505d373b1cc1247347b9c69d6ef1ce8ca (diff) | |
Merge pull request #209 from DizzyEggg/decompile_overworld
Decompile overworld
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; } |