diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
| commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
| tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /src/calculate_base_damage.c | |
| parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
move mon data fix conflicts
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) |