From b1b1bf7f121ed89aa332123dce29dbdb866e4d95 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 22 Feb 2020 18:43:16 +0100 Subject: [PATCH] Fix two turn moves not activating moxie --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b7e7bfc29..ecc255278 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6595,7 +6595,7 @@ static bool32 HasAttackerFaintedTarget(void) && gBattleStruct->moveTarget[gBattlerAttacker] == gBattlerTarget && gBattlerTarget != gBattlerAttacker && gCurrentTurnActionNumber == GetBattlerTurnOrderNum(gBattlerAttacker) - && gChosenMove == gChosenMoveByBattler[gBattlerAttacker]) + && (gChosenMove == gChosenMoveByBattler[gBattlerAttacker] || gChosenMove == gBattleMons[gBattlerAttacker].moves[gChosenMovePos])) return TRUE; else return FALSE;