ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

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)
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)\