From e343c73cd8cd3ad16bd045f9cf8b48b00f05f638 Mon Sep 17 00:00:00 2001
From: AgustinGDLV <agustingomezdelavega@gmail.com>
Date: Thu, 5 May 2022 15:17:31 -0700
Subject: [PATCH] fixed compile error + small tweaks

---
 src/battle_main.c | 6 +++++-
 src/pokemon.c     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index ca59ff86ef..ee61660622 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5191,7 +5191,11 @@ static void TrySpecialEvolution(void) // Attempts to perform non-level related b
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i, SPECIES_NONE);
+        #ifndef POKEMON_EXPANSION
+            u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i);
+        #else
+            u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i, SPECIES_NONE);
+        #endif
         if (species != SPECIES_NONE && !(sTriedEvolving & gBitTable[i]))
         {
             sTriedEvolving |= gBitTable[i];
diff --git a/src/pokemon.c b/src/pokemon.c
index ff2dcbe510..fe2bcf9dd7 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -5394,6 +5394,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem)
             }
         }
         break;
+    #ifdef BATTLE_ENGINE
     // Battle evolution without leveling; party slot is being passed into the evolutionItem arg.
     case EVO_MODE_BATTLE_SPECIAL:
         for (i = 0; i < EVOS_PER_MON; i++)
@@ -5407,6 +5408,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem)
             }
         }
         break;
+    #endif
     }
 
     return targetSpecies;