diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
| commit | 2d4be89ee590792bcbcfdcfac17bc2827ca17151 (patch) | |
| tree | 592b831e50d1d98f3842751335278e782f9274c7 /src/safari_zone.c | |
| parent | 0495cce90418b84dc53b5d5c9f3b2bfe46f0ed62 (diff) | |
| parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into union_room
Diffstat (limited to 'src/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index cb0a58586..65fb89bca 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -47,7 +47,7 @@ bool8 SafariZoneTakeStep(void) gSafariZoneStepCounter--; if (gSafariZoneStepCounter == 0) { - ScriptContext1_SetupScript(EventScript_SafariTimesUp); + ScriptContext1_SetupScript(SafariZone_EventScript_TimesUp); return TRUE; } return FALSE; @@ -55,7 +55,7 @@ bool8 SafariZoneTakeStep(void) void SafariZoneRetirePrompt(void) { - ScriptContext1_SetupScript(EventScript_SafariRetire); + ScriptContext1_SetupScript(SafariZone_EventScript_RetirePrompt); } void CB2_EndSafariBattle(void) @@ -66,14 +66,14 @@ void CB2_EndSafariBattle(void) } else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS) { - ScriptContext2_RunNewScript(EventScript_SafariWarpOut); + ScriptContext2_RunNewScript(SafariZone_EventScript_OutOfBallsMidBattle); WarpIntoMap(); gFieldCallback = sub_807E3EC; SetMainCallback2(CB2_LoadMap); } else if (gBattleOutcome == B_OUTCOME_CAUGHT) { - ScriptContext1_SetupScript(EventScript_SafariOutOfBalls); + ScriptContext1_SetupScript(SafariZone_EventScript_OutOfBalls); ScriptContext1_Stop(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } |