From 60720c01825b95aa4e56f91b28e0250617da3276 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Fri, 24 Mar 2023 23:29:40 -0700 Subject: [PATCH] Dynamaxed Pokemon do not get an -ate boost, TODO: write tests --- src/battle_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 055823f6c1..ffb1fd3908 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -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)