diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-07 18:06:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-07 18:06:59 -0600 |
| commit | 772fd47564da4d2c4072b83e43a9cc28e62ce5bb (patch) | |
| tree | b81a93d022488ed5a71ce0ac80ee4dd1b5662ac9 /src/calculate_base_damage.c | |
| parent | 5db765a475bf401417bbf7a3ca8b89dc0425f793 (diff) | |
| parent | 48e63979c8a131bc059974194bd548f60dcdd24c (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
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) |