From 9ef7717cd8bb78667b4ae2a5511e38138c122e6a Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Mon, 27 Feb 2023 14:39:24 -0800 Subject: [PATCH] max move effects don't apply if the move didn't land --- src/battle_dynamax.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 287a13eb6e..7244ac837f 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -159,6 +159,11 @@ u16 SetMaxMoveEffect(u16 move) { u16 effect = 0; u8 maxEffect = gBattleMoves[move].argument; + + // Don't continue if the move didn't land. + if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + return effect; + switch (maxEffect) { case MAX_EFFECT_RAISE_TEAM_ATTACK: