From 131f08a9d700ccbc464ebd91ca16329910d507bd Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Thu, 16 Jan 2025 17:37:54 -0500
Subject: [PATCH] fixed conflict bugs maybe

---
 public/locales                  | 2 +-
 src/test/moves/instruct.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/locales b/public/locales
index acad8499a4c..6c6f0af398a 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit acad8499a4ca488a9871902de140f635235f309a
+Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85
diff --git a/src/test/moves/instruct.test.ts b/src/test/moves/instruct.test.ts
index 8f4be7c6c98..a2d66d0786d 100644
--- a/src/test/moves/instruct.test.ts
+++ b/src/test/moves/instruct.test.ts
@@ -179,7 +179,7 @@ describe("Moves - Instruct", () => {
     const amoonguss = game.scene.getPlayerPokemon()!;
     game.move.changeMoveset(amoonguss, Moves.SEED_BOMB);
 
-    amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, result: MoveResult.SUCCESS }];
+    amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, targets: [ BattlerIndex.ENEMY ], result: MoveResult.SUCCESS }];
 
     game.doSwitchPokemon(1);
     await game.phaseInterceptor.to("TurnEndPhase", false);