diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
| commit | a83d07e1b3134ff7c23a3ac39552f8285a0c09b4 (patch) | |
| tree | 0feb901cc447f2b76c006e54affa906977be8ab9 /src/safari_zone.c | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
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 37ee664cd..fdfdd961a 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -34,7 +34,7 @@ extern void c2_exit_to_overworld_2_switch(void); extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); extern void c2_load_new_map(void); extern void sub_80AF6F0(void); -extern void script_env_2_set_ctx_paused(void); +extern void ScriptContext1_Stop(void); extern void warp_in(void); extern void GetXYCoordsOneStepInFrontOfPlayer(s16* x, s16* y); extern void PlayerGetDestCoords(s16* x, s16* y); @@ -124,7 +124,7 @@ void sub_80FC190(void) else if (gBattleOutcome == BATTLE_CAUGHT) { ScriptContext1_SetupScript(gUnknown_082A4B9B); - script_env_2_set_ctx_paused(); + ScriptContext1_Stop(); SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } } |