Koga's vouchers consistent with old saves

src/battle.ts

@@ -509,7 +509,7 @@ export const classicFixedBattles: FixedBattleConfigs = {
   [182]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, [ TrainerType.HALA, TrainerType.MOLAYNE ], TrainerType.MARNIE_ELITE, TrainerType.RIKA, TrainerType.CRISPIN ])),
   [184]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BRUNO, TrainerType.KOGA_ELITE, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY, TrainerType.AMARYS ])),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY, TrainerType.AMARYS ])),
   [186]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, [ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ], TrainerType.LARRY_ELITE, TrainerType.LACEY ])),
   [188]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182)

src/data/biomes.ts

@@ -1705,7 +1705,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
-    [BiomePoolTier.BOSS]: [ TrainerType.JANINE, TrainerType.KOGA ],
+    [BiomePoolTier.BOSS]: [ TrainerType.JANINE, TrainerType.KOGA_GYM ],
     [BiomePoolTier.BOSS_RARE]: [],
     [BiomePoolTier.BOSS_SUPER_RARE]: [],
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
@@ -7331,7 +7331,7 @@ export function initBiomes() {
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ TrainerType.KOGA, [
+    [ TrainerType.KOGA_GYM, [
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
@@ -7616,7 +7616,7 @@ export function initBiomes() {
     [ TrainerType.AGATHA, [] ],
     [ TrainerType.LANCE, [] ],
     [ TrainerType.WILL, [] ],
-    [ TrainerType.KOGA_ELITE, [] ],
+    [ TrainerType.KOGA, [] ],
     [ TrainerType.KAREN, [] ],
     [ TrainerType.SIDNEY, [] ],
     [ TrainerType.PHOEBE, [] ],

src/data/challenge.ts

@@ -442,7 +442,7 @@ export class SingleGenerationChallenge extends Challenge {
       trainerTypes = [ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, Utils.randSeedItem([ TrainerType.HALA, TrainerType.MOLAYNE ]), TrainerType.MARNIE_ELITE, TrainerType.RIKA ];
       break;
     case 184:
-      trainerTypes = [ TrainerType.BRUNO, TrainerType.KOGA_ELITE, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY ];
+      trainerTypes = [ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY ];
       break;
     case 186:
       trainerTypes = [ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, Utils.randSeedItem([TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE]), TrainerType.LARRY_ELITE ];

src/data/dialogue.ts

@@ -997,15 +997,15 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:janine.defeat.3",
     ]
   },
-  [TrainerType.KOGA]: {
+  [TrainerType.KOGA_GYM]: {
     encounter: [
-      "dialogue:koga.encounter.1"
+      "dialogue:koga_gym.encounter.1"
     ],
     victory: [
-      "dialogue:koga.victory.1"
+      "dialogue:koga_gym.victory.1"
     ],
     defeat: [
-      "dialogue:koga.defeat.1"
+      "dialogue:koga_gym.defeat.1"
     ]
   },
   [TrainerType.SABRINA]: {
@@ -1737,15 +1737,15 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:bugsy.defeat.1"
     ]
   },
-  [TrainerType.KOGA_ELITE]: {
+  [TrainerType.KOGA]: {
     encounter: [
-      "dialogue:koga_elite.encounter.1"
+      "dialogue:koga.encounter.1"
     ],
     victory: [
-      "dialogue:koga_elite.victory.1"
+      "dialogue:koga.victory.1"
     ],
     defeat: [
-      "dialogue:koga_elite.defeat.1"
+      "dialogue:koga.defeat.1"
     ]
   },
   [TrainerType.BERTHA]: {

src/data/trainer-config.ts

@@ -339,7 +339,7 @@ export class TrainerConfig {
     case TrainerType.RAIHAN_ELITE:
       trainerType = TrainerType.RAIHAN;
       break;
-    case TrainerType.KOGA_ELITE:
+    case TrainerType.KOGA_GYM:
       trainerType = TrainerType.KOGA;
       break;
     }
@@ -1032,7 +1032,7 @@ export const signatureSpecies: SignatureSpecies = {
   LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ],
   ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP],
   JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT],
-  KOGA: [Species.KOFFING, Species.GRIMER, Species.VENONAT],
+  KOGA_GYM: [Species.KOFFING, Species.GRIMER, Species.VENONAT],
   SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON],
   BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR],
   GIOVANNI: [Species.DIGLETT, Species.NIDORAN_M, Species.NIDOQUEEN, Species.RHYHORN],
@@ -1107,7 +1107,7 @@ export const signatureSpecies: SignatureSpecies = {
   AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK],
   LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR],
   WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR],
-  KOGA_ELITE: [Species.MUK, Species.VENOMOTH, [Species.ARIADOS, Species.FORRETRESS], Species.CROBAT],
+  KOGA: [Species.MUK, Species.VENOMOTH, [Species.ARIADOS, Species.FORRETRESS], Species.CROBAT],
   KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE],
   SIDNEY: [[Species.SHIFTRY, Species.CACTURNE], [Species.SHARPEDO, Species.CRAWDAUNT], Species.ABSOL, Species.MIGHTYENA],
   PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.MISMAGIUS, Species.DRIFBLIM]],
