diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
| commit | 88716f4c0e053a984eeb4bef92fefa42027dd22a (patch) | |
| tree | 326805fbcc882cd74cc43431e34b680b4971184c /src/battle/calculate_base_damage.c | |
| parent | b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 (diff) | |
Use FLAG_ prefix for all flags
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; } |