From 503aad9137b13b4d5df0c697d345806107ca66c2 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sat, 25 Feb 2023 15:57:57 -0800 Subject: [PATCH] fixed tests --- data/battle_scripts_1.s | 4 ++-- src/battle_dynamax.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bec0ca8af9..e1821e9a2f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -417,8 +417,8 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE .4byte BattleScript_EffectTeatime @ EFFECT_TEATIME .4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY - .4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE - .4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP + .4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP + .4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE BattleScript_EffectAttackUpUserAlly: diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 184e07e4ed..06d2611a90 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -79,7 +79,7 @@ bool8 ShouldUseMaxMove(u16 battlerId, u16 baseMove) // return !IsRaidBossUsingRegularMove(battlerId, baseMove); if (gBattleStruct->dynamax.dynamaxTurns[battlerId] > 0) return TRUE; - return TRUE; + return FALSE; } u16 GetMaxMove(u16 battlerId, u16 baseMove)