diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-22 11:40:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 11:40:46 -0500 |
| commit | 6eec1c1cc9c115492aec43f80c8a6be7a86c61a5 (patch) | |
| tree | 76a855eca52cd5faa9c67df4423cba0d352ce1ae /src/safari_zone.c | |
| parent | c75296640d9c42897eecf229bc7fc294f60a65eb (diff) | |
| parent | 5b27d3d2683251977873976f7774e352e3fd4e23 (diff) | |
Merge pull request #234 from GriffinRichards/doc-fuchsia
Document Fuchsia City and Safari Zone scripts
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); } |