From c9f4cf69891854b377596d97b918216fe55f9fe7 Mon Sep 17 00:00:00 2001 From: Madi Simpson Date: Fri, 3 May 2024 13:32:29 -0700 Subject: [PATCH] moves: actually properly check for trapped tag here --- src/data/move.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index d3eda1e1495..437dba54b97 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2956,7 +2956,8 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { if (!player && !user.scene.currentBattle.battleType) { if (this.batonPass) return false; - if (move.category == MoveCategory.STATUS && !user.hasAbilityWithAttr(RunSuccessAbAttr)) + // Don't let wild opponents flee with Teleport unless they have a workaround ability. + if (user.getTag(BattlerTagType.TRAPPED) && move.id == Moves.TELEPORT && !user.hasAbilityWithAttr(RunSuccessAbAttr)) return false; // Don't allow wild opponents to flee on the boss stage since it can ruin a run early on if (!(user.scene.currentBattle.waveIndex % 10))