diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts
index ce7d05c0494..3f1c5c3cd55 100644
--- a/src/data/trainers/TrainerPartyTemplate.ts
+++ b/src/data/trainers/TrainerPartyTemplate.ts
@@ -258,13 +258,16 @@ export function getGymLeaderPartyTemplate() {
     case GameModes.CLASSIC:
       if (currentBattle?.waveIndex <= 20) {
         return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong
-      } else if (currentBattle?.waveIndex <= 30) {
+      }
+      if (currentBattle?.waveIndex <= 30) {
         return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger
-      } else if (currentBattle?.waveIndex <= 60) {
-        // 50 and 60
+      }
+      // 50 and 60
+      if (currentBattle?.waveIndex <= 60) {
         return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
-      } else if (currentBattle?.waveIndex <= 90) {
-        // 80 and 90
+      }
+      // 80 and 90
+      if (currentBattle?.waveIndex <= 90) {
         return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
       }
       // 110+
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 71c21447d9e..d7216fd3835 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1775,7 +1775,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (doubleShiny) {
       return this.summonData.illusion?.basePokemon?.variant ?? this.variant;
     }
-
     return this.getVariant();
   }