From c61eb6eb63f4434f6706cb0c45e7a750f5c51ff5 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Mon, 30 Sep 2024 23:37:24 -0700
Subject: [PATCH] Safeguarding against weird Instruct interactions

---
 src/data/move.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index 4a8660f744b..55e96486b96 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -2725,12 +2725,12 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
     if (allyMovePhase) {
       const allyMove = allyMovePhase.move.getMove();
       if (allyMove !== move && allyMove.hasAttr(AwaitCombinedPledgeAttr)) {
-        [user, user.getAlly()].forEach(p => p.turnData.combiningPledge = move.id);
+        [user, allyMovePhase.pokemon].forEach(p => p.turnData.combiningPledge = move.id);
 
         // "{userPokemonName} is waiting for {allyPokemonName}'s move..."
         user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", {
           userPokemonName: getPokemonNameWithAffix(user),
-          allyPokemonName: getPokemonNameWithAffix(user.getAlly())
+          allyPokemonName: getPokemonNameWithAffix(allyMovePhase.pokemon)
         }));
 
         // Move the ally's MovePhase (if needed) so that the ally moves next