diff --git a/src/enums/trainer-type.ts b/src/enums/trainer-type.ts
index c131781b41e..f02431e83a9 100644
--- a/src/enums/trainer-type.ts
+++ b/src/enums/trainer-type.ts
@@ -85,140 +85,140 @@ export enum TrainerType {
     LYSANDRE,
     LYSANDRE_2,
 
-  BROCK = 200,
-  MISTY,
-  LT_SURGE,
-  ERIKA,
-  JANINE,
-  KOGA,
-  SABRINA,
-  BLAINE,
-  GIOVANNI,
-  FALKNER,
-  BUGSY,
-  WHITNEY,
-  MORTY,
-  CHUCK,
-  JASMINE,
-  PRYCE,
-  CLAIR,
-  ROXANNE,
-  BRAWLY,
-  WATTSON,
-  FLANNERY,
-  NORMAN,
-  WINONA,
-  TATE,
-  LIZA,
-  JUAN,
-  ROARK,
-  GARDENIA,
-  MAYLENE,
-  CRASHER_WAKE,
-  FANTINA,
-  BYRON,
-  CANDICE,
-  VOLKNER,
-  CILAN,
-  CHILI,
-  CRESS,
-  CHEREN,
-  LENORA,
-  ROXIE,
-  BURGH,
-  ELESA,
-  CLAY,
-  SKYLA,
-  BRYCEN,
-  DRAYDEN,
-  MARLON,
-  VIOLA,
-  GRANT,
-  KORRINA,
-  RAMOS,
-  CLEMONT,
-  VALERIE,
-  OLYMPIA,
-  WULFRIC,
-  MILO,
-  NESSA,
-  KABU,
-  BEA,
-  ALLISTER,
-  OPAL,
-  BEDE,
-  GORDIE,
-  MELONY,
-  PIERS,
-  MARNIE,
-  RAIHAN,
-  KATY,
-  BRASSIUS,
-  IONO,
-  KOFU,
-  LARRY,
-  RYME,
-  TULIP,
-  GRUSHA,
-  LORELEI = 300,
-  BRUNO,
-  AGATHA,
-  LANCE,
-  WILL,
-  KOGA_ELITE,
-  KAREN,
-  SIDNEY,
-  PHOEBE,
-  GLACIA,
-  DRAKE,
-  AARON,
-  BERTHA,
-  FLINT,
-  LUCIAN,
-  SHAUNTAL,
-  MARSHAL,
-  GRIMSLEY,
-  CAITLIN,
-  MALVA,
-  SIEBOLD,
-  WIKSTROM,
-  DRASNA,
-  HALA,
-  MOLAYNE,
-  OLIVIA,
-  ACEROLA,
-  KAHILI,
-  MARNIE_ELITE,
-  NESSA_ELITE,
-  BEA_ELITE,
-  ALLISTER_ELITE,
-  RAIHAN_ELITE,
-  RIKA,
-  POPPY,
-  LARRY_ELITE,
-  HASSEL,
-  CRISPIN,
-  AMARYS,
-  LACEY,
-  DRAYTON,
-  BLUE = 350,
-  RED,
-  LANCE_CHAMPION,
-  STEVEN,
-  WALLACE,
-  CYNTHIA,
-  ALDER,
-  IRIS,
-  DIANTHA,
-  HAU,
-  LEON,
-  GEETA,
-  NEMONA,
-  KIERAN,
-  RIVAL = 375,
-  RIVAL_2,
-  RIVAL_3,
-  RIVAL_4,
-  RIVAL_5,
-  RIVAL_6
+    BROCK = 200,
+    MISTY,
+    LT_SURGE,
+    ERIKA,
+    JANINE,
+    KOGA,
+    SABRINA,
+    BLAINE,
+    GIOVANNI,
+    FALKNER,
+    BUGSY,
+    WHITNEY,
+    MORTY,
+    CHUCK,
+    JASMINE,
+    PRYCE,
+    CLAIR,
+    ROXANNE,
+    BRAWLY,
+    WATTSON,
+    FLANNERY,
+    NORMAN,
+    WINONA,
+    TATE,
+    LIZA,
+    JUAN,
+    ROARK,
+    GARDENIA,
+    MAYLENE,
+    CRASHER_WAKE,
+    FANTINA,
+    BYRON,
+    CANDICE,
+    VOLKNER,
+    CILAN,
+    CHILI,
+    CRESS,
+    CHEREN,
+    LENORA,
+    ROXIE,
+    BURGH,
+    ELESA,
+    CLAY,
+    SKYLA,
+    BRYCEN,
+    DRAYDEN,
+    MARLON,
+    VIOLA,
+    GRANT,
+    KORRINA,
+    RAMOS,
+    CLEMONT,
+    VALERIE,
+    OLYMPIA,
+    WULFRIC,
+    MILO,
+    NESSA,
+    KABU,
+    BEA,
+    ALLISTER,
+    OPAL,
+    BEDE,
+    GORDIE,
+    MELONY,
+    PIERS,
+    MARNIE,
+    RAIHAN,
+    KATY,
+    BRASSIUS,
+    IONO,
+    KOFU,
+    LARRY,
+    RYME,
+    TULIP,
+    GRUSHA,
+    LORELEI = 300,
+    BRUNO,
+    AGATHA,
+    LANCE,
+    WILL,
+    KOGA_ELITE,
+    KAREN,
+    SIDNEY,
+    PHOEBE,
+    GLACIA,
+    DRAKE,
+    AARON,
+    BERTHA,
+    FLINT,
+    LUCIAN,
+    SHAUNTAL,
+    MARSHAL,
+    GRIMSLEY,
+    CAITLIN,
+    MALVA,
+    SIEBOLD,
+    WIKSTROM,
+    DRASNA,
+    HALA,
+    MOLAYNE,
+    OLIVIA,
+    ACEROLA,
+    KAHILI,
+    MARNIE_ELITE,
+    NESSA_ELITE,
+    BEA_ELITE,
+    ALLISTER_ELITE,
+    RAIHAN_ELITE,
+    RIKA,
+    POPPY,
+    LARRY_ELITE,
+    HASSEL,
+    CRISPIN,
+    AMARYS,
+    LACEY,
+    DRAYTON,
+    BLUE = 350,
+    RED,
+    LANCE_CHAMPION,
+    STEVEN,
+    WALLACE,
+    CYNTHIA,
+    ALDER,
+    IRIS,
+    DIANTHA,
+    HAU,
+    LEON,
+    GEETA,
+    NEMONA,
+    KIERAN,
+    RIVAL = 375,
+    RIVAL_2,
+    RIVAL_3,
+    RIVAL_4,
+    RIVAL_5,
+    RIVAL_6
 }
