From fd6dc98045deb763f284759ce6da2242c2aa7ff4 Mon Sep 17 00:00:00 2001 From: Papa Cancer Date: Sat, 6 Apr 2019 22:23:34 +0100 Subject: [PATCH] Hold Hands fix Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail. --- data/battle_scripts_1.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8613582b06..15d5f09faa 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2851,7 +2851,7 @@ BattleScript_EffectDoNothing:: goto BattleScript_MoveEnd BattleScript_EffectHoldHands: 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 waitanimation goto BattleScript_MoveEnd