diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
| commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
| tree | c3962867c76bca0f06311bc39791aa42889e877d /src/safari_zone.c | |
| parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'src/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index fa6c11f52..a47c8e951 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -23,7 +23,7 @@ struct PokeblockFeeder static void ClearAllPokeblockFeeders(void); static void DecrementFeederStepCounters(void); -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 gSafariZoneStepCounter = 0; @@ -99,14 +99,14 @@ void sub_80C824C(void) { SetMainCallback2(c2_exit_to_overworld_2_switch); } - else if (gUnknown_02024D26 == 8) + else if (gBattleOutcome == 8) { ScriptContext2_RunNewScript(&gUnknown_081C340A); warp_in(); gFieldCallback = sub_8080E44; SetMainCallback2(CB2_LoadMap); } - else if (gUnknown_02024D26 == 7) + else if (gBattleOutcome == 7) { ScriptContext1_SetupScript(&gUnknown_081C3459); ScriptContext1_Stop(); |