diff --git a/README.md b/README.md index e85c1f552d5..ac4ed05b0ae 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to - Pokémon Scarlet/Violet - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music) - Lmz (Custom Jungle biome music) - - Andr06 (Custom Slum biome music) + - Andr06 (Custom Slum and Sea biome music) ### 🎵 Sound Effects - Pokémon Emerald diff --git a/public/audio/bgm/sea.mp3 b/public/audio/bgm/sea.mp3 index 8bdaaa696f1..147dad0960d 100644 Binary files a/public/audio/bgm/sea.mp3 and b/public/audio/bgm/sea.mp3 differ diff --git a/src/field/arena.ts b/src/field/arena.ts index bef0934542a..8b1996c27da 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -663,7 +663,7 @@ export class Arena { case Biome.FOREST: return 4.294; case Biome.SEA: - return 1.672; + return 0.024; case Biome.SWAMP: return 4.461; case Biome.BEACH: diff --git a/src/locales/de/bgm-name.ts b/src/locales/de/bgm-name.ts index efac829dd48..6df4c911230 100644 --- a/src/locales/de/bgm-name.ts +++ b/src/locales/de/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD Erkundungsteam Himmel Himmelsgipfel-Prärie", "power_plant": "PMD Erkundungsteam Himmel Weite Ampere-Ebene", "ruins": "PMD Erkundungsteam Himmel Tiefes Ruinenverlies", - "sea": "PMD Erkundungsteam Himmel Salzwasserhöhle", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD Erkundungsteam Himmel Himmelsgipfel-Schneefeld", diff --git a/src/locales/en/bgm-name.ts b/src/locales/en/bgm-name.ts index 761fe1ce5ff..01fb86b281d 100644 --- a/src/locales/en/bgm-name.ts +++ b/src/locales/en/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD EoS Sky Peak Prairie", "power_plant": "PMD EoS Far Amp Plains", "ruins": "PMD EoS Deep Sealed Ruin", - "sea": "PMD EoS Brine Cave", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD EoS Sky Peak Snowfield", diff --git a/src/locales/es/bgm-name.ts b/src/locales/es/bgm-name.ts index 2edaa17061a..ab6de0b81b5 100644 --- a/src/locales/es/bgm-name.ts +++ b/src/locales/es/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD EoS - Pradera de la Cumbre del Cielo", "power_plant": "PMD EoS - Pradera Destello", "ruins": "PMD EoS - Sima Hermética", - "sea": "PMD EoS - Cueva Aguamar", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD EoS - Campo nevado de la Cumbre del Cielo", diff --git a/src/locales/fr/bgm-name.ts b/src/locales/fr/bgm-name.ts index fec31be5d47..c6453a919cf 100644 --- a/src/locales/fr/bgm-name.ts +++ b/src/locales/fr/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PDM EdS - Pic Céleste (prairie)", "power_plant": "PDM EdS - Plaines Élek", "ruins": "PDM EdS - Ruine Scellée", - "sea": "PDM EdS - Caverne Saline", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PDM EdS - Pic Céleste (plaine enneigée)", diff --git a/src/locales/it/bgm-name.ts b/src/locales/it/bgm-name.ts index 761fe1ce5ff..01fb86b281d 100644 --- a/src/locales/it/bgm-name.ts +++ b/src/locales/it/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD EoS Sky Peak Prairie", "power_plant": "PMD EoS Far Amp Plains", "ruins": "PMD EoS Deep Sealed Ruin", - "sea": "PMD EoS Brine Cave", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD EoS Sky Peak Snowfield", diff --git a/src/locales/ko/bgm-name.ts b/src/locales/ko/bgm-name.ts index b0edb15afda..69697b07774 100644 --- a/src/locales/ko/bgm-name.ts +++ b/src/locales/ko/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "불가사의 던전 하늘의 탐험대 하늘 꼭대기 초원", "power_plant": "불가사의 던전 하늘의 탐험대 일렉트릭 평원", "ruins": "불가사의 던전 하늘의 탐험대 봉인의 암반", - "sea": "불가사의 던전 하늘의 탐험대 바닷가 동굴", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "불가사의 던전 하늘의 탐험대 하늘 꼭대기 설원", diff --git a/src/locales/pt_BR/bgm-name.ts b/src/locales/pt_BR/bgm-name.ts index d25cf9a12b5..ae2756e74be 100644 --- a/src/locales/pt_BR/bgm-name.ts +++ b/src/locales/pt_BR/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD EoS Sky Peak Prairie", "power_plant": "PMD EoS Far Amp Plains", "ruins": "PMD EoS Deep Sealed Ruin", - "sea": "PMD EoS Brine Cave", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD EoS Sky Peak Snowfield", diff --git a/src/locales/zh_CN/bgm-name.ts b/src/locales/zh_CN/bgm-name.ts index 44321e8cc0e..71db565eb05 100644 --- a/src/locales/zh_CN/bgm-name.ts +++ b/src/locales/zh_CN/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "空之探险队「天空顶端(草原)」", "power_plant": "空之探险队「电气平原 深处」", "ruins": "空之探险队「封印岩地 深处」", - "sea": "空之探险队「石滩洞窟」", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - 海底", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "空之探险队「天空顶端(雪山)」", diff --git a/src/locales/zh_TW/bgm-name.ts b/src/locales/zh_TW/bgm-name.ts index 761fe1ce5ff..01fb86b281d 100644 --- a/src/locales/zh_TW/bgm-name.ts +++ b/src/locales/zh_TW/bgm-name.ts @@ -110,7 +110,7 @@ export const bgmName: SimpleTranslationEntries = { "plains": "PMD EoS Sky Peak Prairie", "power_plant": "PMD EoS Far Amp Plains", "ruins": "PMD EoS Deep Sealed Ruin", - "sea": "PMD EoS Brine Cave", + "sea": "Andr06 - Marine Mystique", // Name defined by the composer "seabed": "Firel - Seabed", // The composer thinks about a more creative name "slum": "Andr06 - Sneaky Snom", // Name defined by the composer "snowy_forest": "PMD EoS Sky Peak Snowfield",