@@ -1386,7 +1386,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LT_SURGE"], true, Type.ELECTRIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.ERIKA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ERIKA"], false, Type.GRASS).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.JANINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JANINE"], false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.KOGA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KOGA"], false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.KOGA_GYM]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KOGA_GYM"], false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.SABRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SABRINA"], false, Type.PSYCHIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.BLAINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BLAINE"], true, Type.FIRE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GIOVANNI"], true, Type.GROUND).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
@@ -1462,7 +1462,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.AGATHA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AGATHA"], false, Type.GHOST).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.LANCE]: new TrainerConfig(++t).setName("Lance").initForEliteFour(signatureSpecies["LANCE"], true, Type.DRAGON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.WILL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["WILL"], true, Type.PSYCHIC).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.KOGA_ELITE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KOGA_ELITE"], true, Type.POISON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.KOGA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KOGA"], true, Type.POISON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
   [TrainerType.KAREN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KAREN"], false, Type.DARK).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
   [TrainerType.SIDNEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SIDNEY"], true, Type.DARK).setMixedBattleBgm("battle_hoenn_elite"),
   [TrainerType.PHOEBE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["PHOEBE"], false, Type.GHOST).setMixedBattleBgm("battle_hoenn_elite"),

src/enums/trainer-type.ts

@@ -90,7 +90,7 @@ export enum TrainerType {
     LT_SURGE,
     ERIKA,
     JANINE,
-    KOGA,
+    KOGA_GYM,
     SABRINA,
     BLAINE,
     GIOVANNI,
@@ -165,7 +165,7 @@ export enum TrainerType {
     AGATHA,
     LANCE,
     WILL,
-    KOGA_ELITE,
+    KOGA,
     KAREN,
     SIDNEY,
     PHOEBE,

src/locales/de/dialogue-female.json

@@ -1604,7 +1604,7 @@
       "1": "Danke! Dank unseres Kampfes konnte ich auch Fortschritte in meiner Forschung machen!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon sind nicht nur rohe Gewalt - das wirst du bald genug sehen!"
     },

src/locales/de/dialogue-male.json

@@ -1604,7 +1604,7 @@
       "1": "Danke! Dank unseres Kampfes konnte ich auch Fortschritte in meiner Forschung machen!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon sind nicht nur rohe Gewalt - das wirst du bald genug sehen!"
     },

src/locales/en/dialogue-female.json

@@ -1604,7 +1604,7 @@
       "1": "Thanks! Thanks to our battle, I was also able to make progress in my research!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!"
     },

src/locales/en/dialogue-male.json

@@ -1604,7 +1604,7 @@
       "1": "Thanks! Thanks to our battle, I was also able to make progress in my research!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!"
     },

src/locales/ko/dialogue-female.json

@@ -1604,7 +1604,7 @@
       "1": "고마워! 방금 승부 덕분에, 내 연구도 진전을 이룬 것 같아!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "후하하하! 포켓몬은 단순히 강한 것만이 아니다--곧 알려주지!"
     },

src/locales/ko/dialogue-male.json

@@ -1604,7 +1604,7 @@
       "1": "고마워! 방금 승부 덕분에, 내 연구도 진전을 이룬 것 같아!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "후하하하! 포켓몬은 단순히 강한 것만이 아니다--곧 알려주지!"
     },

src/locales/pt_BR/dialogue-female.json

@@ -1570,7 +1570,7 @@
       "1": "Obrigado! Graças à nossa batalha, eu também pude fazer progressos na minha pesquisa!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1581,7 +1581,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon não são apenas sobre força bruta--você verá em breve!"
     },

src/locales/pt_BR/dialogue-male.json

@@ -1604,7 +1604,7 @@
       "1": "Obrigado! Graças à nossa batalha, eu também pude fazer progressos na minha pesquisa!"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "Fwahahahaha! Pokémon não são apenas sobre força bruta--você verá em breve!"
     },

src/locales/zh_CN/dialogue-female.json

@@ -1604,7 +1604,7 @@
       "1": "谢谢！多亏了我们的战斗，\n我的研究也取得了进展！"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "哇哈哈哈哈！$宝可梦不仅仅是关于蛮力，拭目以待吧！"
     },

src/locales/zh_CN/dialogue-male.json

@@ -1604,7 +1604,7 @@
       "1": "谢谢！多亏了我们的战斗，\n我的研究也取得了进展！"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1615,7 +1615,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "哇哈哈哈哈！$宝可梦不仅仅是关于蛮力，拭目以待吧！"
     },

src/locales/zh_TW/dialogue-female.json

@@ -1196,7 +1196,7 @@
       "1": "謝謝！多虧了我們的戰鬥，\n我的研究也取得了進展！"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1207,7 +1207,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "哇哈哈哈哈！$寶可夢不僅僅是關於蠻力，拭目以待吧！"
     },

src/locales/zh_TW/dialogue-male.json

@@ -1196,7 +1196,7 @@
       "1": "謝謝！多虧了我們的戰鬥，\n我的研究也取得了進展！"
     }
   },
-  "koga": {
+  "koga_gym": {
     "encounter": {
       "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
     },
@@ -1207,7 +1207,7 @@
       "1": "Despair to the creeping horror of Poison-type Pokémon!"
     }
   },
-  "koga_elite": {
+  "koga": {
     "encounter": {
       "1": "哇哈哈哈哈！$寶可夢不僅僅是關於蠻力，拭目以待吧！"
     },