Merge 0d08865d13 into bb86bdd2a6

2025-08-07 07:59:26 +02:00 · 2025-08-06 04:16:10 +00:00 · 2025-08-06 04:16:10 +00:00 · ed8ce45e55
commit ed8ce45e55
parent bb86bdd2a6 0d08865d13
2 changed files with 189 additions and 169 deletions
--- a/src/data/balance/signature-species.ts
+++ b/src/data/balance/signature-species.ts
@ -30,7 +30,7 @@ export const signatureSpecies: SignatureSpecies = new Proxy({
  FALKNER: [SpeciesId.PIDGEY, SpeciesId.HOOTHOOT, SpeciesId.NATU, SpeciesId.MURKROW],
  BUGSY: [SpeciesId.SCYTHER, SpeciesId.SHUCKLE, SpeciesId.YANMA, [SpeciesId.PINSIR, SpeciesId.HERACROSS]],
  WHITNEY: [SpeciesId.MILTANK, SpeciesId.AIPOM, SpeciesId.IGGLYBUFF, [SpeciesId.GIRAFARIG, SpeciesId.STANTLER]],
-  MORTY: [SpeciesId.GASTLY, SpeciesId.MISDREAVUS, SpeciesId.DUSKULL, SpeciesId.SABLEYE],
+  MORTY: [SpeciesId.GASTLY, SpeciesId.MISDREAVUS, SpeciesId.DUSKULL, SpeciesId.HISUI_TYPHLOSION],
  CHUCK: [SpeciesId.POLIWRATH, SpeciesId.MANKEY, SpeciesId.TYROGUE, SpeciesId.MACHOP],
  JASMINE: [SpeciesId.STEELIX, SpeciesId.MAGNEMITE, SpeciesId.PINECO, SpeciesId.SKARMORY],
  PRYCE: [SpeciesId.SWINUB, SpeciesId.SEEL, SpeciesId.SHELLDER, SpeciesId.SNEASEL],
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@ -3791,27 +3791,27 @@ export const trainerConfigs: TrainerConfigs = {
    .setDoubleTrainerType(TrainerType.RED)
    .setDoubleTitle("champion_double")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.ALAKAZAM]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.MACHAMP]))
    .setPartyMemberFunc(
-      2,
-      getRandomPartyMemberFunc([SpeciesId.HO_OH], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
-      }),
-    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.RHYPERIOR, SpeciesId.ELECTIVIRE]))
-    .setPartyMemberFunc(
-      4,
+      1,
      getRandomPartyMemberFunc(
        [SpeciesId.ARCANINE, SpeciesId.EXEGGUTOR, SpeciesId.GYARADOS],
        TrainerSlot.TRAINER,
        true,
        p => {
          p.generateAndPopulateMoveset();
-          p.setBoss(true, 2);
+          p.teraType = p.species.type1;
        },
      ),
    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.RHYPERIOR, SpeciesId.ELECTIVIRE]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.MACHAMP]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([SpeciesId.HO_OH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.PIDGEOT], TrainerSlot.TRAINER, true, p => {
@ -3819,9 +3819,10 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.generateName();
        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
      }),
    )
-    .setInstantTera(3), // Tera Ground or Rock Rhyperior / Electric Electivire / Fire Magmortar
+    .setInstantTera(2), // Tera Fire Arcanine, Tera Grass Exeggutor, Tera Water Gyarados
  [TrainerType.RED]: new TrainerConfig(++t)
    .initForChampion(true)
    .setBattleBgm("battle_johto_champion")
@ -3838,22 +3839,16 @@ export const trainerConfigs: TrainerConfigs = {
        p.gender = Gender.MALE;
      }),
    )
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.ESPEON, SpeciesId.UMBREON, SpeciesId.SYLVEON]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.MEGANIUM, SpeciesId.TYPHLOSION, SpeciesId.FERALIGATR]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.ESPEON, SpeciesId.UMBREON, SpeciesId.SYLVEON]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.SNORLAX]))
    .setPartyMemberFunc(
-      2,
+      4,
      getRandomPartyMemberFunc([SpeciesId.LUGIA], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.MEGANIUM, SpeciesId.TYPHLOSION, SpeciesId.FERALIGATR]))
-    .setPartyMemberFunc(
-      4,
-      getRandomPartyMemberFunc([SpeciesId.SNORLAX], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
-      }),
-    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc(
@ -3865,10 +3860,11 @@ export const trainerConfigs: TrainerConfigs = {
          p.generateAndPopulateMoveset();
          p.generateName();
          p.gender = Gender.MALE;
+          p.setBoss(true, 2);
        },
      ),
    )
-    .setInstantTera(3), // Tera Grass Meganium / Fire Typhlosion / Water Feraligatr
+    .setInstantTera(1), // Tera Grass Meganium / Fire Typhlosion / Water Feraligatr
  [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t)
    .setName("Lance")
    .initForChampion(true)
@ -3876,37 +3872,38 @@ export const trainerConfigs: TrainerConfigs = {
    .setMixedBattleBgm("battle_johto_champion")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.GYARADOS, SpeciesId.KINGDRA]))
    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.AERODACTYL]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.CHARIZARD]))
    .setPartyMemberFunc(
-      2,
+      3,
+      getRandomPartyMemberFunc(
+        [SpeciesId.TYRANITAR, SpeciesId.GARCHOMP, SpeciesId.HYDREIGON],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.abilityIndex = 2; // Unnerve Tyranitar, Rough Skin Garchomp, Levitate Hydreigon
+          p.generateAndPopulateMoveset();
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      4,
      getRandomPartyMemberFunc([SpeciesId.SALAMENCE], TrainerSlot.TRAINER, true, p => {
        p.formIndex = 1; // Mega Salamence
        p.generateAndPopulateMoveset();
        p.generateName();
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.CHARIZARD]))
-    .setPartyMemberFunc(
-      4,
-      getRandomPartyMemberFunc(
-        [SpeciesId.TYRANITAR, SpeciesId.GARCHOMP, SpeciesId.KOMMO_O],
-        TrainerSlot.TRAINER,
-        true,
-        p => {
-          p.teraType = PokemonType.DRAGON;
-          p.generateAndPopulateMoveset();
-          p.abilityIndex = p.species.speciesId === SpeciesId.KOMMO_O ? 1 : 2; // Soundproof Kommo-o, Unnerve Tyranitar, Rough Skin Garchomp
-        },
-      ),
-    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.DRAGONITE], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
+        p.abilityIndex = 2; // Multiscale
        p.gender = Gender.MALE;
        p.setBoss(true, 2);
+        p.teraType = PokemonType.DRAGON;
      }),
    )
-    .setInstantTera(4), // Tera Dragon Tyranitar / Garchomp / Kommo-o
+    .setInstantTera(5), // Tera Dragon Dragonite
  [TrainerType.STEVEN]: new TrainerConfig(++t)
    .initForChampion(true)
    .setBattleBgm("battle_hoenn_champion_g5")
@ -3914,16 +3911,22 @@ export const trainerConfigs: TrainerConfigs = {
    .setHasDouble("steven_wallace_double")
    .setDoubleTrainerType(TrainerType.WALLACE)
    .setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.SKARMORY]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.CRADILY, SpeciesId.ARMALDO]))
    .setPartyMemberFunc(
-      2,
-      getRandomPartyMemberFunc([SpeciesId.AGGRON], TrainerSlot.TRAINER, true, p => {
+      0,
+      getRandomPartyMemberFunc([SpeciesId.GIGALITH], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Sand Stream
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.SKARMORY, SpeciesId.CLAYDOL]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.AGGRON]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([SpeciesId.GOLURK, SpeciesId.RUNERIGUS], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Iron Fist Golurk, Wandering Spirit Runerigus
        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.GOLURK, SpeciesId.RUNERIGUS]))
    .setPartyMemberFunc(
      4,
      getRandomPartyMemberFunc(
@ -3942,6 +3945,7 @@ export const trainerConfigs: TrainerConfigs = {
        p.formIndex = 1; // Mega Metagross
        p.generateAndPopulateMoveset();
        p.generateName();
+        p.setBoss(true, 2);
      }),
    )
    .setInstantTera(4), // Tera Rock Regirock / Ice Regice / Steel Registeel
@ -3954,26 +3958,33 @@ export const trainerConfigs: TrainerConfigs = {
    .setDoubleTitle("champion_double")
    .setPartyMemberFunc(
      0,
-      getRandomPartyMemberFunc([SpeciesId.PELIPPER], TrainerSlot.TRAINER, true, p => {
-        p.abilityIndex = 1; // Drizzle
+      getRandomPartyMemberFunc([SpeciesId.POLITOED, SpeciesId.PELIPPER], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = p.species.speciesId === SpeciesId.POLITOED ? 2 : 1; // Drizzle
        p.generateAndPopulateMoveset();
      }),
    )
    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.LUDICOLO]))
    .setPartyMemberFunc(
      2,
-      getRandomPartyMemberFunc([SpeciesId.LATIAS, SpeciesId.LATIOS], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1; // Mega Latios or Mega Latias
+      getRandomPartyMemberFunc([SpeciesId.TENTACRUEL, SpeciesId.WALREIN], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = p.species.speciesId === SpeciesId.TENTACRUEL ? 2 : 0; // Rain Dish Tentacruel, Thick Fat Walrein
        p.generateAndPopulateMoveset();
-        p.generateName();
-        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.SWAMPERT, SpeciesId.GASTRODON, SpeciesId.SEISMITOAD]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([SpeciesId.LATIAS, SpeciesId.LATIOS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.REGIELEKI, SpeciesId.REGIDRAGO], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.SWAMPERT], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Swampert
        p.generateAndPopulateMoveset();
+        p.generateName();
        p.pokeball = PokeballType.ULTRA_BALL;
      }),
    )
@ -3985,22 +3996,14 @@ export const trainerConfigs: TrainerConfigs = {
        p.setBoss(true, 2);
      }),
    )
-    .setInstantTera(4), // Tera Electric Regieleki / Dragon Regidrago
+    .setInstantTera(5), // Tera Water Milotic
  [TrainerType.CYNTHIA]: new TrainerConfig(++t)
    .initForChampion(false)
    .setBattleBgm("battle_sinnoh_champion")
    .setMixedBattleBgm("battle_sinnoh_champion")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.SPIRITOMB]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.LUCARIO]))
    .setPartyMemberFunc(
-      2,
-      getRandomPartyMemberFunc([SpeciesId.GIRATINA], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
-      }),
-    )
-    .setPartyMemberFunc(
-      3,
+      1,
      getRandomPartyMemberFunc(
        [SpeciesId.MILOTIC, SpeciesId.ROSERADE, SpeciesId.HISUI_ARCANINE],
        TrainerSlot.TRAINER,
@ -4011,11 +4014,13 @@ export const trainerConfigs: TrainerConfigs = {
        },
      ),
    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.TOGEKISS]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.LUCARIO]))
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.TOGEKISS], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.GIRATINA], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
+        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
    .setPartyMemberFunc(
@ -4025,9 +4030,10 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.generateName();
        p.gender = Gender.FEMALE;
+        p.setBoss(true, 2);
      }),
    )
-    .setInstantTera(3), // Tera Water Milotic / Grass Roserade / Fire Hisuian Arcanine
+    .setInstantTera(1), // Tera Water Milotic / Grass Roserade / Fire Hisuian Arcanine
  [TrainerType.ALDER]: new TrainerConfig(++t)
    .initForChampion(true)
    .setHasDouble("alder_iris_double")
