From cce68f6ef706500bfb5c776a37f40bf9503c4639 Mon Sep 17 00:00:00 2001
From: allen925 <62000482+allen925@users.noreply.github.com>
Date: Tue, 30 Jul 2024 08:40:25 -0700
Subject: [PATCH] [Bug] Fix sprite problem after player pokemon faint after
 enemy pokemon before/after trainer fight (#3211)

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

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 0ac3f9c6245..0855a86bffa 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1140,7 +1140,7 @@ export default class BattleScene extends SceneBase {
       }
       if (resetArenaState) {
         this.arena.resetArenaEffects();
-        playerField.forEach((_, p) => this.unshiftPhase(new ReturnPhase(this, p)));
+        playerField.forEach((_, p) => this.pushPhase(new ReturnPhase(this, p)));
 
         for (const pokemon of this.getParty()) {
           // Only trigger form change when Eiscue is in Noice form
@@ -1153,7 +1153,7 @@ export default class BattleScene extends SceneBase {
           applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
         }
 
-        this.unshiftPhase(new ShowTrainerPhase(this));
+        this.pushPhase(new ShowTrainerPhase(this));
       }
 
       for (const pokemon of this.getParty()) {