diff --git a/src/locales/ja/pokemon-form.json b/src/locales/ja/pokemon-form.json
index 52520424adf..cca8a0402f1 100644
--- a/src/locales/ja/pokemon-form.json
+++ b/src/locales/ja/pokemon-form.json
@@ -148,37 +148,37 @@
   "zygarde50Pc": "50%フォルム　スワームチェンジ",
   "zygarde10Pc": "10%フォルム　スワームチェンジ",
   "zygardeComplete": "パーフェクトフォルム",
-  "hoopa": "Confined",
-  "hoopaUnbound": "Unbound",
+  "hoopa": "いましめられしフーパ",
+  "hoopaUnbound": "ときはなたれしフーパ",
   "oricorioBaile": "めらめら",
   "oricorioPompom": "ぱちぱち",
   "oricorioPau": "ふらふら",
   "oricorioSensu": "まいまい",
-  "rockruff": "Normal",
+  "rockruff": "一般",
   "rockruffOwnTempo": "マイペース",
-  "rockruffMidday": "Midday",
-  "rockruffMidnight": "Midnight",
-  "rockruffDusk": "Dusk",
-  "wishiwashi": "Solo Form",
-  "wishiwashiSchool": "School",
-  "typeNullNormal": "Type: Normal",
-  "typeNullFighting": "Type: Fighting",
-  "typeNullFlying": "Type: Flying",
-  "typeNullPoison": "Type: Poison",
-  "typeNullGround": "Type: Ground",
-  "typeNullRock": "Type: Rock",
-  "typeNullBug": "Type: Bug",
-  "typeNullGhost": "Type: Ghost",
-  "typeNullSteel": "Type: Steel",
-  "typeNullFire": "Type: Fire",
-  "typeNullWater": "Type: Water",
-  "typeNullGrass": "Type: Grass",
-  "typeNullElectric": "Type: Electric",
-  "typeNullPsychic": "Type: Psychic",
-  "typeNullIce": "Type: Ice",
-  "typeNullDragon": "Type: Dragon",
-  "typeNullDark": "Type: Dark",
-  "typeNullFairy": "Type: Fairy",
+  "rockruffMidday": "まひるのすがた",
+  "rockruffMidnight": "まよなかのすがた",
+  "rockruffDusk": "たそがれのすがた",
+  "wishiwashi": "たんどくのすがた",
+  "wishiwashiSchool": "むれたすがた",
+  "typeNullNormal": "タイプ:ノーマル",
+  "typeNullFighting": "タイプ:かくとう",
+  "typeNullFlying": "タイプ:ひこう",
+  "typeNullPoison": "タイプ:どく",
+  "typeNullGround": "タイプ:じめん",
+  "typeNullRock": "タイプ:いわ",
+  "typeNullBug": "タイプ:むし",
+  "typeNullGhost": "タイプ:ゴースト",
+  "typeNullSteel": "タイプ:はがね",
+  "typeNullFire": "タイプ:ほのお",
+  "typeNullWater": "タイプ:みず",
+  "typeNullGrass": "タイプ:くさ",
+  "typeNullElectric": "タイプ:でんき",
+  "typeNullPsychic": "タイプ:エスパー",
+  "typeNullIce": "タイプ:こおり",
+  "typeNullDragon": "タイプ:ドラゴン",
+  "typeNullDark": "タイプ:あく",
+  "typeNullFairy": "タイプ:フェアリー",
   "miniorRedMeteor": "赤　りゅうせい",
   "miniorOrangeMeteor": "オレンジ　りゅうせい",
   "miniorYellowMeteor": "黄　りゅうせい",