From c300f57b06446aaefcf55048165e73c3d99e23a4 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sat, 31 May 2025 18:45:27 -0700
Subject: [PATCH] [Test] `MoveHelper#changeMoveset` disables moveset overrides

---
 test/testUtils/helpers/moveHelper.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts
index b3cdffeb636..4dec3224414 100644
--- a/test/testUtils/helpers/moveHelper.ts
+++ b/test/testUtils/helpers/moveHelper.ts
@@ -146,10 +146,23 @@ export class MoveHelper extends GameManagerHelper {
   /**
    * Changes a pokemon's moveset to the given move(s).
    * Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset).
+   *
+   * **Note**: Will disable the moveset override matching the pokemon's party.
    * @param pokemon - The {@linkcode Pokemon} being modified
    * @param moveset - The {@linkcode Moves} (single or array) to change the Pokemon's moveset to
    */
   public changeMoveset(pokemon: Pokemon, moveset: Moves | Moves[]): void {
+    if (pokemon.isPlayer()) {
+      if ([Overrides.MOVESET_OVERRIDE].flat().length > 0) {
+        vi.spyOn(Overrides, "MOVESET_OVERRIDE", "get").mockReturnValue([]);
+        console.warn("Player moveset override disabled due to use of `game.move.changeMoveset`!");
+      }
+    } else {
+      if ([Overrides.OPP_MOVESET_OVERRIDE].flat().length > 0) {
+        vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([]);
+        console.warn("Enemy moveset override disabled due to use of `game.move.changeMoveset`!");
+      }
+    }
     if (!Array.isArray(moveset)) {
       moveset = [moveset];
     }