From c3f3c0a1b02d0d912b3f52fe3f95d6c23fdd5ad2 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sat, 8 Feb 2025 17:08:55 -0800
Subject: [PATCH] Fix merge issue

---
 src/phases/pokemon-phase.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts
index 9963e63da00..0a53cf5d1da 100644
--- a/src/phases/pokemon-phase.ts
+++ b/src/phases/pokemon-phase.ts
@@ -11,7 +11,7 @@ export abstract class PokemonPhase extends FieldPhase {
   constructor(battlerIndex?: BattlerIndex | number) {
     super();
 
-    battlerIndex = battlerIndex ?? scene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here?
+    battlerIndex = battlerIndex ?? globalScene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here?
     if (battlerIndex === undefined) {
       console.warn("There are no Pokemon on the field!"); // TODO: figure out a suitable fallback behavior
     }