ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 03:58:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Sticky Hold not being negated by Gastro Acid when stealing and switching items

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-10-02 14:47:38 -03:00
parent b322a42fea
commit 9aee8cbea5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_script_commands.c
View File

@ -3067,7 +3067,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
else if (gBattleMons[gBattlerTarget].item else if (gBattleMons[gBattlerTarget].item
&& gBattleMons[gBattlerTarget].ability == ABILITY_STICKY_HOLD) && GetBattlerAbility(gBattlerTarget) == ABILITY_STICKY_HOLD)
{ {
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_NoItemSteal; gBattlescriptCurrInstr = BattleScript_NoItemSteal;
@ -11615,7 +11615,7 @@ static void Cmd_tryswapitems(void) // trick
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
} }
// check if ability prevents swapping // check if ability prevents swapping
else if (gBattleMons[gBattlerTarget].ability == ABILITY_STICKY_HOLD) else if (GetBattlerAbility(gBattlerTarget) == ABILITY_STICKY_HOLD)
{ {
gBattlescriptCurrInstr = BattleScript_StickyHoldActivates; gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
gLastUsedAbility = gBattleMons[gBattlerTarget].ability; gLastUsedAbility = gBattleMons[gBattlerTarget].ability;