diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts
index 1952bcc179e..ccc494218e9 100644
--- a/src/data/trainers/TrainerPartyTemplate.ts
+++ b/src/data/trainers/TrainerPartyTemplate.ts
@@ -224,18 +224,19 @@ export const trainerPartyTemplates = {
  */
 export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
   const waveIndex = globalScene.currentBattle?.waveIndex;
-  switch (waveIndex) {
-    case ClassicFixedBossWaves.EVIL_GRUNT_1:
-      return trainerPartyTemplates.TWO_AVG;
-    case ClassicFixedBossWaves.EVIL_GRUNT_2:
-      return trainerPartyTemplates.THREE_AVG;
-    case ClassicFixedBossWaves.EVIL_GRUNT_3:
-      return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
-    case ClassicFixedBossWaves.EVIL_ADMIN_1:
-      return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
-    default:
-      return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1){
+    return trainerPartyTemplates.TWO_AVG;
   }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2){
+    return trainerPartyTemplates.THREE_AVG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3){
+    return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1){
+    return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
+  }
+  return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
 }
 
 export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {