From d8af010dbbf58a725bf72d4eae26a5d08c75b988 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:02:43 -0500
Subject: [PATCH] Apply kev's suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/data/trainers/TrainerPartyTemplate.ts     | 16 ++++------------
 src/data/trainers/evil-admin-trainer-pools.ts |  4 ++--
 src/data/trainers/trainer-config.ts           |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts
index c62beea3a7f..adbaacc6b55 100644
--- a/src/data/trainers/TrainerPartyTemplate.ts
+++ b/src/data/trainers/TrainerPartyTemplate.ts
@@ -238,18 +238,10 @@ export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
 }
 
 export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
-  return templates[
-    Math.min(
-      Math.max(
-        Math.ceil(
-          (globalScene.gameMode.getWaveForDifficulty(globalScene.currentBattle?.waveIndex || startingWave, true) - 20) /
-            30,
-        ),
-        0,
-      ),
-      templates.length - 1,
-    )
-  ];
+  const { currentBattle, gameMode } = globalScene;
+  const wave = gameMode.getWaveForDifficulty(currentBattle?.waveIndex || startingWave, true);
+  const templateIndex = Math.ceil((wave - 20) / 30);
+  return templates[Phaser.Math.Clamp(templateIndex, 0, templates.length - 1)];
 }
 
 export function getGymLeaderPartyTemplate() {
diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts
index c4b0e5540f0..87794de2852 100644
--- a/src/data/trainers/evil-admin-trainer-pools.ts
+++ b/src/data/trainers/evil-admin-trainer-pools.ts
@@ -123,7 +123,7 @@ const GALACTIC: TrainerTierPools = {
   [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT],
 };
 
-const PLASMA_ZINZOLAN: TrainerTierPools = {
+const PLASMA_ZINZOLIN: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
     Species.GIGALITH,
     Species.CONKELDURR,
@@ -422,7 +422,7 @@ export const evilAdminTrainerPools: Record<EvilTeam, TrainerTierPools> = {
   magma: MAGMA,
   aqua: AQUA,
   galactic: GALACTIC,
-  plasma_zinzolan: PLASMA_ZINZOLAN,
+  plasma_zinzolin: PLASMA_ZINZOLIN,
   plasma_colress: PLASMA_COLRESS,
   flare: FLARE,
   aether: AETHER,
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 978b445815c..f23027ffee8 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -2181,7 +2181,7 @@ export const trainerConfigs: TrainerConfigs = {
     }),
   [TrainerType.ZINZOLIN]: new TrainerConfig(++t)
     .setMoneyMultiplier(1.5)
-    .initForEvilTeamAdmin("plasma_sage", "plasma_zinzolan", [Species.CRYOGONAL])
+    .initForEvilTeamAdmin("plasma_sage", "plasma_zinzolin", [Species.CRYOGONAL])
     .setEncounterBgm(TrainerType.PLASMA_GRUNT)
     .setBattleBgm("battle_plasma_grunt")
     .setMixedBattleBgm("battle_plasma_grunt")