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/battle_setup.c | |
| parent | 3fb2471016b97e4a2e1ee4d73d7d4e3e632eda7a (diff) | |
| parent | c3dc14ba66b31c8f2556e9a19b6be7a5e860a376 (diff) | |
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 6d7a97844..96af536fe 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -990,14 +990,14 @@ static bool32 IsPlayerDefeated(u32 battleOutcome) { switch (battleOutcome) { - case BATTLE_LOST: - case BATTLE_DREW: + case B_OUTCOME_LOST: + case B_OUTCOME_DREW: return TRUE; - case BATTLE_WON: - case BATTLE_RAN: - case BATTLE_PLAYER_TELEPORTED: - case BATTLE_POKE_FLED: - case BATTLE_CAUGHT: + case B_OUTCOME_WON: + case B_OUTCOME_RAN: + case B_OUTCOME_PLAYER_TELEPORTED: + case B_OUTCOME_POKE_FLED: + case B_OUTCOME_CAUGHT_POKE: return FALSE; default: return FALSE; |