Merge branch 'pagefaultgames:main' into disguise-refactor

DayKev · Jun 28, 2024 · 97f5780 · 97f5780
2 parents 56325b2 + d4856c3
commit 97f5780
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/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);
   });