From dae3545482a4323337bd7b8d31c1855771698973 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 14 Jan 2025 14:57:36 -0800
Subject: [PATCH] Fix merge issues

---
 src/data/move.ts         | 12 ++++++------
 src/phases/move-phase.ts |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index a4a78725b1a..b54613ca471 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6491,10 +6491,10 @@ class CallMoveAttr extends OverrideMoveEffectAttr {
       ? moveTargets.targets
       : [ this.hasTarget ? target.getBattlerIndex() : moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ]; // account for Mirror Move having a target already
     user.getMoveQueue().push({ move: move.id, targets: targets, virtual: true, ignorePP: true });
-    user.scene.unshiftPhase(new MovePhase(user.scene, user, targets, new PokemonMove(move.id, 0, 0, true), true, true));
+    globalScene.unshiftPhase(new MovePhase(user, targets, new PokemonMove(move.id, 0, 0, true), true, true));
 
-    await Promise.resolve(initMoveAnim(user.scene, move.id).then(() => {
-      loadMoveAnimAssets(user.scene, [ move.id ], true);
+    await Promise.resolve(initMoveAnim(move.id).then(() => {
+      loadMoveAnimAssets([ move.id ], true);
     }));
     return true;
   }
@@ -6574,7 +6574,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr {
       // includeParty will be true for Assist, false for Sleep Talk
       let allies: Pokemon[];
       if (this.includeParty) {
-        allies = user.isPlayer() ? user.scene.getPlayerParty().filter(p => p !== user) : user.scene.getEnemyParty().filter(p => p !== user);
+        allies = user.isPlayer() ? globalScene.getPlayerParty().filter(p => p !== user) : globalScene.getEnemyParty().filter(p => p !== user);
       } else {
         allies = [ user ];
       }
@@ -7025,7 +7025,7 @@ export class CopyMoveAttr extends CallMoveAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
     this.hasTarget = this.mirrorMove;
-    const lastMove = this.mirrorMove ? target.getLastXMoves()[0].move : user.scene.currentBattle.lastMove;
+    const lastMove = this.mirrorMove ? target.getLastXMoves()[0].move : globalScene.currentBattle.lastMove;
     return super.apply(user, target, allMoves[lastMove], args);
   }
 
@@ -7034,7 +7034,7 @@ export class CopyMoveAttr extends CallMoveAttr {
       if (this.mirrorMove) {
         return target.getMoveHistory().length !== 0;
       } else {
-        const lastMove = user.scene.currentBattle.lastMove;
+        const lastMove = globalScene.currentBattle.lastMove;
         return lastMove !== undefined && !this.invalidMoves.includes(lastMove);
       }
     };
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index 960f73710b3..5330540c8b2 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -323,7 +323,7 @@ export class MovePhase extends BattlePhase {
     if (!allMoves[this.move.moveId].hasAttr(CopyMoveAttr)) {
       // The last move used is unaffected by moves that fail
       if (success) {
-        this.scene.currentBattle.lastMove = this.move.moveId;
+        globalScene.currentBattle.lastMove = this.move.moveId;
       }
     }