diff --git a/src/locales/de/dialogue-female.json b/src/locales/de/dialogue-female.json
index e71e03453a7..f713306b832 100644
--- a/src/locales/de/dialogue-female.json
+++ b/src/locales/de/dialogue-female.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon sind nicht nur rohe Gewalt - das wirst du bald genug sehen!"
     },
diff --git a/src/locales/de/dialogue-male.json b/src/locales/de/dialogue-male.json
index 0f8e0122c8c..e17209e41a4 100644
--- a/src/locales/de/dialogue-male.json
+++ b/src/locales/de/dialogue-male.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon sind nicht nur rohe Gewalt - das wirst du bald genug sehen!"
     },
diff --git a/src/locales/en/dialogue-female.json b/src/locales/en/dialogue-female.json
index 6be1c7586b6..fbd92bae8d8 100644
--- a/src/locales/en/dialogue-female.json
+++ b/src/locales/en/dialogue-female.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!"
     },
diff --git a/src/locales/en/dialogue-male.json b/src/locales/en/dialogue-male.json
index bf0612539d3..00cbcc100d4 100644
--- a/src/locales/en/dialogue-male.json
+++ b/src/locales/en/dialogue-male.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!"
     },
diff --git a/src/locales/ko/dialogue-female.json b/src/locales/ko/dialogue-female.json
index 693b0704512..db33a5d52f9 100644
--- a/src/locales/ko/dialogue-female.json
+++ b/src/locales/ko/dialogue-female.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "후하하하! 포켓몬은 단순히 강한 것만이 아니다--곧 알려주지!"
     },
diff --git a/src/locales/ko/dialogue-male.json b/src/locales/ko/dialogue-male.json
index 693b0704512..db33a5d52f9 100644
--- a/src/locales/ko/dialogue-male.json
+++ b/src/locales/ko/dialogue-male.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "후하하하! 포켓몬은 단순히 강한 것만이 아니다--곧 알려주지!"
     },
diff --git a/src/locales/pt_BR/dialogue-female.json b/src/locales/pt_BR/dialogue-female.json
index 7f4dfe8865d..0f8247b889d 100644
--- a/src/locales/pt_BR/dialogue-female.json
+++ b/src/locales/pt_BR/dialogue-female.json
@@ -1571,6 +1571,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon não são apenas sobre força bruta--você verá em breve!"
     },
diff --git a/src/locales/pt_BR/dialogue-male.json b/src/locales/pt_BR/dialogue-male.json
index 0316dda2524..1650b45a4ae 100644
--- a/src/locales/pt_BR/dialogue-male.json
+++ b/src/locales/pt_BR/dialogue-male.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon não são apenas sobre força bruta--você verá em breve!"
     },
diff --git a/src/locales/zh_CN/dialogue-female.json b/src/locales/zh_CN/dialogue-female.json
index 09090f36d94..b82d7e42532 100644
--- a/src/locales/zh_CN/dialogue-female.json
+++ b/src/locales/zh_CN/dialogue-female.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "哇哈哈哈哈！$宝可梦不仅仅是关于蛮力，拭目以待吧！"
     },
diff --git a/src/locales/zh_CN/dialogue-male.json b/src/locales/zh_CN/dialogue-male.json
index 09090f36d94..b82d7e42532 100644
--- a/src/locales/zh_CN/dialogue-male.json
+++ b/src/locales/zh_CN/dialogue-male.json
@@ -1605,6 +1605,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "哇哈哈哈哈！$宝可梦不仅仅是关于蛮力，拭目以待吧！"
     },
diff --git a/src/locales/zh_TW/dialogue-female.json b/src/locales/zh_TW/dialogue-female.json
index 4236e239622..dc158650022 100644
--- a/src/locales/zh_TW/dialogue-female.json
+++ b/src/locales/zh_TW/dialogue-female.json
@@ -1197,6 +1197,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "哇哈哈哈哈！$寶可夢不僅僅是關於蠻力，拭目以待吧！"
     },
diff --git a/src/locales/zh_TW/dialogue-male.json b/src/locales/zh_TW/dialogue-male.json
index 4236e239622..dc158650022 100644
--- a/src/locales/zh_TW/dialogue-male.json
+++ b/src/locales/zh_TW/dialogue-male.json
@@ -1197,6 +1197,17 @@
     }
   },
   "koga": {
+    "encounter": {
+      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
+    },
+    "victory": {
+      "1": "Humph! You've proven your worth!"
+    },
+    "defeat": {
+      "1": "Despair to the creeping horror of Poison-type Pokémon!"
+    }
+  },
+  "koga_elite": {
     "encounter": {
       "1": "哇哈哈哈哈！$寶可夢不僅僅是關於蠻力，拭目以待吧！"
     },