From bcf6b02a5549e797cb55bb7a02a1cc074a6b55f4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Jan 2020 18:57:23 +0100 Subject: [PATCH] Fix Last Resort --- src/battle_script_commands.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 4c3d5baa74..6199dd17d2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6645,14 +6645,11 @@ bool32 CanUseLastResort(u8 battlerId) { if (gBattleMons[battlerId].moves[i] != MOVE_NONE) knownMovesCount++; - if (gDisableStructs[battlerId].usedMoves & gBitTable[i]) + if (i != gCurrMovePos && gDisableStructs[battlerId].usedMoves & gBitTable[i]) // Increment used move count for all moves except current Last Resort. usedMovesCount++; } - if (knownMovesCount >= 2 && usedMovesCount >= knownMovesCount - 1) - return TRUE; - else - return FALSE; + return (knownMovesCount >= 2 && usedMovesCount >= knownMovesCount - 1); } #define DEFOG_CLEAR(status, structField, battlescript, move)\