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/berry_blender.c | |
| parent | 1605f6253564e4e5f67dd295a1ac70145e5c1c9d (diff) | |
| parent | e2932a38ded59a6b794d10024498db718c0b0bb9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 23594ba46..1ac52dd6c 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -161,7 +161,7 @@ extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); extern void ClearLinkCallback(void); -extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); +extern void CB2_ReturnToFieldContinueScript(void); extern void sub_8153430(void); extern bool8 sub_8153474(void); extern void sub_80EECEC(void); @@ -2692,7 +2692,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) if (gReceivedRemoteLinkPlayers == 0) { FREE_AND_SET_NULL(sBerryBlenderData); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScript); } break; } @@ -2742,7 +2742,7 @@ static void CB2_HandlePlayerPlayAgainChoice(void) if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK) SetMainCallback2(DoBerryBlending); else - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScript); FreeAllWindowBuffers(); UnsetBgTilemapBuffer(2); |