src/battle-scene.ts

@@ -1111,8 +1111,6 @@ export default class BattleScene extends SceneBase {
     case Species.FLOETTE:
     case Species.FLORGES:
     case Species.FURFROU:
-    case Species.PUMPKABOO:
-    case Species.GOURGEIST:
     case Species.ORICORIO:
     case Species.MAGEARNA:
     case Species.ZARUDE:

src/data/pokemon-forms.ts

@@ -66,7 +66,7 @@ export enum FormChangeItem {
   HARD_METEORITE,
   SMOOTH_METEORITE,
   ADAMANT_CRYSTAL,
-  LUSTROUS_GLOBE,
+  LUSTROUS_ORB,
   GRISEOUS_CORE,
   REVEAL_GLASS,
   GRACIDEA,
@@ -520,7 +520,7 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.DIALGA, "", SpeciesFormKey.ORIGIN, new SpeciesFormChangeItemTrigger(FormChangeItem.ADAMANT_CRYSTAL))
   ],
   [Species.PALKIA]: [
-    new SpeciesFormChange(Species.PALKIA, "", SpeciesFormKey.ORIGIN, new SpeciesFormChangeItemTrigger(FormChangeItem.LUSTROUS_GLOBE))
+    new SpeciesFormChange(Species.PALKIA, "", SpeciesFormKey.ORIGIN, new SpeciesFormChangeItemTrigger(FormChangeItem.LUSTROUS_ORB))
   ],
   [Species.GIRATINA]: [
     new SpeciesFormChange(Species.GIRATINA, "altered", SpeciesFormKey.ORIGIN, new SpeciesFormChangeItemTrigger(FormChangeItem.GRISEOUS_CORE))

src/data/pokemon-species.ts

@@ -2010,15 +2010,15 @@ export function initSpecies() {
     new PokemonSpecies(Species.TREVENANT, 6, false, false, false, "Elder Tree Pokémon", Type.GHOST, Type.GRASS, 1.5, 71, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 474, 85, 110, 76, 65, 82, 56, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.PUMPKABOO, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, GrowthRate.MEDIUM_FAST, 50, false, false,
       new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, false, null, true),
-      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, "", true),
+      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, null, true),
-      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, "", true),
+      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, null, true),
-      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, "", true),
+      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, null, true),
     ),
     new PokemonSpecies(Species.GOURGEIST, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, GrowthRate.MEDIUM_FAST, 50, false, false,
       new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, false, null, true),
-      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, "", true),
+      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, null, true),
-      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, "", true),
+      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, null, true),
-      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, "", true),
+      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, null, true),
     ),
     new PokemonSpecies(Species.BERGMITE, 6, false, false, false, "Ice Chunk Pokémon", Type.ICE, null, 1, 99.5, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 304, 55, 69, 85, 32, 35, 28, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.AVALUGG, 6, false, false, false, "Iceberg Pokémon", Type.ICE, null, 2, 505, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 117, 184, 44, 46, 28, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),

src/data/tms.ts

@@ -63123,12 +63123,9 @@ export const tmSpecies: TmSpecies = {
   [Moves.SNOWSCAPE]: [
     Species.SLOWPOKE,
     Species.SLOWBRO,
-    Species.SEEL,
-    Species.DEWGONG,
     Species.SHELLDER,
     Species.CLOYSTER,
     Species.CHANSEY,
-    Species.LAPRAS,
     Species.ARTICUNO,
     Species.DRAGONITE,
     Species.MEW,
@@ -63143,7 +63140,6 @@ export const tmSpecies: TmSpecies = {
     Species.PILOSWINE,
     Species.DELIBIRD,
     Species.BLISSEY,
-    Species.SUICUNE,
     Species.WINGULL,
     Species.PELIPPER,
     Species.SPOINK,
@@ -63152,20 +63148,11 @@ export const tmSpecies: TmSpecies = {
     Species.SNORUNT,
     Species.GLALIE,
     Species.LUVDISC,
-    Species.REGICE,
     Species.PIPLUP,
     Species.PRINPLUP,
     Species.EMPOLEON,
-    [
+    Species.SHELLOS,
-      Species.SHELLOS,
+    Species.GASTRODON,
-      "east",
-      "west",
-    ],
-    [
-      Species.GASTRODON,
-      "east",
-      "west",
-    ],
     Species.MISMAGIUS,
     Species.HAPPINY,
     Species.SNOVER,
@@ -63183,17 +63170,7 @@ export const tmSpecies: TmSpecies = {
     Species.CUBCHOO,
     Species.BEARTIC,
     Species.CRYOGONAL,
-    [
+    Species.TORNADUS,
-      Species.TORNADUS,
-      "incarnate",
-      "therian",
-    ],
-    [
-      Species.KYUREM,
-      "",
-      "black",
-      "white",
-    ],
     Species.FROAKIE,
     Species.FROGADIER,
     [
@@ -63207,13 +63184,8 @@ export const tmSpecies: TmSpecies = {
     Species.BERGMITE,
     Species.AVALUGG,
     Species.DIANCIE,
-    Species.PRIMARINA,
     Species.CRABOMINABLE,
-    [
+    Species.MAGEARNA,
-      Species.MAGEARNA,
-      "",
-      "original",
-    ],
     Species.INTELEON,
     Species.FROSMOTH,
     Species.EISCUE,
@@ -63661,21 +63633,12 @@ export const tmSpecies: TmSpecies = {
     Species.WEAVILE,
     Species.GLACEON,
     Species.FROSLASS,
-    [
+    Species.PALKIA,
-      Species.PALKIA,
-      "",
-      "origin",
-    ],
     Species.ARCEUS,
     Species.OSHAWOTT,
     Species.DEWOTT,
     Species.SAMUROTT,
-    [
+    Species.BASCULIN,
-      Species.BASCULIN,
-      "red-striped",
-      "blue-striped",
-      "white-striped",
-    ],
     Species.DUCKLETT,
     Species.SWANNA,
     Species.ALOMOMOLA,

src/locales/de/modifier-type.ts

@@ -366,7 +366,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Harter Meteorit",
     "SMOOTH_METEORITE": "Glatter Meteorit",
     "ADAMANT_CRYSTAL": "Adamantkristall",
-    "LUSTROUS_GLOBE": "Weißkristall",
+    "LUSTROUS_ORB": "Weiß-Orb",
     "GRISEOUS_CORE": "Platinumkristall",
     "REVEAL_GLASS": "Wahrspiegel",
     "GRACIDEA": "Gracidea",

src/locales/en/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Hard Meteorite",
     "SMOOTH_METEORITE": "Smooth Meteorite",
     "ADAMANT_CRYSTAL": "Adamant Crystal",
-    "LUSTROUS_GLOBE": "Lustrous Globe",
+    "LUSTROUS_ORB": "Lustrous Orb",
     "GRISEOUS_CORE": "Griseous Core",
     "REVEAL_GLASS": "Reveal Glass",
     "GRACIDEA": "Gracidea",

src/locales/es/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Meteorito Duro",
     "SMOOTH_METEORITE": "Meteorito Suave",
     "ADAMANT_CRYSTAL": "Gran Diamansfera",
-    "LUSTROUS_GLOBE": "Gran Lustresfera",
+    "LUSTROUS_ORB": "Gran Lustresfera",
     "GRISEOUS_CORE": "Gran Griseosfera",
     "REVEAL_GLASS": "Espejo Veraz",
     "GRACIDEA": "Gracídea",

src/locales/fr/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Méteorite Solide",
     "SMOOTH_METEORITE": "Méteorite Lisse",
     "ADAMANT_CRYSTAL": "Globe Adamant",
-    "LUSTROUS_GLOBE": "Globe Perlé",
+    "LUSTROUS_ORB": "Orbe Perlé",
     "GRISEOUS_CORE": "Globe Platiné",
     "REVEAL_GLASS": "Miroir Sacré",
     "GRACIDEA": "Gracidée",

src/locales/it/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Meteorite Dura",
     "SMOOTH_METEORITE": "Meteorite Liscia",
     "ADAMANT_CRYSTAL": "Adamasferoide",
-    "LUSTROUS_GLOBE": "Splendisferoide",
+    "LUSTROUS_ORB": "Splendisfera",
     "GRISEOUS_CORE": "Grigiosferoide",
     "REVEAL_GLASS": "Verispecchio",
     "GRACIDEA": "Gracidea",

src/locales/ko/dialogue.ts

@@ -1,4 +1,4 @@
-import { DialogueTranslationEntries, SimpleTranslationEntries } from "#app/plugins/i18n";
+import {DialogueTranslationEntries, SimpleTranslationEntries} from "#app/plugins/i18n";
 
 // Dialogue of the NPCs in the game when the player character is male (or unset)
 export const PGMdialogue: DialogueTranslationEntries = {
@@ -2335,113 +2335,113 @@ export const PGFmiscDialogue: SimpleTranslationEntries = PGMmiscDialogue;
 export const PGMdoubleBattleDialogue: DialogueTranslationEntries = {
   "blue_red_double": {
     "encounter": {
-      1: `그린: 어이 레드! 우리가 누군지 보여주자고!
+      1: `Blue: Hey Red, let's show them what we're made of!
-                  $레드: ...
+                  $Red: ...
-                  $그린: 태초마을의 힘을 보여주지!`,
+                  $Blue: This is Pallet Town Power!`,
     },
     "victory": {
-      1: `그린: 훌륭한 승부였어!
+      1: `Blue: That was a great battle!
-              $레드: ...`,
+              $Red: ...`,
     },
   },
   "red_blue_double": {
     "encounter": {
-      1: `레드: ...!
+      1: `Red: ...!
-                  $그린: 이 녀석은 여전히 말이 없구나.
+                  $Blue: He never talks much.
-                    $그린: 그렇지만 방심해선 안 돼! 그래도 챔피언이라고!`,
+                    $Blue: But dont let that fool you! He is a champ after all!`,
     },
     "victory": {
-      1: `레드: ...!
+      1: `Red: ...!
-                $그린: 다음에는 우리가 이길 테다!`,
+                $Blue: Next time we will beat you!`,
     },
   },
   "tate_liza_double": {
     "encounter": {
-      1: `풍: 에헤헤... 체육관 관장이
+      1: `Tate: Are you suprised?
-                  $란: 두 명이나 있어서 놀랐지?
+                  $Liza: We are two gym leaders at once!
-                  $풍: 우리는 쌍둥이!
+                  $Tate: We are twins!
-                  $란: 굳이 말을 하지 않아도 서로가 무슨 생각을 하고 있는지
+                  $Liza: We dont need to talk to understand each other!
-                  $풍: 자동으로 머릿속에 떠오르니까
+                  $Tate: Twice the power...
-                  $란: 호흡을 척척 맞출 수가 있지!`,
+                  $Liza: Can you handle it?`,
     },
     "victory": {
-      1: `풍: 우, 우리들의
+      1: `Tate: What? Our combination was perfect!
-                  $란: 팀워크가...!`,
+                  $Liza: Looks like we need to train more...`,
     },
   },
   "liza_tate_double": {
     "encounter": {
-      1: `란: 우후후... 체육관 관장이
+      1: `Liza: Hihihi... Are you suprised?
-                  $풍: 두 명이나 있어서 놀랐어?
+                  $Tate: Yes, we are really two gym leaders at once!
-                  $란: 우리는 쌍둥이!
+                  $Liza: This is my twin brother Tate!
-                  $풍: 완벽한 우리의 콤비네이션을
+                  $Tate: And this is my twin sister Liza!
-                  $란: 과연 네가 깨뜨릴 수 있을까?`
+                  $Liza: Don't you think we are a perfect combination?`
     },
     "victory": {
-      1: `란: 우리들이 생각한 만큼
+      1: `Liza: Are we...
-                  $풍: 우리가 강하지 않았던 걸까?`,
+                  $Tate: ...not as strong as we thought?`,
     },
   },
   "wallace_steven_double": {
     "encounter": {
-      1: `성호: 윤진! 우리 챔피언의 힘을 보여주자!
+      1: `Steven: Wallace, let's show them the power of the champions!
-                  $윤진: 호연의 힘을 보여주마!
+                  $Wallace: We will show you the power of Hoenn!
-                  $성호: 간다!`,
+                  $Steven: Let's go!`,
     },
     "victory": {
-      1: `성호: 훌륭한 승부였어!
+      1: `Steven: That was a great battle!
-                  $윤진: 다음엔 우리가 이길 거다!`,
+                  $Wallace: We will win next time!`,
     },
   },
   "steven_wallace_double": {
     "encounter": {
-      1: `성호: 너 혹시 희귀한 포켓몬 가지고 있니?
+      1: `Steven: Do you have any rare pokémon?
-          $윤진: 성호야... 우리는 포켓몬을 자랑하러 온 게 아니라 승부하러 온 거야.
+          $Wallace: Steven... We are here for a battle, not to show off our pokémon.
-            $성호: 오... 그렇지... 그럼 간다!`,
+            $Steven: Oh... I see... Let's go then!`,
     },
     "victory": {
-      1: `성호: 이제 승부는 끝났으니 포켓몬을 자랑해 볼까!
+      1: `Steven: Now that we are done with the battle, let's show off our pokémon!
-            $윤진: 성호야...`,
+            $Wallace: Steven...`,
     },
   },
   "alder_iris_double": {
     "encounter": {
-      1:  `노간주: 우리는 하나 지방 최강의 트레이너들이란다!
+      1:  `Alder: We are the strongest trainers in Unova!
-                  $아이리스: 이렇게 강한 트레이너와 싸울 수 있어서 정말 기뻐~!!`,
+                  $Iris: Fights against strong trainers are the best!`,
     },
     "victory": {
-      1:   `노간주: 장하구나! 실로 견줄 자가 천하에 없도다!
+      1:   `Alder: Wow! You are super strong!
-                  $아이리스: 다음 번엔 우리가 꼭 이길 거야~!`,
+                  $Iris: We will win next time!`,
     },
   },
   "iris_alder_double": {
     "encounter": {
-      1:   `아이리스: 어서 와, 도전자! 내가 바로 하나 지방 챔피언이야~!
+      1:   `Iris: Welcome Challenger! I am THE Unova Champion!
-                  $노간주: 아이리스야, 너무 흥분한 것 아니냐?`,
+                  $Alder: Iris, aren't you a bit too excited?`,
     },
     "victory": {
-      1:    `아이리스: 후와아아아아... 최선을 다했는데도... 우리가 져버렸네!
+      1:    `Iris: A loss like this is not easy to take...
-                  $노간주: 하지만 우리의 패배를 발판 삼아 나아가리라!`,
+                  $Alder: But we will only get stronger with every loss!`,
     },
   },
   "piers_marnie_double": {
     "encounter": {
-      1:   `마리: 오빠, 스파이크마을의 힘을 보여주자!
+      1:   `Marnie: Brother, let's show them the power of Spikemuth!
-                  $두송: 우리가 어둠을 불러올 것이다!`,
+                  $Piers: We bring darkness!`,
     },
     "victory": {
-      1:  `마리: 네가 우리의 어둠에 빛을 불러왔구나!
+      1:  `Marnie: You brought light to our darkness!
-                  $두송: 여긴 너무 밝네...`,
+                  $Piers: Its too bright...`,
     },
   },
   "marnie_piers_double": {
     "encounter": {
-      1:  `두송: 큰서트 즐길 준비 됐어?
+      1:  `Piers: Ready for a concert?
-                    $마리: 오빠... 얘들은 노래가 아니라 승부를 하러 왔어...`,
+                    $Marnie: Brother... They are here to fight, not to sing...`,
     },
     "victory": {
-      1:  `두송: 훌륭한 콘서트였다!
+      1:  `Piers: Now that was a great concert!
-                    $마리: 오빠...`,
+                    $Marnie: Brother...`,
     },
   },
 };

src/locales/ko/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "단단한운석",
     "SMOOTH_METEORITE": "부드러운운석",
     "ADAMANT_CRYSTAL": "큰금강옥",
-    "LUSTROUS_GLOBE": "큰백옥",
+    "LUSTROUS_ORB": "큰백옥",
     "GRISEOUS_CORE": "큰백금옥",
     "REVEAL_GLASS": "비추는거울",
     "GRACIDEA": "그라시데아꽃",

src/locales/pt_BR/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "Meteorito Duro",
     "SMOOTH_METEORITE": " Meteorito Liso",
     "ADAMANT_CRYSTAL": "Cristal Adamante",
-    "LUSTROUS_GLOBE": "Globo Brilhante",
+    "LUSTROUS_ORB": "Orbe Pérola",
     "GRISEOUS_CORE": "Núcleo Platinado",
     "REVEAL_GLASS": "Espelho da Verdade",
     "GRACIDEA": "Gracídea",

src/locales/zh_CN/modifier-type.ts

@@ -365,7 +365,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "HARD_METEORITE": "坚硬陨石",
     "SMOOTH_METEORITE": "光滑陨石",
     "ADAMANT_CRYSTAL": "大金刚宝玉",
-    "LUSTROUS_GLOBE": "大白宝玉",
+    "LUSTROUS_ORB": "白玉宝珠",
     "GRISEOUS_CORE": "大白金宝玉",
     "REVEAL_GLASS": "现形镜",
     "GRACIDEA": "葛拉西蒂亚花",

src/locales/zh_TW/modifier-type.ts

@@ -419,7 +419,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     HARD_METEORITE: "堅硬隕石",
     SMOOTH_METEORITE: "光滑隕石",
     ADAMANT_CRYSTAL: "大金剛寶玉",
-    LUSTROUS_GLOBE: "大白寶玉",
+    LUSTROUS_ORB: "白玉寶珠",
     GRISEOUS_CORE: "大白金寶玉",
     REVEAL_GLASS: "現形鏡",
     GRACIDEA: "葛拉西蒂亞花",