diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 18:18:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 18:18:35 -0700 |
| commit | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (patch) | |
| tree | 137e905d499c0b3cabae75db88df52233604adc0 /src/battle/calculate_base_damage.c | |
| parent | 18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff) | |
| parent | 3571cb1d142090b59a9161a6bada11f0caf53b8c (diff) | |
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
Diffstat (limited to 'src/battle/calculate_base_damage.c')
| -rw-r--r-- | src/battle/calculate_base_damage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 217ab28a3..5e63ee92c 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -71,7 +71,7 @@ const u8 gHoldEffectToType[][2] = {HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL} }; -u8 GetBankSide(u8 bank); +u8 GetBattlerSide(u8 bank); #define APPLY_STAT_MOD(var, mon, stat, statIndex) \ { \ @@ -137,7 +137,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(FLAG_BADGE01_GET) - && !GetBankSide(bankAtk)) + && !GetBattlerSide(bankAtk)) attack = (110 * attack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -145,7 +145,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(FLAG_BADGE05_GET) - && !GetBankSide(bankDef)) + && !GetBattlerSide(bankDef)) defense = (110 * defense) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -153,7 +153,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(FLAG_BADGE07_GET) - && !GetBankSide(bankAtk)) + && !GetBattlerSide(bankAtk)) spAttack = (110 * spAttack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -161,7 +161,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(FLAG_BADGE07_GET) - && !GetBankSide(bankDef)) + && !GetBattlerSide(bankDef)) spDefense = (110 * spDefense) / 100; } |