diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-17 21:24:47 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-17 21:24:47 -0400 |
| commit | 2435bcc09db545d337c2b45a59d5276fa08ffa08 (patch) | |
| tree | 14e90198d5dac82c0b2aedb456397c4adc7f7ecb /src/pokemon.c | |
| parent | 97dc0a6903d0b08e26d18cac5713e0fc38727fd1 (diff) | |
sys flag rearrange
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 20a3d10b7..63de93f2b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2362,25 +2362,25 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de // In FRLG, the Battle Tower and opponent checks are stubbed here. if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_0x820) + if (FlagGet(FLAG_BADGE01_GET) && !GetBattlerSide(battlerIdAtk)) attack = (110 * attack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_0x824) + if (FlagGet(FLAG_BADGE05_GET) && !GetBattlerSide(battlerIdDef)) defense = (110 * defense) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_0x826) + if (FlagGet(FLAG_BADGE07_GET) && !GetBattlerSide(battlerIdAtk)) spAttack = (110 * spAttack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_0x826) + if (FlagGet(FLAG_BADGE07_GET) && !GetBattlerSide(battlerIdDef)) spDefense = (110 * spDefense) / 100; } |