ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

add check for Gorilla Tactics when resetting choicedMove from knock off (#2854)

Browse Source
This commit is contained in:
ghoulslash 2023-03-26 15:03:56 -04:00 committed by Eduardo Quezada
parent e176fd285e
commit 69f58adbb2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_script_commands.c
View File

@ -5304,7 +5304,8 @@ static bool32 TryKnockOffBattleScript(u32 battlerDef)
gLastUsedItem = gBattleMons[battlerDef].item; gLastUsedItem = gBattleMons[battlerDef].item;
gBattleMons[battlerDef].item = 0; gBattleMons[battlerDef].item = 0;
gBattleStruct->choicedMove[battlerDef] = 0; if (gBattleMons[battlerDef].ability != ABILITY_GORILLA_TACTICS)
gBattleStruct->choicedMove[battlerDef] = 0;
gWishFutureKnock.knockedOffMons[side] |= gBitTable[gBattlerPartyIndexes[battlerDef]]; gWishFutureKnock.knockedOffMons[side] |= gBitTable[gBattlerPartyIndexes[battlerDef]];
CheckSetUnburden(battlerDef); CheckSetUnburden(battlerDef);