mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-14 01:32:23 +01:00
Intimidate affects defiant
This commit is contained in:
parent
bc86292c93
commit
b5ba1de7cf
@ -516,7 +516,7 @@ void PrepareStringBattle(u16 stringId, u8 battler)
|
||||
stringId = STRINGID_STATSWONTDECREASE2;
|
||||
|
||||
// Check Defiant and Competitive stat raise whenever a stat is lowered.
|
||||
else if (stringId == STRINGID_PKMNSSTATCHANGED4
|
||||
else if ((stringId == STRINGID_PKMNSSTATCHANGED4 || stringId == STRINGID_PKMNCUTSATTACKWITH)
|
||||
&& ((GetBattlerAbility(gBattlerTarget) == ABILITY_DEFIANT && gBattleMons[gBattlerTarget].statStages[STAT_ATK] != 12)
|
||||
|| (GetBattlerAbility(gBattlerTarget) == ABILITY_COMPETITIVE && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] != 12))
|
||||
&& gSpecialStatuses[gBattlerTarget].changedStatsBattlerId != BATTLE_PARTNER(gBattlerTarget))
|
||||
|
Loading…
x
Reference in New Issue
Block a user