diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-02-07 12:46:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 12:46:12 -0600 |
| commit | 13bc7a8dd26fd489b4d83e8d9044c424b526aff3 (patch) | |
| tree | 199cc6a98e9a05858fb98fb591e7f37259438360 /src/safari_zone.c | |
| parent | 3fb2471016b97e4a2e1ee4d73d7d4e3e632eda7a (diff) | |
| parent | c3dc14ba66b31c8f2556e9a19b6be7a5e860a376 (diff) | |
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
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 ce1eb65bc..12da73090 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -108,20 +108,20 @@ void SafariZoneRetirePrompt(void) void CB2_EndSafariBattle(void) { sSafariZoneFleedMons += gBattleResults.field_1F; - if (gBattleOutcome == BATTLE_CAUGHT) + if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE) sSafariZoneCaughtMons++; if (gNumSafariBalls != 0) { SetMainCallback2(c2_exit_to_overworld_2_switch); } - else if (gBattleOutcome == BATTLE_SAFARI_OUT_OF_BALLS) + else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS) { ScriptContext2_RunNewScript(EventScript_2A4B4C); warp_in(); gFieldCallback = sub_80AF6F0; SetMainCallback2(c2_load_new_map); } - else if (gBattleOutcome == BATTLE_CAUGHT) + else if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE) { ScriptContext1_SetupScript(EventScript_2A4B9B); ScriptContext1_Stop(); |