@ -4050,29 +4056,26 @@ export const trainerConfigs: TrainerConfigs = {
    )
    .setPartyMemberFunc(
      2,
-      getRandomPartyMemberFunc([SpeciesId.ZEKROM], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.KELDEO], TrainerSlot.TRAINER, true, p => {
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Resolute Form
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === MoveId.SECRET_SWORD)) {
+          // Check if Secret Sword is in the moveset, if not, replace the third move with Secret Sword.
+          p.moveset[2] = new PokemonMove(MoveId.SECRET_SWORD);
+        }
      }),
    )
    .setPartyMemberFunc(
      3,
-      getRandomPartyMemberFunc([SpeciesId.KELDEO], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.ULTRA_BALL;
-      }),
+      getRandomPartyMemberFunc([SpeciesId.CHANDELURE, SpeciesId.KROOKODILE, SpeciesId.REUNICLUS, SpeciesId.CONKELDURR]),
    )
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc(
-        [SpeciesId.CHANDELURE, SpeciesId.KROOKODILE, SpeciesId.REUNICLUS, SpeciesId.CONKELDURR],
-        TrainerSlot.TRAINER,
-        true,
-        p => {
-          p.generateAndPopulateMoveset();
-          p.teraType = p.species.speciesId === SpeciesId.KROOKODILE ? PokemonType.DARK : p.species.type1;
-        },
-      ),
+      getRandomPartyMemberFunc([SpeciesId.ZEKROM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
    )
    .setPartyMemberFunc(
      5,
@ -4080,9 +4083,10 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.gender = Gender.MALE;
        p.setBoss(true, 2);
+        p.teraType = PokemonType.FIRE;
      }),
    )
-    .setInstantTera(4), // Tera Ghost Chandelure / Dark Krookodile / Psychic Reuniclus / Fighting Conkeldurr
+    .setInstantTera(5), // Tera Fire Volcarona
  [TrainerType.IRIS]: new TrainerConfig(++t)
    .initForChampion(false)
    .setBattleBgm("battle_champion_iris")
@ -4091,34 +4095,29 @@ export const trainerConfigs: TrainerConfigs = {
    .setDoubleTrainerType(TrainerType.ALDER)
    .setDoubleTitle("champion_double")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.DRUDDIGON]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.ARCHEOPS]))
    .setPartyMemberFunc(
-      2,
-      getRandomPartyMemberFunc([SpeciesId.RESHIRAM], TrainerSlot.TRAINER, true, p => {
+      1,
+      getRandomPartyMemberFunc([SpeciesId.ARCHEOPS], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 2; // Emergency Exit
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.AGGRON, SpeciesId.HYDREIGON, SpeciesId.ARCHALUDON]))
    .setPartyMemberFunc(
      3,
-      getRandomPartyMemberFunc(
-        [SpeciesId.SALAMENCE, SpeciesId.HYDREIGON, SpeciesId.ARCHALUDON],
-        TrainerSlot.TRAINER,
-        true,
-        p => {
-          p.generateAndPopulateMoveset();
-          p.teraType = PokemonType.DRAGON;
-        },
-      ),
-    )
-    .setPartyMemberFunc(
-      4,
      getRandomPartyMemberFunc([SpeciesId.LAPRAS], TrainerSlot.TRAINER, true, p => {
        p.formIndex = 1; // G-Max Lapras
        p.generateAndPopulateMoveset();
        p.generateName();
      }),
    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([SpeciesId.RESHIRAM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.HAXORUS], TrainerSlot.TRAINER, true, p => {
@ -4128,37 +4127,32 @@ export const trainerConfigs: TrainerConfigs = {
        p.setBoss(true, 2);
      }),
    )
-    .setInstantTera(3), // Tera Dragon Salamence / Hydreigon / Archaludon
+    .setInstantTera(5), // Tera Dragon Haxorus
  [TrainerType.DIANTHA]: new TrainerConfig(++t)
    .initForChampion(false)
    .setMixedBattleBgm("battle_kalos_champion")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.HAWLUCHA]))
    .setPartyMemberFunc(
-      0,
-      getRandomPartyMemberFunc([SpeciesId.HAWLUCHA], TrainerSlot.TRAINER, true, p => {
+      1,
+      getRandomPartyMemberFunc([SpeciesId.TREVENANT, SpeciesId.GOURGEIST], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 2; // Harvest Trevenant, Insomnia Gourgeist
        p.generateAndPopulateMoveset();
      }),
    )
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.TREVENANT, SpeciesId.GOURGEIST]))
    .setPartyMemberFunc(
      2,
-      getRandomPartyMemberFunc([SpeciesId.XERNEAS], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
-      }),
-    )
-    .setPartyMemberFunc(
-      3,
      getRandomPartyMemberFunc([SpeciesId.TYRANTRUM, SpeciesId.AURORUS], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus
        p.teraType = p.species.type2!;
      }),
    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.GOODRA]))
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.GOODRA], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.XERNEAS], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
+        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
    .setPartyMemberFunc(
@ -4168,6 +4162,7 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.generateName();
        p.gender = Gender.FEMALE;
+        p.setBoss(true, 2);
      }),
    )
    .setInstantTera(3), // Tera Dragon Tyrantrum / Ice Aurorus
@ -4181,7 +4176,13 @@ export const trainerConfigs: TrainerConfigs = {
        p.formIndex = 2; // Dusk Lycanroc
      }),
    )
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.MAGNEZONE, SpeciesId.ALOLA_NINETALES]))
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([SpeciesId.MAGNEZONE, SpeciesId.ALOLA_NINETALES], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = p.species.speciesId === SpeciesId.MAGNEZONE ? 1 : 2; // Sturdy Magnezone, Snow Warning Ninetales
+      }),
+    )
    .setPartyMemberFunc(
      2,
      getRandomPartyMemberFunc(
@ -4197,9 +4198,8 @@ export const trainerConfigs: TrainerConfigs = {
    )
    .setPartyMemberFunc(
      3,
-      getRandomPartyMemberFunc([SpeciesId.TAPU_KOKO, SpeciesId.TAPU_FINI], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.TAPU_LELE, SpeciesId.TAPU_FINI], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
        p.pokeball = PokeballType.ULTRA_BALL;
      }),
    )
@ -4216,6 +4216,7 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.gender = Gender.MALE;
        p.teraType = p.species.type2!;
+        p.setBoss(true, 2);
      }),
    )
    .setInstantTera(5), // Tera Dark Incineroar / Fighting Hisuian Decidueye
@ -4223,28 +4224,32 @@ export const trainerConfigs: TrainerConfigs = {
    .initForChampion(true)
    .setMixedBattleBgm("battle_alola_champion")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.ALOLA_RAICHU]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.NOIVERN]))
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([SpeciesId.NOIVERN], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Infiltrator
+        p.generateAndPopulateMoveset();
+      }),
+    )
    .setPartyMemberFunc(
      2,
-      getRandomPartyMemberFunc([SpeciesId.SOLGALEO], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.BLACEPHALON, SpeciesId.STAKATAKA], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
+        p.pokeball = PokeballType.ROGUE_BALL;
      }),
    )
    .setPartyMemberFunc(
      3,
-      getRandomPartyMemberFunc([SpeciesId.TAPU_LELE, SpeciesId.TAPU_BULU], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.TAPU_KOKO, SpeciesId.TAPU_BULU], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.ULTRA_BALL;
-        p.teraType = p.species.type1;
      }),
    )
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.ZYGARDE], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1; // Zygarde 10% forme, Aura Break
+      getRandomPartyMemberFunc([SpeciesId.SOLGALEO], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.ROGUE_BALL;
+        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
    .setPartyMemberFunc(
@ -4253,34 +4258,35 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.setBoss(true, 2);
        p.gender = p.species.speciesId === SpeciesId.PRIMARINA ? Gender.FEMALE : Gender.MALE;
+        p.teraType = p.species.speciesId === SpeciesId.PRIMARINA ? PokemonType.WATER : PokemonType.GHOST;
      }),
    )
