From 784035b6f5bb16360d3b0da45aae57acae3c59d1 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Thu, 27 Jun 2024 21:55:09 -0700
Subject: [PATCH 1/2] [Unittest] Prevent berries from interfering with Dry Skin
 tests (#2679)

---
 src/test/abilities/dry_skin.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/abilities/dry_skin.test.ts b/src/test/abilities/dry_skin.test.ts
index e74155b8bdf4..bfb8f45a11f9 100644
--- a/src/test/abilities/dry_skin.test.ts
+++ b/src/test/abilities/dry_skin.test.ts
@@ -28,7 +28,7 @@ describe("Abilities - Dry Skin", () => {
     vi.spyOn(overrides, "OPP_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.DRY_SKIN);
     vi.spyOn(overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
     vi.spyOn(overrides, "OPP_SPECIES_OVERRIDE", "get").mockReturnValue(Species.CHARMANDER);
-    vi.spyOn(overrides, "ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.BALL_FETCH);
+    vi.spyOn(overrides, "ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.UNNERVE);
     vi.spyOn(overrides, "STARTER_SPECIES_OVERRIDE", "get").mockReturnValue(Species.CHANDELURE);
   });
 

From d4856c34f1569863b012613185a691beaf88fc2b Mon Sep 17 00:00:00 2001
From: Madmadness65 <blaze.the.fireman@gmail.com>
Date: Thu, 27 Jun 2024 23:56:41 -0500
Subject: [PATCH 2/2] Fix minor BGM title typos

"Marowak Dojo" was missing the "k" in their names.
---
 src/locales/en/bgm-name.ts    | 2 +-
 src/locales/it/bgm-name.ts    | 2 +-
 src/locales/pt_BR/bgm-name.ts | 2 +-
 src/locales/zh_TW/bgm-name.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/locales/en/bgm-name.ts b/src/locales/en/bgm-name.ts
index b26909b33715..77ebb69df326 100644
--- a/src/locales/en/bgm-name.ts
+++ b/src/locales/en/bgm-name.ts
@@ -92,7 +92,7 @@ export const bgmName: SimpleTranslationEntries = {
   "cave": "PMD EoS Sky Peak Cave",
   "construction_site": "PMD EoS Boulder Quarry",
   "desert": "PMD EoS Northern Desert",
-  "dojo": "PMD EoS Marowa Dojo",
+  "dojo": "PMD EoS Marowak Dojo",
   "end": "PMD RTDX Sky Tower",
   "factory": "PMD EoS Concealed Ruins",
   "fairy_cave": "PMD EoS Star Cave",
diff --git a/src/locales/it/bgm-name.ts b/src/locales/it/bgm-name.ts
index b26909b33715..77ebb69df326 100644
--- a/src/locales/it/bgm-name.ts
+++ b/src/locales/it/bgm-name.ts
@@ -92,7 +92,7 @@ export const bgmName: SimpleTranslationEntries = {
   "cave": "PMD EoS Sky Peak Cave",
   "construction_site": "PMD EoS Boulder Quarry",
   "desert": "PMD EoS Northern Desert",
-  "dojo": "PMD EoS Marowa Dojo",
+  "dojo": "PMD EoS Marowak Dojo",
   "end": "PMD RTDX Sky Tower",
   "factory": "PMD EoS Concealed Ruins",
   "fairy_cave": "PMD EoS Star Cave",
diff --git a/src/locales/pt_BR/bgm-name.ts b/src/locales/pt_BR/bgm-name.ts
index b26909b33715..77ebb69df326 100644
--- a/src/locales/pt_BR/bgm-name.ts
+++ b/src/locales/pt_BR/bgm-name.ts
@@ -92,7 +92,7 @@ export const bgmName: SimpleTranslationEntries = {
   "cave": "PMD EoS Sky Peak Cave",
   "construction_site": "PMD EoS Boulder Quarry",
   "desert": "PMD EoS Northern Desert",
-  "dojo": "PMD EoS Marowa Dojo",
+  "dojo": "PMD EoS Marowak Dojo",
   "end": "PMD RTDX Sky Tower",
   "factory": "PMD EoS Concealed Ruins",
   "fairy_cave": "PMD EoS Star Cave",
diff --git a/src/locales/zh_TW/bgm-name.ts b/src/locales/zh_TW/bgm-name.ts
index b26909b33715..77ebb69df326 100644
--- a/src/locales/zh_TW/bgm-name.ts
+++ b/src/locales/zh_TW/bgm-name.ts
@@ -92,7 +92,7 @@ export const bgmName: SimpleTranslationEntries = {
   "cave": "PMD EoS Sky Peak Cave",
   "construction_site": "PMD EoS Boulder Quarry",
   "desert": "PMD EoS Northern Desert",
-  "dojo": "PMD EoS Marowa Dojo",
+  "dojo": "PMD EoS Marowak Dojo",
   "end": "PMD RTDX Sky Tower",
   "factory": "PMD EoS Concealed Ruins",
   "fairy_cave": "PMD EoS Star Cave",