diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:08:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:08:03 -0500 |
| commit | d63e99c418de98005eac31ba3e6c1abdd6e3ecaf (patch) | |
| tree | f8352a8edfbc7209588cd783e485ba6b6d2e0b00 /src/berry_blender.c | |
| parent | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (diff) | |
| parent | e97f37077c793a388e3a98c13f09846839e80b22 (diff) | |
Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
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 8d7a7faab..e55a391f5 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1258,7 +1258,7 @@ static void sub_804E9F8(void) break; case 102: if (!gPaletteFade.active) - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); break; } RunTasks(); @@ -2480,7 +2480,7 @@ static void sub_8050E30(void) break; case 12: if (gReceivedRemoteLinkPlayers == 0) - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); break; } @@ -2529,7 +2529,7 @@ static void sub_80510E8(void) if (gBerryBlenderData->field_7C == 0) SetMainCallback2(DoBerryBlending); else - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } break; } |