diff options
| author | MCboy <atasro2@gmail.com> | 2018-08-12 23:26:00 +0430 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 23:26:00 +0430 |
| commit | 1bc93c5a66ebc7ec790e3cb17f246aee75dcc73c (patch) | |
| tree | f6edf1981a206483d1691e5ac388055abfc64424 /src/berry_blender.c | |
| parent | 9e9ec8dc963c4786ac3af19102ebe690cb7785d5 (diff) | |
| parent | 21060091d109a6ebc4d1d76b8487878bb91cd5e1 (diff) | |
Merge branch 'master' into player_field_avatar
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index ed082e14c..257c7233f 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -2687,7 +2687,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) if (gReceivedRemoteLinkPlayers == 0) { FREE_AND_SET_NULL(sBerryBlenderData); - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } break; } @@ -2737,7 +2737,7 @@ static void CB2_HandlePlayerPlayAgainChoice(void) if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK) SetMainCallback2(DoBerryBlending); else - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); FreeAllWindowBuffers(); UnsetBgTilemapBuffer(2); |