From e730d64945b95aba49eaf924ef29c553abd2e433 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 5 May 2022 15:54:33 -0700 Subject: [PATCH] corrections --- include/battle.h | 1 + src/pokemon.c | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/battle.h b/include/battle.h index 4068454bf..fde4162c7 100644 --- a/include/battle.h +++ b/include/battle.h @@ -932,5 +932,6 @@ extern bool8 gHasFetchedBall; extern u8 gLastUsedBall; extern u16 gLastThrownBall; extern bool8 gSwapDamageCategory; // Photon Geyser, Shell Side Arm, Light That Burns the Sky +extern u8 gPartyCriticalHits[PARTY_SIZE]; #endif // GUARD_BATTLE_H diff --git a/src/pokemon.c b/src/pokemon.c index fe2bcf9dd..71176d2eb 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5394,21 +5394,6 @@ 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++) - { - switch (gEvolutionTable[species][i].method) - { - case EVO_CRITICAL_HITS: - if (gPartyCriticalHits[evolutionItem] >= gEvolutionTable[species][i].param) - targetSpecies = gEvolutionTable[species][i].targetSpecies; - break; - } - } - break; - #endif } return targetSpecies;