From 5edaec9f98f47edde4432ef4703530ec6ec4277b Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:31:26 -0700
Subject: [PATCH] [Bug] Remove ability swap code in `PlayerPokemon.evolve()`
 (#3113)

---
 src/field/pokemon.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 15770e13b47..ba88fa9e18a 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3315,10 +3315,6 @@ export class PlayerPokemon extends Pokemon {
       }
       this.generateName();
       if (!isFusion) {
-        // If a pokemon has its second ability and it evolves into a pokemon that doesn't have a second ability, switch to its first ability instead of its hidden ability
-        if (this.getSpeciesForm().ability2 === Abilities.NONE && this.abilityIndex === 1) {
-          this.abilityIndex = 0;
-        }
         // Prevent pokemon with an illegal ability value from breaking things too badly
         const abilityCount = this.getSpeciesForm().getAbilityCount();
         if (this.abilityIndex >= abilityCount) {
@@ -3327,9 +3323,6 @@ export class PlayerPokemon extends Pokemon {
           this.abilityIndex = 0;
         }
       } else { // Do the same as above, but for fusions
-        if (this.getFusionSpeciesForm().ability2 === Abilities.NONE && this.fusionAbilityIndex === 1) {
-          this.fusionAbilityIndex = 0;
-        }
         const abilityCount = this.getFusionSpeciesForm().getAbilityCount();
         if (this.fusionAbilityIndex >= abilityCount) {
           console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this");