-    .setInstantTera(3), // Tera Psychic Tapu Lele / Grass Tapu Bulu
+    .setInstantTera(5), // Tera Ghost Decidueye, Water Primarina
  [TrainerType.LEON]: new TrainerConfig(++t)
    .initForChampion(true)
    .setMixedBattleBgm("battle_galar_champion")
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([SpeciesId.AEGISLASH]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.RHYPERIOR, SpeciesId.SEISMITOAD, SpeciesId.MR_RIME]))
    .setPartyMemberFunc(
-      2,
+      1,
+      getRandomPartyMemberFunc(
+        [SpeciesId.RHYPERIOR, SpeciesId.SEISMITOAD, SpeciesId.MR_RIME],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.abilityIndex = 1; // Solid Rock Rhyperior, Poison Touch Seismitoad, Screen Cleaner Mr. Rime
+          p.generateAndPopulateMoveset();
+        },
+      ),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.DRAGAPULT]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.RILLABOOM, SpeciesId.CINDERACE, SpeciesId.INTELEON]))
+    .setPartyMemberFunc(
+      4,
      getRandomPartyMemberFunc([SpeciesId.ZACIAN], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.DRAGAPULT]))
-    .setPartyMemberFunc(
-      4,
-      getRandomPartyMemberFunc(
-        [SpeciesId.RILLABOOM, SpeciesId.CINDERACE, SpeciesId.INTELEON],
-        TrainerSlot.TRAINER,
-        true,
-        p => {
-          p.generateAndPopulateMoveset();
-          p.setBoss(true, 2);
-        },
-      ),
-    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.CHARIZARD], TrainerSlot.TRAINER, true, p => {
@ -4288,9 +4294,10 @@ export const trainerConfigs: TrainerConfigs = {
        p.generateAndPopulateMoveset();
        p.generateName();
        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
      }),
    )
-    .setInstantTera(3), // Tera Dragapult to Ghost or Dragon
+    .setInstantTera(3), // Tera Grass Rillaboom, Fire Cinderace, Water Inteleon
  [TrainerType.MUSTARD]: new TrainerConfig(++t)
    .initForChampion(true)
    .setMixedBattleBgm("battle_mustard")
@ -4312,36 +4319,38 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getRandomPartyMemberFunc([SpeciesId.GALAR_SLOWBRO, SpeciesId.GALAR_SLOWKING], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
+        p.abilityIndex = p.species.speciesId === SpeciesId.GALAR_SLOWBRO ? 0 : 2; // Quick Draw Galar Slowbro, Regenerator Galar Slowking
        p.pokeball = PokeballType.ULTRA_BALL;
-        p.teraType = p.species.type1;
      }),
    )
    .setPartyMemberFunc(
      3,
-      getRandomPartyMemberFunc([SpeciesId.GALAR_DARMANITAN], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.BLASTOISE, SpeciesId.VENUSAUR], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 2; // G-Max Blastoise, G-Max Venusaur
      }),
    )
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.BLASTOISE, SpeciesId.VENUSAUR], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.ZAMAZENTA], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.setBoss(true, 2);
        p.pokeball = PokeballType.ULTRA_BALL;
      }),
    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.URSHIFU], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = randSeedIntRange(2, 3); // Random G-Max Urshifu
+        p.formIndex = randSeedIntRange(0, 1); // Random Urshifu form
        p.generateAndPopulateMoveset();
        p.generateName();
        p.gender = Gender.MALE;
        p.pokeball = PokeballType.ULTRA_BALL;
+        p.setBoss(true, 2);
+        p.teraType = p.formIndex === 0 ? PokemonType.DARK : PokemonType.WATER;
      }),
    )
-    .setInstantTera(2), // Tera Poison Galar-Slowbro / Galar-Slowking
+    .setInstantTera(5), // Tera Dark Urshifu Single / Tera Water Urshifu Rapid
  [TrainerType.GEETA]: new TrainerConfig(++t)
    .initForChampion(false)
    .setMixedBattleBgm("battle_champion_geeta")
