From 1d39f0eeebc79f74ede1ffe782a066133ce78dc6 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Fri, 22 Mar 2024 21:38:10 -0400
Subject: [PATCH] Fixed form-based evolutions not taking form into account

---
 src/field/pokemon.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 6390aaed1..9094a6c45 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -759,7 +759,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     const evolutions = pokemonEvolutions[this.species.speciesId];
     for (let e of evolutions) {
-      if (!e.item && this.level >= e.level) {
+      if (!e.item && this.level >= e.level && (!e.preFormKey || this.getFormKey() === e.preFormKey)) {
         if (e.condition === null || (e.condition as SpeciesEvolutionCondition).predicate(this))
           return e;
       }