Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -114,7 +114,7 @@ void sub_80FC190(void)
    {
        SetMainCallback2(c2_exit_to_overworld_2_switch);
    }
-    else if (gBattleOutcome == 8)
+    else if (gBattleOutcome == BATTLE_SAFARI_OUT_OF_BALLS)
    {
        ScriptContext2_RunNewScript(gUnknown_082A4B4C);
        warp_in();