diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-15 01:01:06 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-15 01:01:06 -0600 |
commit | 055a419830c0725a629f971b0299c89082c192fd (patch) | |
tree | 07d1e496a653dc2c6584022cb977bbdf273858aa /src/calculate_base_damage.c | |
parent | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (diff) | |
parent | ce0e5cbfe4439a9767134a670868f65cc9920e65 (diff) |
Merge pull request #101 from Diegoisawesome/dump_maps
Dump maps
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++) |