diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-25 08:10:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 08:10:18 -0700 |
| commit | 919e7b4387556ce59e2d3a3bcb2ad44fe76ee8ee (patch) | |
| tree | 345f52571b2d6c5505441e914f73d576acff7c9a /src/safari_zone.c | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
| parent | 7270e73fee332d53c4f30069af4525d89cd165b0 (diff) | |
Merge pull request #279 from Diegoisawesome/master
Move strings to C, misc cleanup
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); } } |