diff --git a/src/locales/ja/pokemon-form.json b/src/locales/ja/pokemon-form.json
index c3b6cc0bf26..8ef61ec2c14 100644
--- a/src/locales/ja/pokemon-form.json
+++ b/src/locales/ja/pokemon-form.json
@@ -1,5 +1,5 @@
 {
-  "pikachu": "一般",
+  "pikachu": "通常",
   "pikachuCosplay": "コスプレ",
   "pikachuCoolCosplay": "クールなコスプレ",
   "pikachuBeautyCosplay": "きれいなコスプレ",
@@ -7,9 +7,9 @@
   "pikachuSmartCosplay": "かしこいコスプレ",
   "pikachuToughCosplay": "パワフルなコスプレ",
   "pikachuPartner": "パートナー",
-  "eevee": "一般",
+  "eevee": "通常",
   "eeveePartner": "パートナー",
-  "pichu": "一般",
+  "pichu": "通常",
   "pichuSpiky": "ギザみみ",
   "unownA": "A",
   "unownB": "B",
@@ -40,29 +40,29 @@
   "unownExclamation": "!",
   "unownQuestion": "?",
   "castform": "ポワルンのすがた",
-  "castformSunny": "たいようのすがた",
-  "castformRainy": "あまみずのすがた",
-  "castformSnowy": "ゆきぐものすがた",
+  "castformSunny": "たいよう",
+  "castformRainy": "あまみず",
+  "castformSnowy": "ゆきぐも",
   "deoxysNormal": "ノーマルフォルム",
-  "deoxysAttack": "アタックフォルム",
-  "deoxysDefense": "ディフェンスフォルム",
-  "deoxysSpeed": "スピードフォルム",
-  "burmyPlant": "くさき",
-  "burmySandy": "すなち",
-  "burmyTrash": "ゴミ",
+  "deoxysAttack": "アタック",
+  "deoxysDefense": "ディフェンス",
+  "deoxysSpeed": "スピード",
+  "burmyPlant": "くさきのミノ",
+  "burmySandy": "すなちのミノ",
+  "burmyTrash": "ゴミのミノ",
   "cherubiOvercast": "ネガフォルム",
   "cherubiSunshine": "ポジフォルム",
   "shellosEast": "ひがし",
   "shellosWest": "にし",
-  "rotom": "ロトムのすがた",
-  "rotomHeat": "ヒートロトム",
-  "rotomWash": "ウォッシュロトム",
-  "rotomFrost": "フロストロトム",
-  "rotomFan": "スピンロトム",
-  "rotomMow": "カットロトム",
-  "dialga": "アナザーフォルム",
+  "rotom": "通常",
+  "rotomHeat": "ヒート",
+  "rotomWash": "ウォッシュ",
+  "rotomFrost": "フロスト",
+  "rotomFan": "スピン",
+  "rotomMow": "カット",
+  "dialga": "通常",
   "dialgaOrigin": "オリジンフォルム",
-  "palkia": "アナザーフォルム",
+  "palkia": "通常",
   "palkiaOrigin": "オリジンフォルム",
   "giratinaAltered": "アナザーフォルム",
   "giratinaOrigin": "オリジンフォルム",
@@ -90,11 +90,11 @@
   "keldeoResolute": "かくごのすがた",
   "meloettaAria": "ボイス",
   "meloettaPirouette": "ステップ",
-  "genesect": "一般",
-  "genesectShock": "ライトニング",
-  "genesectBurn": "ブレイズ",
-  "genesectChill": "フリーズ",
-  "genesectDouse": "アクア",
+  "genesect": "通常",
+  "genesectShock": "イナズマカセット",
+  "genesectBurn": "ブレイズカセット",
+  "genesectChill": "フリーズカセット",
+  "genesectDouse": "アクアカセット",
   "froakie": "通常",
   "froakieBattleBond": "きずなへんげ",
   "froakieAsh": "サトシゲッコウガ",
@@ -154,7 +154,7 @@
   "oricorioPompom": "ぱちぱち",
   "oricorioPau": "ふらふら",
   "oricorioSensu": "まいまい",
-  "rockruff": "一般",
+  "rockruff": "通常",
   "rockruffOwnTempo": "マイペース",
   "rockruffMidday": "まひるのすがた",
   "rockruffMidnight": "まよなかのすがた",
@@ -228,10 +228,10 @@
   "zacianHeroOfManyBattles": "れきせんのゆうしゃ",
   "zacianCrowned": "けんのおう",
   "zamazentaHeroOfManyBattles": "れきせんのゆうしゃ",
-  "zamazentaCrowned": "けんのおう",
+  "zamazentaCrowned": "たてのおう",
   "kubfuSingleStrike": "いちげきのかた",
   "kubfuRapidStrike": "れんげきのかた",
-  "zarude": "一般",
+  "zarude": "通常",
   "zarudeDada": "とうちゃん",
   "calyrex": "通常",
   "calyrexIce": "はくばじょうのすがた",