summaryrefslogtreecommitdiff
path: root/src/safari_zone.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-02-07 18:06:59 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-02-07 18:06:59 -0600
commit772fd47564da4d2c4072b83e43a9cc28e62ce5bb (patch)
treeb81a93d022488ed5a71ce0ac80ee4dd1b5662ac9 /src/safari_zone.c
parent5db765a475bf401417bbf7a3ca8b89dc0425f793 (diff)
parent48e63979c8a131bc059974194bd548f60dcdd24c (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
Diffstat (limited to 'src/safari_zone.c')
-rw-r--r--src/safari_zone.c6
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();