diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-18 11:50:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 11:50:54 -0800 |
| commit | 3c5f725de49371aced1788a21f5e53df5b498b5f (patch) | |
| tree | acd08dc7032e0844aeaf1c15128b34889b799a39 /src/battle/calculate_base_damage.c | |
| parent | 77f725951f12425734235db42f17ce978a56d41f (diff) | |
| parent | 0ed3cab7a430baff96b7149edbaba222fcdd2c4c (diff) | |
Merge pull request #491 from huderlem/flags
Use named flag constants
Diffstat (limited to 'src/battle/calculate_base_damage.c')
| -rw-r--r-- | src/battle/calculate_base_damage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index f9ac03075..5c91b3657 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -90,7 +90,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE01_GET) + && FlagGet(FLAG_BADGE01_GET) && !GetBankSide(bankAtk)) attack = (110 * attack) / 100; } @@ -98,7 +98,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE05_GET) + && FlagGet(FLAG_BADGE05_GET) && !GetBankSide(bankDef)) defense = (110 * defense) / 100; } @@ -106,7 +106,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE07_GET) + && FlagGet(FLAG_BADGE07_GET) && !GetBankSide(bankAtk)) spAttack = (110 * spAttack) / 100; } @@ -114,7 +114,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE07_GET) + && FlagGet(FLAG_BADGE07_GET) && !GetBankSide(bankDef)) spDefense = (110 * spDefense) / 100; } |