@ -4353,16 +4362,22 @@ export const trainerConfigs: TrainerConfigs = {
        p.setBoss(true, 2);
      }),
    )
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.ESPATHRA, SpeciesId.VELUZA]))
    .setPartyMemberFunc(
-      2,
+      1,
+      getRandomPartyMemberFunc([SpeciesId.ESPATHRA], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Opportunist
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.BAXCALIBUR]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.CHESNAUGHT, SpeciesId.DELPHOX, SpeciesId.GRENINJA]))
+    .setPartyMemberFunc(
+      4,
      getRandomPartyMemberFunc([SpeciesId.MIRAIDON], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.BAXCALIBUR]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([SpeciesId.CHESNAUGHT, SpeciesId.DELPHOX, SpeciesId.GRENINJA]))
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
@ -4389,19 +4404,19 @@ export const trainerConfigs: TrainerConfigs = {
    .setPartyMemberFunc(1, getRandomPartyMemberFunc([SpeciesId.PAWMOT]))
    .setPartyMemberFunc(
      2,
+      getRandomPartyMemberFunc([SpeciesId.DUDUNSPARCE], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Serene Grace
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.CERULEDGE, SpeciesId.ARMAROUGE]))
+    .setPartyMemberFunc(
+      4,
      getRandomPartyMemberFunc([SpeciesId.KORAIDON], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([SpeciesId.GHOLDENGO]))
-    .setPartyMemberFunc(
-      4,
-      getRandomPartyMemberFunc([SpeciesId.ARMAROUGE, SpeciesId.CERULEDGE], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.teraType = p.species.type2!;
-      }),
-    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc(
@ -4412,10 +4427,11 @@ export const trainerConfigs: TrainerConfigs = {
          p.generateAndPopulateMoveset();
          p.gender = Gender.MALE;
          p.setBoss(true, 2);
+          p.teraType = p.species.type1!;
        },
      ),
    )
-    .setInstantTera(4), // Tera Psychic Armarouge / Ghost Ceruledge
+    .setInstantTera(5), // Tera Grass Meowscarada, Fire Skeledirge, Water Quaquaval
  [TrainerType.KIERAN]: new TrainerConfig(++t)
    .initForChampion(true)
    .setMixedBattleBgm("battle_champion_kieran")
@ -4429,9 +4445,9 @@ export const trainerConfigs: TrainerConfigs = {
    )
    .setPartyMemberFunc(
      2,
-      getRandomPartyMemberFunc([SpeciesId.TERAPAGOS], TrainerSlot.TRAINER, true, p => {
+      getRandomPartyMemberFunc([SpeciesId.DRAGONITE], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 2; // Multiscale
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
    .setPartyMemberFunc(
@ -4443,25 +4459,29 @@ export const trainerConfigs: TrainerConfigs = {
    )
    .setPartyMemberFunc(
      4,
-      getRandomPartyMemberFunc([SpeciesId.OGERPON], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = randSeedInt(4); // Random Ogerpon Tera Mask
+      getRandomPartyMemberFunc([SpeciesId.TERAPAGOS], TrainerSlot.TRAINER, true, p => {
        p.generateAndPopulateMoveset();
-        p.pokeball = PokeballType.ULTRA_BALL;
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === MoveId.IVY_CUDGEL)) {
-          // Check if Ivy Cudgel is in the moveset, if not, replace the first move with Ivy Cudgel.
-          p.moveset[0] = new PokemonMove(MoveId.IVY_CUDGEL);
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === MoveId.TERA_STARSTORM)) {
+          // Check if Tera Starstorm is in the moveset, if not, replace the first move with Tera Starstorm.
+          p.moveset[0] = new PokemonMove(MoveId.TERA_STARSTORM);
        }
+        p.pokeball = PokeballType.MASTER_BALL;
      }),
    )
    .setPartyMemberFunc(
      5,
      getRandomPartyMemberFunc([SpeciesId.HYDRAPPLE], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
        p.gender = Gender.MALE;
        p.setBoss(true, 2);
+        p.teraType = PokemonType.FIGHTING;
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === MoveId.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(MoveId.TERA_BLAST);
+        }
      }),
    )
-    .setInstantTera(4), // Tera Ogerpon
+    .setInstantTera(5), // Tera Fighting Hydrapple

  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL))
    .setName("Finn")