From 7647941ec4813889f99605888a5b90f78648bb94 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 30 Aug 2019 12:51:56 +0200 Subject: [PATCH] Fix Truant in new switch in system --- src/battle_script_commands.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ceca5070e6..c0e6d3f2a8 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5438,7 +5438,9 @@ static void atk52_switchineffects(void) { // There is a hack here to ensure the truant counter will be 0 when the battler's next turn starts. // The truant counter is not updated in the case where a mon switches in after a lost judgement in the battle arena. - if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantSwitchInHack) + if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT + && gCurrentActionFuncId != B_ACTION_USE_MOVE + && !gDisableStructs[gActiveBattler].truantSwitchInHack) gDisableStructs[gActiveBattler].truantCounter = 1; gDisableStructs[gActiveBattler].truantSwitchInHack = 0;