diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 7513f42c5d..131702a856 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -16,11 +16,9 @@ #define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 8, certain Pokémon have gained new egg groups. #ifndef ITEM_EXPANSION - //Item Definitions for gEvolutionTable //EVO_MEGA_EVOLUTION - #define ITEM_VENUSAURITE ITEM_NONE #define ITEM_CHARIZARDITE_X ITEM_NONE #define ITEM_CHARIZARDITE_Y ITEM_NONE @@ -70,7 +68,6 @@ #define ITEM_DIANCITE ITEM_NONE //EVO_TRADE_ITEM - #define ITEM_PROTECTOR ITEM_NONE #define ITEM_ELECTIRIZER ITEM_NONE #define ITEM_MAGMARIZER ITEM_NONE @@ -80,8 +77,7 @@ #define ITEM_SACHET ITEM_NONE #define ITEM_WHIPPED_DREAM ITEM_NONE -//EVO_ITEM* - +//EVO_ITEM #define ITEM_ICE_STONE ITEM_NONE #define ITEM_SHINY_STONE ITEM_NONE #define ITEM_DUSK_STONE ITEM_NONE @@ -93,13 +89,10 @@ #define ITEM_GALARICA_WREATH ITEM_NONE #define ITEM_CHIPPED_POT ITEM_NONE -//EVO_ITEM_HOLD* - +//EVO_ITEM_HOLD #define ITEM_RAZOR_FANG ITEM_NONE #define ITEM_RAZOR_CLAW ITEM_NONE #define ITEM_OVAL_STONE ITEM_NONE - - #endif #endif // GUARD_CONSTANTS_POKEMON_CONFIG_H diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 8721c63637..baf58ed966 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -474,7 +474,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_LEVEL, 30, SPECIES_TOXTRICITY_LOW_KEY}}, [SPECIES_SIZZLIPEDE] = {{EVO_LEVEL, 28, SPECIES_CENTISKORCH}}, [SPECIES_CLOBBOPUS] = {{EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}}, - [SPECIES_SINISTEA] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST}}, + [SPECIES_SINISTEA] = {{EVO_ITEM, ITEM_NONE, SPECIES_POLTEAGEIST}}, [SPECIES_HATENNA] = {{EVO_LEVEL, 32, SPECIES_HATTREM}}, [SPECIES_HATTREM] = {{EVO_LEVEL, 42, SPECIES_HATTERENE}}, [SPECIES_IMPIDIMP] = {{EVO_LEVEL, 32, SPECIES_MORGREM}}, @@ -504,8 +504,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, - [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, - {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}}, + [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLOWBRO_GALARIAN}, + {EVO_ITEM, ITEM_NONE, SPECIES_SLOWKING_GALARIAN}}, [SPECIES_FARFETCHD_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_SIRFETCHD}}, [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, @@ -533,5 +533,5 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}}, [SPECIES_PUMPKABOO_SUPER] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}}, [SPECIES_ROCKRUFF_OWN_TEMPO] = {{EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}}, - [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}}, + [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_NONE, SPECIES_POLTEAGEIST_ANTIQUE}}, };