From 8feaa8c86b967e2acec3f988f1b881d2bd55f85f Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 18 Aug 2025 22:33:48 -0500
Subject: [PATCH] Make substitute use the move tag

---
 src/data/battler-tags.ts             | 2 +-
 test/battler-tags/substitute.test.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index f4eedbe6702..8f1cddb9e38 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -3058,7 +3058,7 @@ export class SubstituteTag extends SerializableBattlerTag {
   constructor(sourceMove: MoveId, sourceId: number) {
     super(
       BattlerTagType.SUBSTITUTE,
-      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT],
+      [BattlerTagLapseType.MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT],
       0,
       sourceMove,
       sourceId,
diff --git a/test/battler-tags/substitute.test.ts b/test/battler-tags/substitute.test.ts
index a2ff539d2a8..d1e91da4fb7 100644
--- a/test/battler-tags/substitute.test.ts
+++ b/test/battler-tags/substitute.test.ts
@@ -142,7 +142,7 @@ describe("BattlerTag - SubstituteTag", () => {
       vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
     });
 
-    it("PRE_MOVE lapse triggers pre-move animation", async () => {
+    it("MOVE lapse triggers pre-move animation", async () => {
       const subject = new SubstituteTag(MoveId.SUBSTITUTE, mockPokemon.id);
 
       vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
@@ -154,7 +154,7 @@ describe("BattlerTag - SubstituteTag", () => {
 
       vi.spyOn((mockPokemon.scene as BattleScene).phaseManager, "queueMessage").mockReturnValue();
 
-      expect(subject.lapse(mockPokemon, BattlerTagLapseType.PRE_MOVE)).toBeTruthy();
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.MOVE)).toBeTruthy();
 
       expect(subject.sourceInFocus).toBeTruthy();
       expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);