diff --git a/src/locales/ja/pokemon-form.json b/src/locales/ja/pokemon-form.json
index 00aca2094b7..1535f2b6903 100644
--- a/src/locales/ja/pokemon-form.json
+++ b/src/locales/ja/pokemon-form.json
@@ -39,65 +39,65 @@
   "unownZ": "Z",
   "unownExclamation": "!",
   "unownQuestion": "?",
-  "castform": "Normal Form",
-  "castformSunny": "たいよう",
-  "castformRainy": "あまみず",
-  "castformSnowy": "ゆきぐも",
-  "deoxysNormal": "ノーマル",
-  "deoxysAttack": "Attack",
-  "deoxysDefense": "Defense",
-  "deoxysSpeed": "Speed",
+  "castform": "ポワルンのすがた",
+  "castformSunny": "たいようのすがた",
+  "castformRainy": "あまみずのすがた",
+  "castformSnowy": "ゆきぐものすがた",
+  "deoxysNormal": "ノーマルフォルム",
+  "deoxysAttack": "アタックフォルム",
+  "deoxysDefense": "ディフェンスフォルム",
+  "deoxysSpeed": "スピードフォルム",
   "burmyPlant": "くさき",
   "burmySandy": "すなち",
   "burmyTrash": "ゴミ",
-  "cherubiOvercast": "Overcast",
-  "cherubiSunshine": "Sunshine",
+  "cherubiOvercast": "ネガフォルム",
+  "cherubiSunshine": "ポジフォルム",
   "shellosEast": "ひがし",
   "shellosWest": "にし",
-  "rotom": "Normal",
-  "rotomHeat": "ヒート",
-  "rotomWash": "ウォッシュ",
-  "rotomFrost": "フロスト",
-  "rotomFan": "スピン",
-  "rotomMow": "カット",
-  "dialga": "Normal",
-  "dialgaOrigin": "Origin",
-  "palkia": "Normal",
-  "palkiaOrigin": "Origin",
-  "giratinaAltered": "アナザー",
-  "giratinaOrigin": "Origin",
-  "shayminLand": "ランド",
-  "shayminSky": "Sky",
+  "rotom": "ロトムのすがた",
+  "rotomHeat": "ヒートロトム",
+  "rotomWash": "ウォッシュロトム",
+  "rotomFrost": "フロストロトム",
+  "rotomFan": "スピンロトム",
+  "rotomMow": "カットロトム",
+  "dialga": "アナザーフォルム",
+  "dialgaOrigin": "オリジンフォルム",
+  "palkia": "アナザーフォルム",
+  "palkiaOrigin": "オリジンフォルム",
+  "giratinaAltered": "アナザーフォルム",
+  "giratinaOrigin": "オリジンフォルム",
+  "shayminLand": "ランドフォルム",
+  "shayminSky": "スカイフォルム",
   "basculinRedStriped": "赤筋",
   "basculinBlueStriped": "青筋",
   "basculinWhiteStriped": "白筋",
-  "darumaka": "Standard Mode",
-  "darumakaZen": "Zen",
+  "darumaka": "ノーマルモード",
+  "darumakaZen": "ダルマモード",
   "deerlingSpring": "春",
   "deerlingSummer": "夏",
   "deerlingAutumn": "秋",
   "deerlingWinter": "冬",
-  "tornadusIncarnate": "けしん",
-  "tornadusTherian": "Therian",
-  "thundurusIncarnate": "けしん",
-  "thundurusTherian": "Therian",
-  "landorusIncarnate": "けしん",
-  "landorusTherian": "Therian",
-  "kyurem": "Normal",
-  "kyuremBlack": "Black",
-  "kyuremWhite": "White",
-  "keldeoOrdinary": "いつも",
-  "keldeoResolute": "Resolute",
+  "tornadusIncarnate": "けしんフォルム",
+  "tornadusTherian": "れいじゅうフォルム",
+  "thundurusIncarnate": "けしんフォルム",
+  "thundurusTherian": "れいじゅうフォルム",
+  "landorusIncarnate": "けしんフォルム",
+  "landorusTherian": "れいじゅうフォルム",
+  "kyurem": "通常",
+  "kyuremBlack": "ブラックキュレム",
+  "kyuremWhite": "ホワイトキュレム",
+  "keldeoOrdinary": "いつものすがた",
+  "keldeoResolute": "かくごのすがた",
   "meloettaAria": "ボイス",
   "meloettaPirouette": "ステップ",
-  "genesect": "Normal",
-  "genesectShock": "Shock Drive",
-  "genesectBurn": "Burn Drive",
-  "genesectChill": "Chill Drive",
-  "genesectDouse": "Douse Drive",
-  "froakie": "Normal",
+  "genesect": "一般",
+  "genesectShock": "ライトニング",
+  "genesectBurn": "ブレイズ",
+  "genesectChill": "フリーズ",
+  "genesectDouse": "アクア",
+  "froakie": "通常",
   "froakieBattleBond": "きずなへんげ",
-  "froakieAsh": "Ash",
+  "froakieAsh": "サトシゲッコウガ",
   "scatterbugMeadow": "はなぞの",
   "scatterbugIcySnow": "ひょうせつ",
   "scatterbugPolar": "ゆきぐに",