From c0470c3932d94adbb3894c50b184b95c306e84e2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 3 May 2019 17:31:23 +0200 Subject: [PATCH] Remove skarmory mega evo --- src/data/items.h | 1 - src/data/pokemon/evolution.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 6d1673ee0..4d262e683 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -177,7 +177,6 @@ const struct Item gItems[] = .name = _("POTION"), .itemId = ITEM_POTION, .price = 300, - .holdEffect = HOLD_EFFECT_MEGA_STONE, .holdEffectParam = 20, .description = sPotionDesc, .pocket = POCKET_ITEMS, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 931375383..c9b0cf716 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -184,5 +184,4 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, - [SPECIES_SKARMORY] = {{EVO_MEGA_EVOLUTION, ITEM_POTION, SPECIES_HO_OH}}, };