From 3d9cb539c771c3d4ea8bdeab0d3d2a819d2682b5 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Tue, 19 Aug 2025 02:30:12 +0200
Subject: [PATCH] [Bug][P1] Fix trapping abilities crashing game on switch out
 (#6293)

Move trapped messages into a .then() statement
---
 src/phases/command-phase.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index ff9ee7cc197..87c33a4334b 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -474,20 +474,21 @@ export class CommandPhase extends FieldPhase {
     }
     if (trappedAbMessages.length > 0) {
       if (isSwitch) {
-        globalScene.ui.setMode(UiMode.MESSAGE);
+        globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+          globalScene.ui.showText(
+            trappedAbMessages[0],
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              if (isSwitch) {
+                globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+              }
+            },
+            null,
+            true,
+          );
+        });
       }
-      globalScene.ui.showText(
-        trappedAbMessages[0],
-        null,
-        () => {
-          globalScene.ui.showText("", 0);
-          if (isSwitch) {
-            globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          }
-        },
-        null,
-        true,
-      );
     } else {
       const trapTag = playerPokemon.getTag(TrappedTag);
       const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER);