Hold Hands fix

Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.
This commit is contained in:
Papa Cancer 2019-04-06 22:23:34 +01:00
parent f8713f9c15
commit fd6dc98045

View File

@ -2851,7 +2851,7 @@ BattleScript_EffectDoNothing::
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectHoldHands: BattleScript_EffectHoldHands:
jumpifsideaffecting BS_TARGET, SIDE_STATUS_CRAFTY_SHIELD, BattleScript_ButItFailed jumpifsideaffecting BS_TARGET, SIDE_STATUS_CRAFTY_SHIELD, BattleScript_ButItFailed
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_DOUBLE, BattleScript_ButItFailed jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_ButItFailed
attackanimation attackanimation
waitanimation waitanimation
goto BattleScript_MoveEnd goto BattleScript_MoveEnd