diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 3db44310c19..12dd1b3e3e1 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -633,7 +633,6 @@ export const pokemonFormChanges: PokemonFormChanges = { [Species.MELOETTA]: [ new SpeciesFormChange(Species.MELOETTA, "aria", "pirouette", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true), new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true), - new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangeActiveTrigger(false), true) ], [Species.GENESECT]: [ new SpeciesFormChange(Species.GENESECT, "", "shock", new SpeciesFormChangeItemTrigger(FormChangeItem.SHOCK_DRIVE)), diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 31de12a837b..3219447f637 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1870,7 +1870,7 @@ export function initSpecies() { ), new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, GrowthRate.SLOW, null, false, true, new PokemonForm("Aria Forme", "aria", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, false, null, true), - new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270), + new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270, false, null, true), ), new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true, new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true), diff --git a/src/locales/ca_ES/pokemon-form.ts b/src/locales/ca_ES/pokemon-form.ts index 922f23fafea..896bb48cf24 100644 --- a/src/locales/ca_ES/pokemon-form.ts +++ b/src/locales/ca_ES/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", + "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/de/pokemon-form.ts b/src/locales/de/pokemon-form.ts index 0aadfc287e0..5c6556f315f 100644 --- a/src/locales/de/pokemon-form.ts +++ b/src/locales/de/pokemon-form.ts @@ -89,6 +89,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Inkarnationsform", "keldeoOrdinary": "Standardform", "meloettaAria": "Gesangsform", + "meloettaPirouette": "Tanzform", // 6G "froakieBattleBond": "Ash-Form", "scatterbugMeadow": "Blumenmeermuster", diff --git a/src/locales/en/pokemon-form.ts b/src/locales/en/pokemon-form.ts index 922f23fafea..896bb48cf24 100644 --- a/src/locales/en/pokemon-form.ts +++ b/src/locales/en/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", + "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/es/pokemon-form.ts b/src/locales/es/pokemon-form.ts index 7098ba597f7..3ca25208753 100644 --- a/src/locales/es/pokemon-form.ts +++ b/src/locales/es/pokemon-form.ts @@ -87,7 +87,8 @@ export const pokemonForm: SimpleTranslationEntries = { "thundurusIncarnate": "Incarnate", "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", - "meloettaAria": "Aria", + "meloettaAria": "Lírica", + "meloettaPirouette": "Danza", // 6G "froakieBattleBond": "Fuerte Afecto", "scatterbugMeadow": "Floral", diff --git a/src/locales/fr/pokemon-form.ts b/src/locales/fr/pokemon-form.ts index 51158356ef3..9694f04a38e 100644 --- a/src/locales/fr/pokemon-form.ts +++ b/src/locales/fr/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Avatar", "keldeoOrdinary": "Normal", "meloettaAria": "Chant", + "meloettaPirouette": "Danse", // 6G "froakieBattleBond": "Synergie", "scatterbugMeadow": "Floraison", diff --git a/src/locales/it/pokemon-form.ts b/src/locales/it/pokemon-form.ts index d8bf9eeaab2..03b854cfa6c 100644 --- a/src/locales/it/pokemon-form.ts +++ b/src/locales/it/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnazione", "keldeoOrdinary": "Normale", "meloettaAria": "Canto", + "meloettaPirouette": "Danza", // 6G "froakieBattleBond": "Morfosintonia", "scatterbugMeadow": "Giardinfiore", diff --git a/src/locales/ja/pokemon-form.ts b/src/locales/ja/pokemon-form.ts index 922f23fafea..896bb48cf24 100644 --- a/src/locales/ja/pokemon-form.ts +++ b/src/locales/ja/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", + "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/ko/pokemon-form.ts b/src/locales/ko/pokemon-form.ts index 9f6b9b08408..2e121a75dd7 100644 --- a/src/locales/ko/pokemon-form.ts +++ b/src/locales/ko/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "화신폼", "keldeoOrdinary": "평상시 모습", "meloettaAria": "보이스폼", + "meloettaPirouette": "스텝폼", // 6G "froakieBattleBond": "유대변화", "scatterbugMeadow": "화원의 모양", diff --git a/src/locales/pt_BR/pokemon-form.ts b/src/locales/pt_BR/pokemon-form.ts index 062fc165ae0..6d833673555 100644 --- a/src/locales/pt_BR/pokemon-form.ts +++ b/src/locales/pt_BR/pokemon-form.ts @@ -89,6 +89,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", + "meloettaPirouette": "Pirueta", // 6G "froakieBattleBond": "Vínculo de Batalha", "scatterbugMeadow": "Prado", diff --git a/src/locales/zh_CN/pokemon-form.ts b/src/locales/zh_CN/pokemon-form.ts index ea0c611e5aa..4a8860ec84e 100644 --- a/src/locales/zh_CN/pokemon-form.ts +++ b/src/locales/zh_CN/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "化身", "keldeoOrdinary": "通常", "meloettaAria": "歌声", + "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "牵绊变身", "scatterbugMeadow": "花园花纹", diff --git a/src/locales/zh_TW/pokemon-form.ts b/src/locales/zh_TW/pokemon-form.ts index 55bb13946b7..d73fb70db21 100644 --- a/src/locales/zh_TW/pokemon-form.ts +++ b/src/locales/zh_TW/pokemon-form.ts @@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", + "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow",