From a4bff58a99f6d689385e5ea692f10f0c9ace2d0d Mon Sep 17 00:00:00 2001
From: TaylorLeLievre <jackrabbit5567@gmail.com>
Date: Sun, 25 Aug 2024 12:22:19 -0400
Subject: [PATCH] Fix merge conflicts

---
 src/phases/return-phase.ts        | 3 +++
 src/phases/switch-summon-phase.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts
index 19c73816b36..a85017fbedd 100644
--- a/src/phases/return-phase.ts
+++ b/src/phases/return-phase.ts
@@ -1,4 +1,5 @@
 import BattleScene from "#app/battle-scene";
+import { applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr } from "#app/data/ability.js";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { SwitchSummonPhase } from "./switch-summon-phase";
 
@@ -8,6 +9,8 @@ export class ReturnPhase extends SwitchSummonPhase {
   }
 
   switchAndSummon(): void {
+    this.lastPokemon = this.getPokemon();
+    applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon);
     this.end();
   }
 
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 525f74e896f..5b3d2f560d8 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -18,7 +18,7 @@ export class SwitchSummonPhase extends SummonPhase {
   private doReturn: boolean;
   private batonPass: boolean;
 
-  private lastPokemon: Pokemon;
+  protected lastPokemon: Pokemon;
 
   /**
      * Constructor for creating a new SwitchSummonPhase