Remove unused duplicate ribbon sprites

I already excluded them from the item atlas in my previous commit.
Revert "[Balance] [QoL] Allow Pirouette Meloetta to be selectable on starter …" (#3552 )
2025-07-27 10:42:25 +02:00 · 2024-08-14 21:33:49 -05:00 · 2024-08-15 03:27:45 +01:00 · 2024-08-14 20:58:20 -05:00
26 changed files with 4235 additions and 4434 deletions
--- a/public/images/items.json
+++ b/public/images/items.json
--- a/public/images/items.png
+++ b/public/images/items.png
--- a/public/images/items/power_herb.png
+++ b/public/images/items/power_herb.png
--- a/public/images/items/ribbon-gen1.png
+++ b/public/images/items/ribbon-gen1.png
--- a/public/images/items/ribbon-gen2.png
+++ b/public/images/items/ribbon-gen2.png
--- a/public/images/items/ribbon-gen3.png
+++ b/public/images/items/ribbon-gen3.png
--- a/public/images/items/ribbon-gen4.png
+++ b/public/images/items/ribbon-gen4.png
--- a/public/images/items/ribbon-gen5.png
+++ b/public/images/items/ribbon-gen5.png
--- a/public/images/items/ribbon-gen6.png
+++ b/public/images/items/ribbon-gen6.png
--- a/public/images/items/ribbon-gen7.png
+++ b/public/images/items/ribbon-gen7.png
--- a/public/images/items/ribbon-gen8.png
+++ b/public/images/items/ribbon-gen8.png
--- a/public/images/items/ribbon-gen9.png
+++ b/public/images/items/ribbon-gen9.png
--- a/public/images/items/white_herb.png
+++ b/public/images/items/white_herb.png
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@ -630,6 +630,7 @@ 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)),
--- 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, 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 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),
--- a/src/locales/ca_ES/pokemon-form.ts
+++ b/src/locales/ca_ES/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
  "meloettaAria": "Aria",
-  "meloettaPirouette": "Pirouette",
  // 6G
  "froakieBattleBond": "Battle Bond",
  "scatterbugMeadow": "Meadow",
--- a/src/locales/de/pokemon-form.ts
+++ b/src/locales/de/pokemon-form.ts
@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Inkarnationsform",
  "keldeoOrdinary": "Standardform",
  "meloettaAria": "Gesangsform",
-  "meloettaPirouette": "Tanzform",
  // 6G
  "froakieBattleBond": "Ash-Form",
  "scatterbugMeadow": "Blumenmeermuster",
--- a/src/locales/en/pokemon-form.ts
+++ b/src/locales/en/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
  "meloettaAria": "Aria",
-  "meloettaPirouette": "Pirouette",
  // 6G
  "froakieBattleBond": "Battle Bond",
  "scatterbugMeadow": "Meadow",
--- a/src/locales/es/pokemon-form.ts
+++ b/src/locales/es/pokemon-form.ts
@ -87,8 +87,7 @@ export const pokemonForm: SimpleTranslationEntries = {
  "thundurusIncarnate": "Incarnate",
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
-  "meloettaAria": "Lírica",
-  "meloettaPirouette": "Danza",
+  "meloettaAria": "Aria",
  // 6G
  "froakieBattleBond": "Fuerte Afecto",
  "scatterbugMeadow": "Floral",
--- a/src/locales/fr/pokemon-form.ts
+++ b/src/locales/fr/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Avatar",
  "keldeoOrdinary": "Normal",
  "meloettaAria": "Chant",
-  "meloettaPirouette": "Danse",
  // 6G
  "froakieBattleBond": "Synergie",
  "scatterbugMeadow": "Floraison",
--- a/src/locales/it/pokemon-form.ts
+++ b/src/locales/it/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnazione",
  "keldeoOrdinary": "Normale",
  "meloettaAria": "Canto",
-  "meloettaPirouette": "Danza",
  // 6G
  "froakieBattleBond": "Morfosintonia",
  "scatterbugMeadow": "Giardinfiore",
--- a/src/locales/ja/pokemon-form.ts
+++ b/src/locales/ja/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
  "meloettaAria": "Aria",
-  "meloettaPirouette": "Pirouette",
  // 6G
  "froakieBattleBond": "Battle Bond",
  "scatterbugMeadow": "Meadow",
--- a/src/locales/ko/pokemon-form.ts
+++ b/src/locales/ko/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "화신폼",
  "keldeoOrdinary": "평상시 모습",
  "meloettaAria": "보이스폼",
-  "meloettaPirouette": "스텝폼",
  // 6G
  "froakieBattleBond": "유대변화",
  "scatterbugMeadow": "화원의 모양",
--- a/src/locales/pt_BR/pokemon-form.ts
+++ b/src/locales/pt_BR/pokemon-form.ts
@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
  "meloettaAria": "Aria",
-  "meloettaPirouette": "Pirueta",
  // 6G
  "froakieBattleBond": "Vínculo de Batalha",
  "scatterbugMeadow": "Prado",
--- a/src/locales/zh_CN/pokemon-form.ts
+++ b/src/locales/zh_CN/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "化身",
  "keldeoOrdinary": "通常",
  "meloettaAria": "歌声",
-  "meloettaPirouette": "Pirouette",
  // 6G
  "froakieBattleBond": "牵绊变身",
  "scatterbugMeadow": "花园花纹",
--- a/src/locales/zh_TW/pokemon-form.ts
+++ b/src/locales/zh_TW/pokemon-form.ts
@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
  "landorusIncarnate": "Incarnate",
  "keldeoOrdinary": "Ordinary",
  "meloettaAria": "Aria",
-  "meloettaPirouette": "Pirouette",
  // 6G
  "froakieBattleBond": "Battle Bond",
  "scatterbugMeadow": "Meadow",
Author	SHA1	Message	Date
Madmadness65	4e74007af6	Remove unused duplicate ribbon sprites I already excluded them from the item atlas in my previous commit.	2024-08-14 21:33:49 -05:00
Frederico Santos	0018650688	Revert "[Balance] [QoL] Allow Pirouette Meloetta to be selectable on starter …" (#3552 ) This reverts commit `16b9df2d15`.	2024-08-15 03:27:45 +01:00
Madmadness65	f6d9a11044	Compress item atlas Also resized the Herb graphics to be 32x32 like the rest of the items.	2024-08-14 20:58:20 -05:00