atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Last Resort

Browse source
This commit is contained in:
DizzyEggg 2020-01-18 18:57:23 +01:00
parent b87dac459b
commit bcf6b02a55
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/battle_script_commands.c
View file

@ -6645,14 +6645,11 @@ bool32 CanUseLastResort(u8 battlerId)
{ {
if (gBattleMons[battlerId].moves[i] != MOVE_NONE) if (gBattleMons[battlerId].moves[i] != MOVE_NONE)
knownMovesCount++; 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++; usedMovesCount++;
} }
if (knownMovesCount >= 2 && usedMovesCount >= knownMovesCount - 1) return (knownMovesCount >= 2 && usedMovesCount >= knownMovesCount - 1);
return TRUE;
else
return FALSE;
} }
#define DEFOG_CLEAR(status, structField, battlescript, move)\ #define DEFOG_CLEAR(status, structField, battlescript, move)\