Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamaxed Pokemon do not get an -ate boost, TODO: write tests

Browse Source
This commit is contained in:
AgustinGDLV 2023-03-24 23:29:40 -07:00
parent 1acddfa38a
commit 60720c0182
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_main.c
View File

@ -5536,7 +5536,8 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk)
)
{
gBattleStruct->dynamicMoveType = ateType | F_DYNAMIC_TYPE_2;
gBattleStruct->ateBoost[battlerAtk] = 1;
if (!IsDynamaxed(battlerAtk))
gBattleStruct->ateBoost[battlerAtk] = 1;
}
else if (gBattleMoves[move].type != TYPE_NORMAL
&& gBattleMoves[move].effect != EFFECT_HIDDEN_POWER
@ -5544,7 +5545,8 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk)
&& attackerAbility == ABILITY_NORMALIZE)
{
gBattleStruct->dynamicMoveType = TYPE_NORMAL | F_DYNAMIC_TYPE_2;
gBattleStruct->ateBoost[battlerAtk] = 1;
if (!IsDynamaxed(battlerAtk))
gBattleStruct->ateBoost[battlerAtk] = 1;
}
else if (gBattleMoves[move].flags & FLAG_SOUND
&& attackerAbility == ABILITY_LIQUID_VOICE)