diff options
| author | Tetrable <atiftetra@gmail.com> | 2018-09-09 20:42:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 20:42:23 +0100 |
| commit | 3a0c26887efb6abc8106671ceefcc098737d823b (patch) | |
| tree | 930dcf2dc217011c45671f3bf2017ec9111fd6ed /src/safari_zone.c | |
| parent | 5a53d6d1fb304736c1fb3c222192a3b722707bca (diff) | |
| parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) | |
Merge pull request #3 from pret/master
merge
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 01d72fa13..427a5ceb8 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -35,7 +35,7 @@ extern void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); extern void CB2_LoadMap(void); extern void sub_80AF6F0(void); extern void ScriptContext1_Stop(void); -extern void warp_in(void); +extern void WarpIntoMap(void); extern void GetXYCoordsOneStepInFrontOfPlayer(s16* x, s16* y); extern void PlayerGetDestCoords(s16* x, s16* y); @@ -117,7 +117,7 @@ void CB2_EndSafariBattle(void) else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS) { ScriptContext2_RunNewScript(EventScript_2A4B4C); - warp_in(); + WarpIntoMap(); gFieldCallback = sub_80AF6F0; SetMainCallback2(CB2_LoadMap); } |