diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
| commit | 7c79b030e90ae6f4b3b3c91518c315959ede456e (patch) | |
| tree | b12fe2ca0d42b900fb1d45491e81a1bc6d86a348 /src/calculate_base_damage.c | |
| parent | 2acab81713aac51f96a50dc42a67ec7761901aa4 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/calculate_base_damage.c')
| -rw-r--r-- | src/calculate_base_damage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index 8996059f9..89770b17a 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -84,13 +84,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attacker->ability == ABILITY_HUGE_POWER || attacker->ability == ABILITY_PURE_POWER) attack *= 2; - if (ShouldGetStatBadgeBoost(BADGE01_GET, bankAtk)) + if (ShouldGetStatBadgeBoost(FLAG_BADGE01_GET, bankAtk)) attack = (110 * attack) / 100; - if (ShouldGetStatBadgeBoost(BADGE05_GET, bankDef)) + if (ShouldGetStatBadgeBoost(FLAG_BADGE05_GET, bankDef)) defense = (110 * defense) / 100; - if (ShouldGetStatBadgeBoost(BADGE07_GET, bankAtk)) + if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankAtk)) spAttack = (110 * spAttack) / 100; - if (ShouldGetStatBadgeBoost(BADGE07_GET, bankDef)) + if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankDef)) spDefense = (110 * spDefense) / 100; for (i = 0; i < 17; i++) |