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

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 GitHub
commit dc63d096f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -5342,7 +5342,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);