From 1ee9efa2c83d9b70fd8d6ceb680bd2cd4ba3e836 Mon Sep 17 00:00:00 2001
From: pyuk-bot <msaimrkon@gmail.com>
Date: Tue, 12 Aug 2025 18:57:37 -0500
Subject: [PATCH] Always allow canceling a switch with Shed Shell (#11365)

---
 data/items.ts         | 6 +++++-
 sim/dex-conditions.ts | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/items.ts b/data/items.ts
index 95103d8d5c..b9dc733e40 100644
--- a/data/items.ts
+++ b/data/items.ts
@@ -5242,7 +5242,11 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 		},
 		onTrapPokemonPriority: -10,
 		onTrapPokemon(pokemon) {
-			pokemon.trapped = pokemon.maybeTrapped = false;
+			pokemon.trapped = false;
+		},
+		onMaybeTrapPokemonPriority: -10,
+		onMaybeTrapPokemon(pokemon) {
+			pokemon.maybeTrapped = false;
 		},
 		num: 295,
 		gen: 4,
diff --git a/sim/dex-conditions.ts b/sim/dex-conditions.ts
index 643a375191..dd58a299f9 100644
--- a/sim/dex-conditions.ts
+++ b/sim/dex-conditions.ts
@@ -459,6 +459,7 @@ export interface EventMethods {
 	onFractionalPriorityPriority?: number;
 	onHitPriority?: number;
 	onInvulnerabilityPriority?: number;
+	onMaybeTrapPokemonPriority?: number;
 	onModifyAccuracyPriority?: number;
 	onModifyAtkPriority?: number;
 	onModifyCritRatioPriority?: number;