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/safari_zone.c | |
parent | 9e9ec8dc963c4786ac3af19102ebe690cb7785d5 (diff) | |
parent | 21060091d109a6ebc4d1d76b8487878bb91cd5e1 (diff) |
Merge branch 'master' into player_field_avatar
Diffstat (limited to 'src/safari_zone.c')
-rw-r--r-- | src/safari_zone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index c0c098b38..01d72fa13 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -31,7 +31,7 @@ extern void IncrementGameStat(u8 index); extern void ScriptContext1_SetupScript(u8*); extern void ScriptContext2_RunNewScript(u8*); extern void CB2_ReturnToField(void); -extern void CB2_ReturnToFieldContinueScript(void); +extern void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); extern void CB2_LoadMap(void); extern void sub_80AF6F0(void); extern void ScriptContext1_Stop(void); @@ -125,7 +125,7 @@ void CB2_EndSafariBattle(void) { ScriptContext1_SetupScript(EventScript_2A4B9B); ScriptContext1_Stop(); - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } |