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/calculate_base_damage.c | |
| parent | 3fb2471016b97e4a2e1ee4d73d7d4e3e632eda7a (diff) | |
| parent | c3dc14ba66b31c8f2556e9a19b6be7a5e860a376 (diff) | |
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
Diffstat (limited to 'src/calculate_base_damage.c')
| -rw-r--r-- | src/calculate_base_damage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index d30599607..b6b83086b 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -177,7 +177,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage = damage / damageHelper; damage /= 50; - if ((attacker->status1 & STATUS_BURN) && attacker->ability != ABILITY_GUTS) + if ((attacker->status1 & STATUS1_BURN) && attacker->ability != ABILITY_GUTS) damage /= 2; if ((sideStatus & SIDE_STATUS_REFLECT) && gCritMultiplier == 1) |