Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE

This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-30 22:12:02 -03:00
parent 0fd9d2c0d5
commit 5bf300f97c

View File

@ -20,153 +20,153 @@
#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
#define ITEM_BLASTOISINITE ITEM_NONE
#define ITEM_BEEDRILLITE ITEM_NONE
#define ITEM_PIDGEOTITE ITEM_NONE
#define ITEM_ALAKAZITE ITEM_NONE
#define ITEM_SLOWBRONITE ITEM_NONE
#define ITEM_GENGARITE ITEM_NONE
#define ITEM_KANGASKHANITE ITEM_NONE
#define ITEM_PINSIRITE ITEM_NONE
#define ITEM_GYARADOSITE ITEM_NONE
#define ITEM_AERODACTYLITE ITEM_NONE
#define ITEM_MEWTWONITE_X ITEM_NONE
#define ITEM_MEWTWONITE_Y ITEM_NONE
#define ITEM_AMPHAROSITE ITEM_NONE
#define ITEM_STEELIXITE ITEM_NONE
#define ITEM_SCIZORITE ITEM_NONE
#define ITEM_HERACRONITE ITEM_NONE
#define ITEM_HOUNDOOMINITE ITEM_NONE
#define ITEM_TYRANITARITE ITEM_NONE
#define ITEM_SCEPTILITE ITEM_NONE
#define ITEM_BLAZIKENITE ITEM_NONE
#define ITEM_SWAMPERTITE ITEM_NONE
#define ITEM_SABLENITE ITEM_NONE
#define ITEM_SHARPEDONITE ITEM_NONE
#define ITEM_MANECTITE ITEM_NONE
#define ITEM_CAMERUPTITE ITEM_NONE
#define ITEM_GLALITITE ITEM_NONE
#define ITEM_MAWILITE ITEM_NONE
#define ITEM_MEDICHAMITE ITEM_NONE
#define ITEM_ALTARIANITE ITEM_NONE
#define ITEM_ABSOLITE ITEM_NONE
#define ITEM_BANETTITE ITEM_NONE
#define ITEM_AGGRONITE ITEM_NONE
#define ITEM_GARDEVOIRITE ITEM_NONE
#define ITEM_SALAMENCITE ITEM_NONE
#define ITEM_METAGROSSITE ITEM_NONE
#define ITEM_LATIASITE ITEM_NONE
#define ITEM_LATIOSITE ITEM_NONE
#define ITEM_LOPUNNITE ITEM_NONE
#define ITEM_GARCHOMPITE ITEM_NONE
#define ITEM_LUCARIONITE ITEM_NONE
#define ITEM_ABOMASITE ITEM_NONE
#define ITEM_GALLADITE ITEM_NONE
#define ITEM_AUDINITE ITEM_NONE
#define ITEM_DIANCITE ITEM_NONE
//EVO_MEGA_EVOLUTION
#define ITEM_VENUSAURITE 10001
#define ITEM_CHARIZARDITE_X 10002
#define ITEM_CHARIZARDITE_Y 10003
#define ITEM_BLASTOISINITE 10004
#define ITEM_BEEDRILLITE 10005
#define ITEM_PIDGEOTITE 10006
#define ITEM_ALAKAZITE 10007
#define ITEM_SLOWBRONITE 10008
#define ITEM_GENGARITE 10009
#define ITEM_KANGASKHANITE 10010
#define ITEM_PINSIRITE 10011
#define ITEM_GYARADOSITE 10012
#define ITEM_AERODACTYLITE 10013
#define ITEM_MEWTWONITE_X 10014
#define ITEM_MEWTWONITE_Y 10015
#define ITEM_AMPHAROSITE 10016
#define ITEM_STEELIXITE 10017
#define ITEM_SCIZORITE 10018
#define ITEM_HERACRONITE 10019
#define ITEM_HOUNDOOMINITE 10020
#define ITEM_HOUNDOOMINITE 10021
#define ITEM_SCEPTILITE 10022
#define ITEM_BLAZIKENITE 10023
#define ITEM_SWAMPERTITE 10024
#define ITEM_SABLENITE 10025
#define ITEM_SHARPEDONITE 10026
#define ITEM_MANECTITE 10027
#define ITEM_CAMERUPTITE 10028
#define ITEM_GLALITITE 10029
#define ITEM_MAWILITE 10030
#define ITEM_MEDICHAMITE 10031
#define ITEM_ALTARIANITE 10032
#define ITEM_ABSOLITE 10033
#define ITEM_BANETTITE 10034
#define ITEM_AGGRONITE 10035
#define ITEM_GARDEVOIRITE 10036
#define ITEM_SALAMENCITE 10037
#define ITEM_METAGROSSITE 10038
#define ITEM_LATIASITE 10039
#define ITEM_LATIOSITE 10040
#define ITEM_LOPUNNITE 10041
#define ITEM_GARCHOMPITE 10042
#define ITEM_LUCARIONITE 10043
#define ITEM_ABOMASITE 10044
#define ITEM_GALLADITE 10045
#define ITEM_AUDINITE 10046
#define ITEM_DIANCITE 10047
//EVO_TRADE_ITEM
#define ITEM_PROTECTOR ITEM_NONE
#define ITEM_ELECTIRIZER ITEM_NONE
#define ITEM_MAGMARIZER ITEM_NONE
#define ITEM_DUBIOUS_DISC ITEM_NONE
#define ITEM_PRISM_SCALE ITEM_NONE
#define ITEM_REAPER_CLOTH ITEM_NONE
#define ITEM_SACHET ITEM_NONE
#define ITEM_WHIPPED_DREAM ITEM_NONE
//EVO_TRADE_ITEM
#define ITEM_PROTECTOR 10048
#define ITEM_ELECTIRIZER 10049
#define ITEM_MAGMARIZER 10050
#define ITEM_DUBIOUS_DISC 10051
#define ITEM_PRISM_SCALE 10052
#define ITEM_REAPER_CLOTH 10053
#define ITEM_SACHET 10054
#define ITEM_WHIPPED_DREAM 10055
//EVO_ITEM
#define ITEM_ICE_STONE ITEM_NONE
#define ITEM_SHINY_STONE ITEM_NONE
#define ITEM_DUSK_STONE ITEM_NONE
#define ITEM_DAWN_STONE ITEM_NONE
#define ITEM_TART_APPLE ITEM_NONE
#define ITEM_SWEET_APPLE ITEM_NONE
#define ITEM_CRACKED_POT ITEM_NONE
#define ITEM_GALARICA_CUFF ITEM_NONE
#define ITEM_GALARICA_WREATH ITEM_NONE
#define ITEM_CHIPPED_POT ITEM_NONE
//EVO_ITEM
#define ITEM_ICE_STONE 10056
#define ITEM_SHINY_STONE 10057
#define ITEM_DUSK_STONE 10058
#define ITEM_DAWN_STONE 10059
#define ITEM_TART_APPLE 10060
#define ITEM_SWEET_APPLE 10061
#define ITEM_CRACKED_POT 10062
#define ITEM_GALARICA_CUFF 10063
#define ITEM_GALARICA_WREATH 10064
#define ITEM_CHIPPED_POT 10065
//EVO_ITEM_HOLD
#define ITEM_RAZOR_FANG ITEM_NONE
#define ITEM_RAZOR_CLAW ITEM_NONE
#define ITEM_OVAL_STONE ITEM_NONE
//EVO_ITEM_HOLD
#define ITEM_RAZOR_FANG 10066
#define ITEM_RAZOR_CLAW 10067
#define ITEM_OVAL_STONE 10068
//FORM_ITEM_HOLD
#define ITEM_GRISEOUS_ORB ITEM_NONE
#define ITEM_DRACO_PLATE ITEM_NONE
#define ITEM_DREAD_PLATE ITEM_NONE
#define ITEM_EARTH_PLATE ITEM_NONE
#define ITEM_FIST_PLATE ITEM_NONE
#define ITEM_FLAME_PLATE ITEM_NONE
#define ITEM_ICICLE_PLATE ITEM_NONE
#define ITEM_INSECT_PLATE ITEM_NONE
#define ITEM_IRON_PLATE ITEM_NONE
#define ITEM_MEADOW_PLATE ITEM_NONE
#define ITEM_MIND_PLATE ITEM_NONE
#define ITEM_PIXIE_PLATE ITEM_NONE
#define ITEM_SKY_PLATE ITEM_NONE
#define ITEM_SPLASH_PLATE ITEM_NONE
#define ITEM_SPOOKY_PLATE ITEM_NONE
#define ITEM_STONE_PLATE ITEM_NONE
#define ITEM_TOXIC_PLATE ITEM_NONE
#define ITEM_ZAP_PLATE ITEM_NONE
#define ITEM_FIGHTINIUM_Z ITEM_NONE
#define ITEM_FLYINIUM_Z ITEM_NONE
#define ITEM_POISONIUM_Z ITEM_NONE
#define ITEM_GROUNDIUM_Z ITEM_NONE
#define ITEM_ROCKIUM_Z ITEM_NONE
#define ITEM_BUGINIUM_Z ITEM_NONE
#define ITEM_GHOSTIUM_Z ITEM_NONE
#define ITEM_STEELIUM_Z ITEM_NONE
#define ITEM_FIRIUM_Z ITEM_NONE
#define ITEM_WATERIUM_Z ITEM_NONE
#define ITEM_GRASSIUM_Z ITEM_NONE
#define ITEM_ELECTRIUM_Z ITEM_NONE
#define ITEM_PSYCHIUM_Z ITEM_NONE
#define ITEM_ICIUM_Z ITEM_NONE
#define ITEM_DRAGONIUM_Z ITEM_NONE
#define ITEM_DARKINIUM_Z ITEM_NONE
#define ITEM_FAIRIUM_Z ITEM_NONE
#define ITEM_DOUSE_DRIVE ITEM_NONE
#define ITEM_SHOCK_DRIVE ITEM_NONE
#define ITEM_BURN_DRIVE ITEM_NONE
#define ITEM_CHILL_DRIVE ITEM_NONE
#define ITEM_BUG_MEMORY ITEM_NONE
#define ITEM_DARK_MEMORY ITEM_NONE
#define ITEM_DRAGON_MEMORY ITEM_NONE
#define ITEM_ELECTRIC_MEMORY ITEM_NONE
#define ITEM_FAIRY_MEMORY ITEM_NONE
#define ITEM_FIGHTING_MEMORY ITEM_NONE
#define ITEM_FIRE_MEMORY ITEM_NONE
#define ITEM_FLYING_MEMORY ITEM_NONE
#define ITEM_GHOST_MEMORY ITEM_NONE
#define ITEM_GRASS_MEMORY ITEM_NONE
#define ITEM_GROUND_MEMORY ITEM_NONE
#define ITEM_ICE_MEMORY ITEM_NONE
#define ITEM_POISON_MEMORY ITEM_NONE
#define ITEM_PSYCHIC_MEMORY ITEM_NONE
#define ITEM_ROCK_MEMORY ITEM_NONE
#define ITEM_STEEL_MEMORY ITEM_NONE
#define ITEM_WATER_MEMORY ITEM_NONE
//FORM_ITEM_HOLD
#define ITEM_GRISEOUS_ORB 10069
#define ITEM_DRACO_PLATE 10070
#define ITEM_DREAD_PLATE 10071
#define ITEM_EARTH_PLATE 10072
#define ITEM_FIST_PLATE 10073
#define ITEM_FLAME_PLATE 10074
#define ITEM_ICICLE_PLATE 10075
#define ITEM_INSECT_PLATE 10076
#define ITEM_IRON_PLATE 10077
#define ITEM_MEADOW_PLATE 10078
#define ITEM_MIND_PLATE 10079
#define ITEM_PIXIE_PLATE 10080
#define ITEM_SKY_PLATE 10081
#define ITEM_SPLASH_PLATE 10082
#define ITEM_SPOOKY_PLATE 10083
#define ITEM_STONE_PLATE 10084
#define ITEM_TOXIC_PLATE 10085
#define ITEM_ZAP_PLATE 10086
#define ITEM_FIGHTINIUM_Z 10087
#define ITEM_FLYINIUM_Z 10088
#define ITEM_POISONIUM_Z 10089
#define ITEM_GROUNDIUM_Z 10090
#define ITEM_ROCKIUM_Z 10091
#define ITEM_BUGINIUM_Z 10092
#define ITEM_GHOSTIUM_Z 10093
#define ITEM_STEELIUM_Z 10094
#define ITEM_FIRIUM_Z 10095
#define ITEM_WATERIUM_Z 10096
#define ITEM_GRASSIUM_Z 10097
#define ITEM_ELECTRIUM_Z 10098
#define ITEM_PSYCHIUM_Z 10099
#define ITEM_ICIUM_Z 10100
#define ITEM_DRAGONIUM_Z 10101
#define ITEM_DARKINIUM_Z 10102
#define ITEM_FAIRIUM_Z 10103
#define ITEM_DOUSE_DRIVE 10104
#define ITEM_SHOCK_DRIVE 10105
#define ITEM_BURN_DRIVE 10106
#define ITEM_CHILL_DRIVE 10107
#define ITEM_BUG_MEMORY 10108
#define ITEM_DARK_MEMORY 10109
#define ITEM_DRAGON_MEMORY 10110
#define ITEM_ELECTRIC_MEMORY 10111
#define ITEM_FAIRY_MEMORY 10112
#define ITEM_FIGHTING_MEMORY 10113
#define ITEM_FIRE_MEMORY 10114
#define ITEM_FLYING_MEMORY 10115
#define ITEM_GHOST_MEMORY 10116
#define ITEM_GRASS_MEMORY 10117
#define ITEM_GROUND_MEMORY 10118
#define ITEM_ICE_MEMORY 10119
#define ITEM_POISON_MEMORY 10120
#define ITEM_PSYCHIC_MEMORY 10121
#define ITEM_ROCK_MEMORY 10122
#define ITEM_STEEL_MEMORY 10123
#define ITEM_WATER_MEMORY 10124
//FORM_ITEM_USE
#define ITEM_GRACIDEA ITEM_NONE
// #define ITEM_REVEAL_GLASS ITEM_NONE
// #define ITEM_PRISON_BOTTLE ITEM_NONE
#define ITEM_RED_NECTAR ITEM_NONE
#define ITEM_YELLOW_NECTAR ITEM_NONE
#define ITEM_PINK_NECTAR ITEM_NONE
#define ITEM_PURPLE_NECTAR ITEM_NONE
//FORM_ITEM_USE
#define ITEM_GRACIDEA 10125
// #define ITEM_REVEAL_GLASS 10126
// #define ITEM_PRISON_BOTTLE 10127
#define ITEM_RED_NECTAR 10128
#define ITEM_YELLOW_NECTAR 10129
#define ITEM_PINK_NECTAR 10130
#define ITEM_PURPLE_NECTAR 10131
#endif // ITEM_EXPANSION
#ifndef BATTLE_ENGINE
#define ABILITY_MULTITYPE ABILITY_NONE
#define ABILITY_RKS_SYSTEM ABILITY_NONE
#define ABILITY_MULTITYPE ABILITY_NONE
#define ABILITY_RKS_SYSTEM ABILITY_NONE
#endif // BATTLE_ENGINE
#endif // GUARD_CONSTANTS_POKEMON_CONFIG_H