From fdc5540fb7904372c69e18652c47227939da0974 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 11:16:17 -0800 Subject: [PATCH 01/10] Move consts used by json2bin to constgen --- consts/battle.json | 46 +- consts/global.json | 1214 ++++++++++++++++++++++++- consts/meson.build | 5 +- consts/move_data.json | 0 consts/sprites.json | 18 + consts/trainer.json | 204 +++++ consts/trainer_ai.json | 52 -- include/constants/battle/moves.h | 24 - include/constants/battle/trainer_ai.h | 15 - include/constants/items.h | 521 +---------- include/constants/moves.h | 4 - include/constants/species.h | 519 +---------- 12 files changed, 1502 insertions(+), 1120 deletions(-) create mode 100644 consts/move_data.json create mode 100644 consts/sprites.json create mode 100644 consts/trainer.json delete mode 100644 consts/trainer_ai.json diff --git a/consts/battle.json b/consts/battle.json index 8916b8fb48..4e2971ad9a 100644 --- a/consts/battle.json +++ b/consts/battle.json @@ -6,7 +6,9 @@ "@MoveSubscriptPointer", "@SideEffectType", "@Terrain", - "@BattleAnimation" + "@BattleAnimation", + "@MoveRange", + "@MoveFlags" ], "btlcmd": [ "@BattleScriptVar", @@ -956,6 +958,48 @@ "YES_NO_CHANGE_MON", "YES_NO_GIVE_NICKNAME" ] + }, + "@MoveRange": { + "type": "flags", + "values": [ + "RANGE_SINGLE_TARGET", + "RANGE_SINGLE_TARGET_SPECIAL", + "RANGE_RANDOM_OPPONENT", + "RANGE_ADJACENT_OPPONENTS", + "RANGE_ALL_ADJACENT", + "RANGE_USER", + "RANGE_USER_SIDE", + "RANGE_FIELD", + "RANGE_OPPONENT_SIDE", + "RANGE_ALLY", + "RANGE_USER_OR_ALLY", + "RANGE_SINGLE_TARGET_ME_FIRST" + ], + "composites": { + "RANGE_MY_SIDE": { + "op": "OR", + "components": [ + "RANGE_SINGLE_TARGET_SPECIAL", + "RANGE_USER", + "RANGE_FIELD", + "RANGE_USER_OR_ALLY" + ] + } + } + }, + "@MoveFlags": { + "type": "flags", + "values": [ + "MOVE_FLAG_NONE", + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES", + "MOVE_FLAG_HIDES_SHADOWS" + ] } } } diff --git a/consts/global.json b/consts/global.json index 90572bf77f..81bb81fdd4 100644 --- a/consts/global.json +++ b/consts/global.json @@ -5,17 +5,31 @@ ], "moves": [ "@MoveAttribute", - "@Move" + "@Move", + "@MoveClass" ], "pokemon": [ "@PokemonType", - "@PokemonPersonalDataParam" + "@PokemonPersonalDataParam", + "@PokemonColor", + "@PokemonEvoMethod", + "@PokemonExpRate", + "@PokemonContestType", + "@PokemonGenderRatio", + "@PokemonEggGroup" ], "items": [ + "@Item", "@ItemHoldEffect" ], "gender": [ "@Gender" + ], + "species": [ + "@PokemonSpecies" + ], + "tm_learnset": [ + "@TMLearnsetFlags" ] }, "definitions": { @@ -862,6 +876,1202 @@ "GENDER_FEMALE", "GENDER_NONE" ] + }, + "@PokemonSpecies": { + "type": "enum", + "as_preproc": true, + "values": [ + "SPECIES_NONE", + "SPECIES_BULBASAUR", + "SPECIES_IVYSAUR", + "SPECIES_VENUSAUR", + "SPECIES_CHARMANDER", + "SPECIES_CHARMELEON", + "SPECIES_CHARIZARD", + "SPECIES_SQUIRTLE", + "SPECIES_WARTORTLE", + "SPECIES_BLASTOISE", + "SPECIES_CATERPIE", + "SPECIES_METAPOD", + "SPECIES_BUTTERFREE", + "SPECIES_WEEDLE", + "SPECIES_KAKUNA", + "SPECIES_BEEDRILL", + "SPECIES_PIDGEY", + "SPECIES_PIDGEOTTO", + "SPECIES_PIDGEOT", + "SPECIES_RATTATA", + "SPECIES_RATICATE", + "SPECIES_SPEAROW", + "SPECIES_FEAROW", + "SPECIES_EKANS", + "SPECIES_ARBOK", + "SPECIES_PIKACHU", + "SPECIES_RAICHU", + "SPECIES_SANDSHREW", + "SPECIES_SANDSLASH", + "SPECIES_NIDORAN_F", + "SPECIES_NIDORINA", + "SPECIES_NIDOQUEEN", + "SPECIES_NIDORAN_M", + "SPECIES_NIDORINO", + "SPECIES_NIDOKING", + "SPECIES_CLEFAIRY", + "SPECIES_CLEFABLE", + "SPECIES_VULPIX", + "SPECIES_NINETALES", + "SPECIES_JIGGLYPUFF", + "SPECIES_WIGGLYTUFF", + "SPECIES_ZUBAT", + "SPECIES_GOLBAT", + "SPECIES_ODDISH", + "SPECIES_GLOOM", + "SPECIES_VILEPLUME", + "SPECIES_PARAS", + "SPECIES_PARASECT", + "SPECIES_VENONAT", + "SPECIES_VENOMOTH", + "SPECIES_DIGLETT", + "SPECIES_DUGTRIO", + "SPECIES_MEOWTH", + "SPECIES_PERSIAN", + "SPECIES_PSYDUCK", + "SPECIES_GOLDUCK", + "SPECIES_MANKEY", + "SPECIES_PRIMEAPE", + "SPECIES_GROWLITHE", + "SPECIES_ARCANINE", + "SPECIES_POLIWAG", + "SPECIES_POLIWHIRL", + "SPECIES_POLIWRATH", + "SPECIES_ABRA", + "SPECIES_KADABRA", + "SPECIES_ALAKAZAM", + "SPECIES_MACHOP", + "SPECIES_MACHOKE", + "SPECIES_MACHAMP", + "SPECIES_BELLSPROUT", + "SPECIES_WEEPINBELL", + "SPECIES_VICTREEBEL", + "SPECIES_TENTACOOL", + "SPECIES_TENTACRUEL", + "SPECIES_GEODUDE", + "SPECIES_GRAVELER", + "SPECIES_GOLEM", + "SPECIES_PONYTA", + "SPECIES_RAPIDASH", + "SPECIES_SLOWPOKE", + "SPECIES_SLOWBRO", + "SPECIES_MAGNEMITE", + "SPECIES_MAGNETON", + "SPECIES_FARFETCHD", + "SPECIES_DODUO", + "SPECIES_DODRIO", + "SPECIES_SEEL", + "SPECIES_DEWGONG", + "SPECIES_GRIMER", + "SPECIES_MUK", + "SPECIES_SHELLDER", + "SPECIES_CLOYSTER", + "SPECIES_GASTLY", + "SPECIES_HAUNTER", + "SPECIES_GENGAR", + "SPECIES_ONIX", + "SPECIES_DROWZEE", + "SPECIES_HYPNO", + "SPECIES_KRABBY", + "SPECIES_KINGLER", + "SPECIES_VOLTORB", + "SPECIES_ELECTRODE", + "SPECIES_EXEGGCUTE", + "SPECIES_EXEGGUTOR", + "SPECIES_CUBONE", + "SPECIES_MAROWAK", + "SPECIES_HITMONLEE", + "SPECIES_HITMONCHAN", + "SPECIES_LICKITUNG", + "SPECIES_KOFFING", + "SPECIES_WEEZING", + "SPECIES_RHYHORN", + "SPECIES_RHYDON", + "SPECIES_CHANSEY", + "SPECIES_TANGELA", + "SPECIES_KANGASKHAN", + "SPECIES_HORSEA", + "SPECIES_SEADRA", + "SPECIES_GOLDEEN", + "SPECIES_SEAKING", + "SPECIES_STARYU", + "SPECIES_STARMIE", + "SPECIES_MR_MIME", + "SPECIES_SCYTHER", + "SPECIES_JYNX", + "SPECIES_ELECTABUZZ", + "SPECIES_MAGMAR", + "SPECIES_PINSIR", + "SPECIES_TAUROS", + "SPECIES_MAGIKARP", + "SPECIES_GYARADOS", + "SPECIES_LAPRAS", + "SPECIES_DITTO", + "SPECIES_EEVEE", + "SPECIES_VAPOREON", + "SPECIES_JOLTEON", + "SPECIES_FLAREON", + "SPECIES_PORYGON", + "SPECIES_OMANYTE", + "SPECIES_OMASTAR", + "SPECIES_KABUTO", + "SPECIES_KABUTOPS", + "SPECIES_AERODACTYL", + "SPECIES_SNORLAX", + "SPECIES_ARTICUNO", + "SPECIES_ZAPDOS", + "SPECIES_MOLTRES", + "SPECIES_DRATINI", + "SPECIES_DRAGONAIR", + "SPECIES_DRAGONITE", + "SPECIES_MEWTWO", + "SPECIES_MEW", + "SPECIES_CHIKORITA", + "SPECIES_BAYLEEF", + "SPECIES_MEGANIUM", + "SPECIES_CYNDAQUIL", + "SPECIES_QUILAVA", + "SPECIES_TYPHLOSION", + "SPECIES_TOTODILE", + "SPECIES_CROCONAW", + "SPECIES_FERALIGATR", + "SPECIES_SENTRET", + "SPECIES_FURRET", + "SPECIES_HOOTHOOT", + "SPECIES_NOCTOWL", + "SPECIES_LEDYBA", + "SPECIES_LEDIAN", + "SPECIES_SPINARAK", + "SPECIES_ARIADOS", + "SPECIES_CROBAT", + "SPECIES_CHINCHOU", + "SPECIES_LANTURN", + "SPECIES_PICHU", + "SPECIES_CLEFFA", + "SPECIES_IGGLYBUFF", + "SPECIES_TOGEPI", + "SPECIES_TOGETIC", + "SPECIES_NATU", + "SPECIES_XATU", + "SPECIES_MAREEP", + "SPECIES_FLAAFFY", + "SPECIES_AMPHAROS", + "SPECIES_BELLOSSOM", + "SPECIES_MARILL", + "SPECIES_AZUMARILL", + "SPECIES_SUDOWOODO", + "SPECIES_POLITOED", + "SPECIES_HOPPIP", + "SPECIES_SKIPLOOM", + "SPECIES_JUMPLUFF", + "SPECIES_AIPOM", + "SPECIES_SUNKERN", + "SPECIES_SUNFLORA", + "SPECIES_YANMA", + "SPECIES_WOOPER", + "SPECIES_QUAGSIRE", + "SPECIES_ESPEON", + "SPECIES_UMBREON", + "SPECIES_MURKROW", + "SPECIES_SLOWKING", + "SPECIES_MISDREAVUS", + "SPECIES_UNOWN", + "SPECIES_WOBBUFFET", + "SPECIES_GIRAFARIG", + "SPECIES_PINECO", + "SPECIES_FORRETRESS", + "SPECIES_DUNSPARCE", + "SPECIES_GLIGAR", + "SPECIES_STEELIX", + "SPECIES_SNUBBULL", + "SPECIES_GRANBULL", + "SPECIES_QWILFISH", + "SPECIES_SCIZOR", + "SPECIES_SHUCKLE", + "SPECIES_HERACROSS", + "SPECIES_SNEASEL", + "SPECIES_TEDDIURSA", + "SPECIES_URSARING", + "SPECIES_SLUGMA", + "SPECIES_MAGCARGO", + "SPECIES_SWINUB", + "SPECIES_PILOSWINE", + "SPECIES_CORSOLA", + "SPECIES_REMORAID", + "SPECIES_OCTILLERY", + "SPECIES_DELIBIRD", + "SPECIES_MANTINE", + "SPECIES_SKARMORY", + "SPECIES_HOUNDOUR", + "SPECIES_HOUNDOOM", + "SPECIES_KINGDRA", + "SPECIES_PHANPY", + "SPECIES_DONPHAN", + "SPECIES_PORYGON2", + "SPECIES_STANTLER", + "SPECIES_SMEARGLE", + "SPECIES_TYROGUE", + "SPECIES_HITMONTOP", + "SPECIES_SMOOCHUM", + "SPECIES_ELEKID", + "SPECIES_MAGBY", + "SPECIES_MILTANK", + "SPECIES_BLISSEY", + "SPECIES_RAIKOU", + "SPECIES_ENTEI", + "SPECIES_SUICUNE", + "SPECIES_LARVITAR", + "SPECIES_PUPITAR", + "SPECIES_TYRANITAR", + "SPECIES_LUGIA", + "SPECIES_HO_OH", + "SPECIES_CELEBI", + "SPECIES_TREECKO", + "SPECIES_GROVYLE", + "SPECIES_SCEPTILE", + "SPECIES_TORCHIC", + "SPECIES_COMBUSKEN", + "SPECIES_BLAZIKEN", + "SPECIES_MUDKIP", + "SPECIES_MARSHTOMP", + "SPECIES_SWAMPERT", + "SPECIES_POOCHYENA", + "SPECIES_MIGHTYENA", + "SPECIES_ZIGZAGOON", + "SPECIES_LINOONE", + "SPECIES_WURMPLE", + "SPECIES_SILCOON", + "SPECIES_BEAUTIFLY", + "SPECIES_CASCOON", + "SPECIES_DUSTOX", + "SPECIES_LOTAD", + "SPECIES_LOMBRE", + "SPECIES_LUDICOLO", + "SPECIES_SEEDOT", + "SPECIES_NUZLEAF", + "SPECIES_SHIFTRY", + "SPECIES_TAILLOW", + "SPECIES_SWELLOW", + "SPECIES_WINGULL", + "SPECIES_PELIPPER", + "SPECIES_RALTS", + "SPECIES_KIRLIA", + "SPECIES_GARDEVOIR", + "SPECIES_SURSKIT", + "SPECIES_MASQUERAIN", + "SPECIES_SHROOMISH", + "SPECIES_BRELOOM", + "SPECIES_SLAKOTH", + "SPECIES_VIGOROTH", + "SPECIES_SLAKING", + "SPECIES_NINCADA", + "SPECIES_NINJASK", + "SPECIES_SHEDINJA", + "SPECIES_WHISMUR", + "SPECIES_LOUDRED", + "SPECIES_EXPLOUD", + "SPECIES_MAKUHITA", + "SPECIES_HARIYAMA", + "SPECIES_AZURILL", + "SPECIES_NOSEPASS", + "SPECIES_SKITTY", + "SPECIES_DELCATTY", + "SPECIES_SABLEYE", + "SPECIES_MAWILE", + "SPECIES_ARON", + "SPECIES_LAIRON", + "SPECIES_AGGRON", + "SPECIES_MEDITITE", + "SPECIES_MEDICHAM", + "SPECIES_ELECTRIKE", + "SPECIES_MANECTRIC", + "SPECIES_PLUSLE", + "SPECIES_MINUN", + "SPECIES_VOLBEAT", + "SPECIES_ILLUMISE", + "SPECIES_ROSELIA", + "SPECIES_GULPIN", + "SPECIES_SWALOT", + "SPECIES_CARVANHA", + "SPECIES_SHARPEDO", + "SPECIES_WAILMER", + "SPECIES_WAILORD", + "SPECIES_NUMEL", + "SPECIES_CAMERUPT", + "SPECIES_TORKOAL", + "SPECIES_SPOINK", + "SPECIES_GRUMPIG", + "SPECIES_SPINDA", + "SPECIES_TRAPINCH", + "SPECIES_VIBRAVA", + "SPECIES_FLYGON", + "SPECIES_CACNEA", + "SPECIES_CACTURNE", + "SPECIES_SWABLU", + "SPECIES_ALTARIA", + "SPECIES_ZANGOOSE", + "SPECIES_SEVIPER", + "SPECIES_LUNATONE", + "SPECIES_SOLROCK", + "SPECIES_BARBOACH", + "SPECIES_WHISCASH", + "SPECIES_CORPHISH", + "SPECIES_CRAWDAUNT", + "SPECIES_BALTOY", + "SPECIES_CLAYDOL", + "SPECIES_LILEEP", + "SPECIES_CRADILY", + "SPECIES_ANORITH", + "SPECIES_ARMALDO", + "SPECIES_FEEBAS", + "SPECIES_MILOTIC", + "SPECIES_CASTFORM", + "SPECIES_KECLEON", + "SPECIES_SHUPPET", + "SPECIES_BANETTE", + "SPECIES_DUSKULL", + "SPECIES_DUSCLOPS", + "SPECIES_TROPIUS", + "SPECIES_CHIMECHO", + "SPECIES_ABSOL", + "SPECIES_WYNAUT", + "SPECIES_SNORUNT", + "SPECIES_GLALIE", + "SPECIES_SPHEAL", + "SPECIES_SEALEO", + "SPECIES_WALREIN", + "SPECIES_CLAMPERL", + "SPECIES_HUNTAIL", + "SPECIES_GOREBYSS", + "SPECIES_RELICANTH", + "SPECIES_LUVDISC", + "SPECIES_BAGON", + "SPECIES_SHELGON", + "SPECIES_SALAMENCE", + "SPECIES_BELDUM", + "SPECIES_METANG", + "SPECIES_METAGROSS", + "SPECIES_REGIROCK", + "SPECIES_REGICE", + "SPECIES_REGISTEEL", + "SPECIES_LATIAS", + "SPECIES_LATIOS", + "SPECIES_KYOGRE", + "SPECIES_GROUDON", + "SPECIES_RAYQUAZA", + "SPECIES_JIRACHI", + "SPECIES_DEOXYS", + "SPECIES_TURTWIG", + "SPECIES_GROTLE", + "SPECIES_TORTERRA", + "SPECIES_CHIMCHAR", + "SPECIES_MONFERNO", + "SPECIES_INFERNAPE", + "SPECIES_PIPLUP", + "SPECIES_PRINPLUP", + "SPECIES_EMPOLEON", + "SPECIES_STARLY", + "SPECIES_STARAVIA", + "SPECIES_STARAPTOR", + "SPECIES_BIDOOF", + "SPECIES_BIBAREL", + "SPECIES_KRICKETOT", + "SPECIES_KRICKETUNE", + "SPECIES_SHINX", + "SPECIES_LUXIO", + "SPECIES_LUXRAY", + "SPECIES_BUDEW", + "SPECIES_ROSERADE", + "SPECIES_CRANIDOS", + "SPECIES_RAMPARDOS", + "SPECIES_SHIELDON", + "SPECIES_BASTIODON", + "SPECIES_BURMY", + "SPECIES_WORMADAM", + "SPECIES_MOTHIM", + "SPECIES_COMBEE", + "SPECIES_VESPIQUEN", + "SPECIES_PACHIRISU", + "SPECIES_BUIZEL", + "SPECIES_FLOATZEL", + "SPECIES_CHERUBI", + "SPECIES_CHERRIM", + "SPECIES_SHELLOS", + "SPECIES_GASTRODON", + "SPECIES_AMBIPOM", + "SPECIES_DRIFLOON", + "SPECIES_DRIFBLIM", + "SPECIES_BUNEARY", + "SPECIES_LOPUNNY", + "SPECIES_MISMAGIUS", + "SPECIES_HONCHKROW", + "SPECIES_GLAMEOW", + "SPECIES_PURUGLY", + "SPECIES_CHINGLING", + "SPECIES_STUNKY", + "SPECIES_SKUNTANK", + "SPECIES_BRONZOR", + "SPECIES_BRONZONG", + "SPECIES_BONSLY", + "SPECIES_MIME_JR", + "SPECIES_HAPPINY", + "SPECIES_CHATOT", + "SPECIES_SPIRITOMB", + "SPECIES_GIBLE", + "SPECIES_GABITE", + "SPECIES_GARCHOMP", + "SPECIES_MUNCHLAX", + "SPECIES_RIOLU", + "SPECIES_LUCARIO", + "SPECIES_HIPPOPOTAS", + "SPECIES_HIPPOWDON", + "SPECIES_SKORUPI", + "SPECIES_DRAPION", + "SPECIES_CROAGUNK", + "SPECIES_TOXICROAK", + "SPECIES_CARNIVINE", + "SPECIES_FINNEON", + "SPECIES_LUMINEON", + "SPECIES_MANTYKE", + "SPECIES_SNOVER", + "SPECIES_ABOMASNOW", + "SPECIES_WEAVILE", + "SPECIES_MAGNEZONE", + "SPECIES_LICKILICKY", + "SPECIES_RHYPERIOR", + "SPECIES_TANGROWTH", + "SPECIES_ELECTIVIRE", + "SPECIES_MAGMORTAR", + "SPECIES_TOGEKISS", + "SPECIES_YANMEGA", + "SPECIES_LEAFEON", + "SPECIES_GLACEON", + "SPECIES_GLISCOR", + "SPECIES_MAMOSWINE", + "SPECIES_PORYGON_Z", + "SPECIES_GALLADE", + "SPECIES_PROBOPASS", + "SPECIES_DUSKNOIR", + "SPECIES_FROSLASS", + "SPECIES_ROTOM", + "SPECIES_UXIE", + "SPECIES_MESPRIT", + "SPECIES_AZELF", + "SPECIES_DIALGA", + "SPECIES_PALKIA", + "SPECIES_HEATRAN", + "SPECIES_REGIGIGAS", + "SPECIES_GIRATINA", + "SPECIES_CRESSELIA", + "SPECIES_PHIONE", + "SPECIES_MANAPHY", + "SPECIES_DARKRAI", + "SPECIES_SHAYMIN", + "SPECIES_ARCEUS", + "SPECIES_EGG", + "SPECIES_BAD_EGG" + ] + }, + "@PokemonColor": { + "type": "enum", + "values": [ + "MON_COLOR_RED", + "MON_COLOR_BLUE", + "MON_COLOR_YELLOW", + "MON_COLOR_GREEN", + "MON_COLOR_BLACK", + "MON_COLOR_BROWN", + "MON_COLOR_PURPLE", + "MON_COLOR_GRAY", + "MON_COLOR_WHITE", + "MON_COLOR_PINK", + "MON_COLOR_EGG" + ] + }, + "@PokemonEggGroup": { + "type": "enum", + "values": [ + "EGG_GROUP_NONE", + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1", + "EGG_GROUP_BUG", + "EGG_GROUP_FLYING", + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS", + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_WATER_3", + "EGG_GROUP_MINERAL", + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_WATER_2", + "EGG_GROUP_DITTO", + "EGG_GROUP_DRAGON", + "EGG_GROUP_UNDISCOVERED" + ] + }, + "@PokemonEvoMethod": { + "type": "enum", + "values": [ + "EVO_NONE", + "EVO_HAPPINESS", + "EVO_HAPPINESS_DAY", + "EVO_HAPPINESS_NIGHT", + "EVO_LEVEL_UP", + "EVO_TRADE", + "EVO_TRADE_WITH_ITEM", + "EVO_USE_ITEM", + "EVO_LEVEL_ATK_GT_DEF", + "EVO_LEVEL_ATK_EQ_DEF", + "EVO_LEVEL_ATK_LT_DEF", + "EVO_LEVEL_PID_LOW", + "EVO_LEVEL_PID_HIGH", + "EVO_LEVEL_NINJASK", + "EVO_LEVEL_SHEDINJA", + "EVO_BEAUTY", + "EVO_USE_ITEM_MALE", + "EVO_USE_ITEM_FEMALE", + "EVO_USE_ITEM_DAY", + "EVO_USE_ITEM_NIGHT", + "EVO_KNOW_MOVE", + "EVO_MON_IN_PARTY", + "EVO_LEVEL_MALE", + "EVO_LEVEL_FEMALE", + "EVO_ELECTRIC_FIELD", + "EVO_MOSSY_STONE", + "EVO_ICY_STONE" + ] + }, + "@PokemonExpRate": { + "type": "enum", + "values": [ + "EXP_RATE_MEDIUM_FAST", + "EXP_RATE_ERRATIC", + "EXP_RATE_FLUCTUATING", + "EXP_RATE_MEDIUM_SLOW", + "EXP_RATE_FAST", + "EXP_RATE_SLOW" + ] + }, + "@PokemonContestType": { + "type": "enum", + "values": [ + "CONTEST_TYPE_COOL", + "CONTEST_TYPE_CUTE", + "CONTEST_TYPE_BEAUTY", + "CONTEST_TYPE_SMART", + "CONTEST_TYPE_TOUGH" + ] + }, + "@TMLearnsetFlags": { + "type": "flags", + "values": [ + "TM00", + "TM01", + "TM02", + "TM03", + "TM04", + "TM05", + "TM06", + "TM07", + "TM08", + "TM09", + "TM10", + "TM11", + "TM12", + "TM13", + "TM14", + "TM15", + "TM16", + "TM17", + "TM18", + "TM19", + "TM20", + "TM21", + "TM22", + "TM23", + "TM24", + "TM25", + "TM26", + "TM27", + "TM28", + "TM29", + "TM30", + "TM31", + "TM32", + "TM33", + "TM34", + "TM35", + "TM36", + "TM37", + "TM38", + "TM39", + "TM40", + "TM41", + "TM42", + "TM43", + "TM44", + "TM45", + "TM46", + "TM47", + "TM48", + "TM49", + "TM50", + "TM51", + "TM52", + "TM53", + "TM54", + "TM55", + "TM56", + "TM57", + "TM58", + "TM59", + "TM60", + "TM61", + "TM62", + "TM63", + "TM64", + "TM65", + "TM66", + "TM67", + "TM68", + "TM69", + "TM70", + "TM71", + "TM72", + "TM73", + "TM74", + "TM75", + "TM76", + "TM77", + "TM78", + "TM79", + "TM80", + "TM81", + "TM82", + "TM83", + "TM84", + "TM85", + "TM86", + "TM87", + "TM88", + "TM89", + "TM90", + "TM91", + "TM92", + "HM01", + "HM02", + "HM03", + "HM04", + "HM05", + "HM06", + "HM07", + "HM08" + ], + "composites": {} + }, + "@Item": { + "type": "enum", + "as_preproc": true, + "values": [ + "ITEM_NONE", + "ITEM_MASTER_BALL", + "ITEM_ULTRA_BALL", + "ITEM_GREAT_BALL", + "ITEM_POKE_BALL", + "ITEM_SAFARI_BALL", + "ITEM_NET_BALL", + "ITEM_DIVE_BALL", + "ITEM_NEST_BALL", + "ITEM_REPEAT_BALL", + "ITEM_TIMER_BALL", + "ITEM_LUXURY_BALL", + "ITEM_PREMIER_BALL", + "ITEM_DUSK_BALL", + "ITEM_HEAL_BALL", + "ITEM_QUICK_BALL", + "ITEM_CHERISH_BALL", + "ITEM_POTION", + "ITEM_ANTIDOTE", + "ITEM_BURN_HEAL", + "ITEM_ICE_HEAL", + "ITEM_AWAKENING", + "ITEM_PARLYZ_HEAL", + "ITEM_FULL_RESTORE", + "ITEM_MAX_POTION", + "ITEM_HYPER_POTION", + "ITEM_SUPER_POTION", + "ITEM_FULL_HEAL", + "ITEM_REVIVE", + "ITEM_MAX_REVIVE", + "ITEM_FRESH_WATER", + "ITEM_SODA_POP", + "ITEM_LEMONADE", + "ITEM_MOOMOO_MILK", + "ITEM_ENERGYPOWDER", + "ITEM_ENERGY_ROOT", + "ITEM_HEAL_POWDER", + "ITEM_REVIVAL_HERB", + "ITEM_ETHER", + "ITEM_MAX_ETHER", + "ITEM_ELIXIR", + "ITEM_MAX_ELIXIR", + "ITEM_LAVA_COOKIE", + "ITEM_BERRY_JUICE", + "ITEM_SACRED_ASH", + "ITEM_HP_UP", + "ITEM_PROTEIN", + "ITEM_IRON", + "ITEM_CARBOS", + "ITEM_CALCIUM", + "ITEM_RARE_CANDY", + "ITEM_PP_UP", + "ITEM_ZINC", + "ITEM_PP_MAX", + "ITEM_OLD_GATEAU", + "ITEM_GUARD_SPEC_", + "ITEM_DIRE_HIT", + "ITEM_X_ATTACK", + "ITEM_X_DEFENSE", + "ITEM_X_SPEED", + "ITEM_X_ACCURACY", + "ITEM_X_SPECIAL", + "ITEM_X_SP__DEF", + "ITEM_POKE_DOLL", + "ITEM_FLUFFY_TAIL", + "ITEM_BLUE_FLUTE", + "ITEM_YELLOW_FLUTE", + "ITEM_RED_FLUTE", + "ITEM_BLACK_FLUTE", + "ITEM_WHITE_FLUTE", + "ITEM_SHOAL_SALT", + "ITEM_SHOAL_SHELL", + "ITEM_RED_SHARD", + "ITEM_BLUE_SHARD", + "ITEM_YELLOW_SHARD", + "ITEM_GREEN_SHARD", + "ITEM_SUPER_REPEL", + "ITEM_MAX_REPEL", + "ITEM_ESCAPE_ROPE", + "ITEM_REPEL", + "ITEM_SUN_STONE", + "ITEM_MOON_STONE", + "ITEM_FIRE_STONE", + "ITEM_THUNDERSTONE", + "ITEM_WATER_STONE", + "ITEM_LEAF_STONE", + "ITEM_TINYMUSHROOM", + "ITEM_BIG_MUSHROOM", + "ITEM_PEARL", + "ITEM_BIG_PEARL", + "ITEM_STARDUST", + "ITEM_STAR_PIECE", + "ITEM_NUGGET", + "ITEM_HEART_SCALE", + "ITEM_HONEY", + "ITEM_GROWTH_MULCH", + "ITEM_DAMP_MULCH", + "ITEM_STABLE_MULCH", + "ITEM_GOOEY_MULCH", + "ITEM_ROOT_FOSSIL", + "ITEM_CLAW_FOSSIL", + "ITEM_HELIX_FOSSIL", + "ITEM_DOME_FOSSIL", + "ITEM_OLD_AMBER", + "ITEM_ARMOR_FOSSIL", + "ITEM_SKULL_FOSSIL", + "ITEM_RARE_BONE", + "ITEM_SHINY_STONE", + "ITEM_DUSK_STONE", + "ITEM_DAWN_STONE", + "ITEM_OVAL_STONE", + "ITEM_ODD_KEYSTONE", + "ITEM_GRISEOUS_ORB", + "ITEM_UNUSED_113", + "ITEM_UNUSED_114", + "ITEM_UNUSED_115", + "ITEM_UNUSED_116", + "ITEM_UNUSED_117", + "ITEM_UNUSED_118", + "ITEM_UNUSED_119", + "ITEM_UNUSED_120", + "ITEM_UNUSED_121", + "ITEM_UNUSED_122", + "ITEM_UNUSED_123", + "ITEM_UNUSED_124", + "ITEM_UNUSED_125", + "ITEM_UNUSED_126", + "ITEM_UNUSED_127", + "ITEM_UNUSED_128", + "ITEM_UNUSED_129", + "ITEM_UNUSED_130", + "ITEM_UNUSED_131", + "ITEM_UNUSED_132", + "ITEM_UNUSED_133", + "ITEM_UNUSED_134", + "ITEM_ADAMANT_ORB", + "ITEM_LUSTROUS_ORB", + "ITEM_GRASS_MAIL", + "ITEM_FLAME_MAIL", + "ITEM_BUBBLE_MAIL", + "ITEM_BLOOM_MAIL", + "ITEM_TUNNEL_MAIL", + "ITEM_STEEL_MAIL", + "ITEM_HEART_MAIL", + "ITEM_SNOW_MAIL", + "ITEM_SPACE_MAIL", + "ITEM_AIR_MAIL", + "ITEM_MOSAIC_MAIL", + "ITEM_BRICK_MAIL", + "ITEM_CHERI_BERRY", + "ITEM_CHESTO_BERRY", + "ITEM_PECHA_BERRY", + "ITEM_RAWST_BERRY", + "ITEM_ASPEAR_BERRY", + "ITEM_LEPPA_BERRY", + "ITEM_ORAN_BERRY", + "ITEM_PERSIM_BERRY", + "ITEM_LUM_BERRY", + "ITEM_SITRUS_BERRY", + "ITEM_FIGY_BERRY", + "ITEM_WIKI_BERRY", + "ITEM_MAGO_BERRY", + "ITEM_AGUAV_BERRY", + "ITEM_IAPAPA_BERRY", + "ITEM_RAZZ_BERRY", + "ITEM_BLUK_BERRY", + "ITEM_NANAB_BERRY", + "ITEM_WEPEAR_BERRY", + "ITEM_PINAP_BERRY", + "ITEM_POMEG_BERRY", + "ITEM_KELPSY_BERRY", + "ITEM_QUALOT_BERRY", + "ITEM_HONDEW_BERRY", + "ITEM_GREPA_BERRY", + "ITEM_TAMATO_BERRY", + "ITEM_CORNN_BERRY", + "ITEM_MAGOST_BERRY", + "ITEM_RABUTA_BERRY", + "ITEM_NOMEL_BERRY", + "ITEM_SPELON_BERRY", + "ITEM_PAMTRE_BERRY", + "ITEM_WATMEL_BERRY", + "ITEM_DURIN_BERRY", + "ITEM_BELUE_BERRY", + "ITEM_OCCA_BERRY", + "ITEM_PASSHO_BERRY", + "ITEM_WACAN_BERRY", + "ITEM_RINDO_BERRY", + "ITEM_YACHE_BERRY", + "ITEM_CHOPLE_BERRY", + "ITEM_KEBIA_BERRY", + "ITEM_SHUCA_BERRY", + "ITEM_COBA_BERRY", + "ITEM_PAYAPA_BERRY", + "ITEM_TANGA_BERRY", + "ITEM_CHARTI_BERRY", + "ITEM_KASIB_BERRY", + "ITEM_HABAN_BERRY", + "ITEM_COLBUR_BERRY", + "ITEM_BABIRI_BERRY", + "ITEM_CHILAN_BERRY", + "ITEM_LIECHI_BERRY", + "ITEM_GANLON_BERRY", + "ITEM_SALAC_BERRY", + "ITEM_PETAYA_BERRY", + "ITEM_APICOT_BERRY", + "ITEM_LANSAT_BERRY", + "ITEM_STARF_BERRY", + "ITEM_ENIGMA_BERRY", + "ITEM_MICLE_BERRY", + "ITEM_CUSTAP_BERRY", + "ITEM_JABOCA_BERRY", + "ITEM_ROWAP_BERRY", + "ITEM_BRIGHTPOWDER", + "ITEM_WHITE_HERB", + "ITEM_MACHO_BRACE", + "ITEM_EXP_SHARE", + "ITEM_QUICK_CLAW", + "ITEM_SOOTHE_BELL", + "ITEM_MENTAL_HERB", + "ITEM_CHOICE_BAND", + "ITEM_KINGS_ROCK", + "ITEM_SILVERPOWDER", + "ITEM_AMULET_COIN", + "ITEM_CLEANSE_TAG", + "ITEM_SOUL_DEW", + "ITEM_DEEPSEATOOTH", + "ITEM_DEEPSEASCALE", + "ITEM_SMOKE_BALL", + "ITEM_EVERSTONE", + "ITEM_FOCUS_BAND", + "ITEM_LUCKY_EGG", + "ITEM_SCOPE_LENS", + "ITEM_METAL_COAT", + "ITEM_LEFTOVERS", + "ITEM_DRAGON_SCALE", + "ITEM_LIGHT_BALL", + "ITEM_SOFT_SAND", + "ITEM_HARD_STONE", + "ITEM_MIRACLE_SEED", + "ITEM_BLACKGLASSES", + "ITEM_BLACK_BELT", + "ITEM_MAGNET", + "ITEM_MYSTIC_WATER", + "ITEM_SHARP_BEAK", + "ITEM_POISON_BARB", + "ITEM_NEVERMELTICE", + "ITEM_SPELL_TAG", + "ITEM_TWISTEDSPOON", + "ITEM_CHARCOAL", + "ITEM_DRAGON_FANG", + "ITEM_SILK_SCARF", + "ITEM_UPGRADE", + "ITEM_SHELL_BELL", + "ITEM_SEA_INCENSE", + "ITEM_LAX_INCENSE", + "ITEM_LUCKY_PUNCH", + "ITEM_METAL_POWDER", + "ITEM_THICK_CLUB", + "ITEM_STICK", + "ITEM_RED_SCARF", + "ITEM_BLUE_SCARF", + "ITEM_PINK_SCARF", + "ITEM_GREEN_SCARF", + "ITEM_YELLOW_SCARF", + "ITEM_WIDE_LENS", + "ITEM_MUSCLE_BAND", + "ITEM_WISE_GLASSES", + "ITEM_EXPERT_BELT", + "ITEM_LIGHT_CLAY", + "ITEM_LIFE_ORB", + "ITEM_POWER_HERB", + "ITEM_TOXIC_ORB", + "ITEM_FLAME_ORB", + "ITEM_QUICK_POWDER", + "ITEM_FOCUS_SASH", + "ITEM_ZOOM_LENS", + "ITEM_METRONOME", + "ITEM_IRON_BALL", + "ITEM_LAGGING_TAIL", + "ITEM_DESTINY_KNOT", + "ITEM_BLACK_SLUDGE", + "ITEM_ICY_ROCK", + "ITEM_SMOOTH_ROCK", + "ITEM_HEAT_ROCK", + "ITEM_DAMP_ROCK", + "ITEM_GRIP_CLAW", + "ITEM_CHOICE_SCARF", + "ITEM_STICKY_BARB", + "ITEM_POWER_BRACER", + "ITEM_POWER_BELT", + "ITEM_POWER_LENS", + "ITEM_POWER_BAND", + "ITEM_POWER_ANKLET", + "ITEM_POWER_WEIGHT", + "ITEM_SHED_SHELL", + "ITEM_BIG_ROOT", + "ITEM_CHOICE_SPECS", + "ITEM_FLAME_PLATE", + "ITEM_SPLASH_PLATE", + "ITEM_ZAP_PLATE", + "ITEM_MEADOW_PLATE", + "ITEM_ICICLE_PLATE", + "ITEM_FIST_PLATE", + "ITEM_TOXIC_PLATE", + "ITEM_EARTH_PLATE", + "ITEM_SKY_PLATE", + "ITEM_MIND_PLATE", + "ITEM_INSECT_PLATE", + "ITEM_STONE_PLATE", + "ITEM_SPOOKY_PLATE", + "ITEM_DRACO_PLATE", + "ITEM_DREAD_PLATE", + "ITEM_IRON_PLATE", + "ITEM_ODD_INCENSE", + "ITEM_ROCK_INCENSE", + "ITEM_FULL_INCENSE", + "ITEM_WAVE_INCENSE", + "ITEM_ROSE_INCENSE", + "ITEM_LUCK_INCENSE", + "ITEM_PURE_INCENSE", + "ITEM_PROTECTOR", + "ITEM_ELECTIRIZER", + "ITEM_MAGMARIZER", + "ITEM_DUBIOUS_DISC", + "ITEM_REAPER_CLOTH", + "ITEM_RAZOR_CLAW", + "ITEM_RAZOR_FANG", + "ITEM_TM01", + "ITEM_TM02", + "ITEM_TM03", + "ITEM_TM04", + "ITEM_TM05", + "ITEM_TM06", + "ITEM_TM07", + "ITEM_TM08", + "ITEM_TM09", + "ITEM_TM10", + "ITEM_TM11", + "ITEM_TM12", + "ITEM_TM13", + "ITEM_TM14", + "ITEM_TM15", + "ITEM_TM16", + "ITEM_TM17", + "ITEM_TM18", + "ITEM_TM19", + "ITEM_TM20", + "ITEM_TM21", + "ITEM_TM22", + "ITEM_TM23", + "ITEM_TM24", + "ITEM_TM25", + "ITEM_TM26", + "ITEM_TM27", + "ITEM_TM28", + "ITEM_TM29", + "ITEM_TM30", + "ITEM_TM31", + "ITEM_TM32", + "ITEM_TM33", + "ITEM_TM34", + "ITEM_TM35", + "ITEM_TM36", + "ITEM_TM37", + "ITEM_TM38", + "ITEM_TM39", + "ITEM_TM40", + "ITEM_TM41", + "ITEM_TM42", + "ITEM_TM43", + "ITEM_TM44", + "ITEM_TM45", + "ITEM_TM46", + "ITEM_TM47", + "ITEM_TM48", + "ITEM_TM49", + "ITEM_TM50", + "ITEM_TM51", + "ITEM_TM52", + "ITEM_TM53", + "ITEM_TM54", + "ITEM_TM55", + "ITEM_TM56", + "ITEM_TM57", + "ITEM_TM58", + "ITEM_TM59", + "ITEM_TM60", + "ITEM_TM61", + "ITEM_TM62", + "ITEM_TM63", + "ITEM_TM64", + "ITEM_TM65", + "ITEM_TM66", + "ITEM_TM67", + "ITEM_TM68", + "ITEM_TM69", + "ITEM_TM70", + "ITEM_TM71", + "ITEM_TM72", + "ITEM_TM73", + "ITEM_TM74", + "ITEM_TM75", + "ITEM_TM76", + "ITEM_TM77", + "ITEM_TM78", + "ITEM_TM79", + "ITEM_TM80", + "ITEM_TM81", + "ITEM_TM82", + "ITEM_TM83", + "ITEM_TM84", + "ITEM_TM85", + "ITEM_TM86", + "ITEM_TM87", + "ITEM_TM88", + "ITEM_TM89", + "ITEM_TM90", + "ITEM_TM91", + "ITEM_TM92", + "ITEM_HM01", + "ITEM_HM02", + "ITEM_HM03", + "ITEM_HM04", + "ITEM_HM05", + "ITEM_HM06", + "ITEM_HM07", + "ITEM_HM08", + "ITEM_EXPLORER_KIT", + "ITEM_LOOT_SACK", + "ITEM_RULE_BOOK", + "ITEM_POKE_RADAR", + "ITEM_POINT_CARD", + "ITEM_JOURNAL", + "ITEM_SEAL_CASE", + "ITEM_FASHION_CASE", + "ITEM_SEAL_BAG", + "ITEM_PAL_PAD", + "ITEM_WORKS_KEY", + "ITEM_OLD_CHARM", + "ITEM_GALACTIC_KEY", + "ITEM_RED_CHAIN", + "ITEM_TOWN_MAP", + "ITEM_VS_SEEKER", + "ITEM_COIN_CASE", + "ITEM_OLD_ROD", + "ITEM_GOOD_ROD", + "ITEM_SUPER_ROD", + "ITEM_SPRAYDUCK", + "ITEM_POFFIN_CASE", + "ITEM_BICYCLE", + "ITEM_SUITE_KEY", + "ITEM_OAKS_LETTER", + "ITEM_LUNAR_WING", + "ITEM_MEMBER_CARD", + "ITEM_AZURE_FLUTE", + "ITEM_S_S_TICKET", + "ITEM_CONTEST_PASS", + "ITEM_MAGMA_STONE", + "ITEM_PARCEL", + "ITEM_COUPON_1", + "ITEM_COUPON_2", + "ITEM_COUPON_3", + "ITEM_STORAGE_KEY", + "ITEM_SECRETPOTION", + "ITEM_VS_RECORDER", + "ITEM_GRACIDEA", + "ITEM_SECRET_KEY", + "MAX_ITEMS" + ] + }, + "@PokemonGenderRatio": { + "type": "aliases", + "as_preproc": true, + "values": { + "GENDER_RATIO_MALE_ONLY": 0, + "GENDER_RATIO_FEMALE_12_5": 31, + "GENDER_RATIO_FEMALE_25": 63, + "GENDER_RATIO_FEMALE_50": 127, + "GENDER_RATIO_FEMALE_75": 191, + "GENDER_RATIO_FEMALE_87_5": 223, + "GENDER_RATIO_FEMALE_ONLY": 254, + "GENDER_RATIO_NO_GENDER": 255 + } + }, + "@MoveClass": { + "type": "enum", + "values": [ + "CLASS_PHYSICAL", + "CLASS_SPECIAL", + "CLASS_STATUS" + ] } } } \ No newline at end of file diff --git a/consts/meson.build b/consts/meson.build index 2e709e8882..7c964e6a95 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -2,14 +2,15 @@ consts_manifests = files( 'battle.json', 'global.json', 'narc_files.json', - 'trainer_ai.json', + 'trainer.json', + 'sprites.json', ) gen_consts_root = meson.current_build_dir() / 'generated' gen_c_consts_root = gen_consts_root / 'c' gen_asm_consts_root = gen_consts_root / 'asm' -custom_target('generated_consts_c', +generated_consts_c = custom_target('generated_consts_c', build_by_default: true, capture: true, output: 'generated_consts_c', diff --git a/consts/move_data.json b/consts/move_data.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/consts/sprites.json b/consts/sprites.json new file mode 100644 index 0000000000..3bcd926c97 --- /dev/null +++ b/consts/sprites.json @@ -0,0 +1,18 @@ +{ + "targets": { + "shadows": [ + "@PokemonBattleShadowSize" + ] + }, + "definitions": { + "@PokemonBattleShadowSize": { + "type": "enum", + "values": [ + "SHADOW_SIZE_NONE", + "SHADOW_SIZE_SMALL", + "SHADOW_SIZE_MEDIUM", + "SHADOW_SIZE_LARGE" + ] + } + } +} \ No newline at end of file diff --git a/consts/trainer.json b/consts/trainer.json new file mode 100644 index 0000000000..32f9e629d5 --- /dev/null +++ b/consts/trainer.json @@ -0,0 +1,204 @@ +{ + "targets": { + "trainer": [ + "@TrainerClass" + ], + "trainer_ai": [ + "@LoadTypeTarget", + "@AIWeather", + "@CheckEffect", + "@CheckLevel", + "@AIFlag" + ] + }, + "definitions": { + "@TrainerClass": { + "type": "enum", + "values": [ + "TRAINER_CLASS_PLAYER_MALE", + "TRAINER_CLASS_PLAYER_FEMALE", + "TRAINER_CLASS_YOUNGSTER", + "TRAINER_CLASS_LASS", + "TRAINER_CLASS_CAMPER", + "TRAINER_CLASS_PICNICKER", + "TRAINER_CLASS_BUG_CATCHER", + "TRAINER_CLASS_AROMA_LADY", + "TRAINER_CLASS_TWINS", + "TRAINER_CLASS_HIKER", + "TRAINER_CLASS_BATTLE_GIRL", + "TRAINER_CLASS_FISHERMAN", + "TRAINER_CLASS_CYCLIST_MALE", + "TRAINER_CLASS_CYCLIST_FEMALE", + "TRAINER_CLASS_BLACK_BELT", + "TRAINER_CLASS_ARTIST", + "TRAINER_CLASS_BREEDER_MALE", + "TRAINER_CLASS_BREEDER_FEMALE", + "TRAINER_CLASS_COWGIRL", + "TRAINER_CLASS_JOGGER", + "TRAINER_CLASS_POKEFAN_MALE", + "TRAINER_CLASS_POKEFAN_FEMALE", + "TRAINER_CLASS_POKE_KID", + "TRAINER_CLASS_YOUNG_COUPLE", + "TRAINER_CLASS_ACE_TRAINER_MALE", + "TRAINER_CLASS_ACE_TRAINER_FEMALE", + "TRAINER_CLASS_WAITRESS", + "TRAINER_CLASS_VETERAN", + "TRAINER_CLASS_NINJA_BOY", + "TRAINER_CLASS_DRAGON_TAMER", + "TRAINER_CLASS_BIRD_KEEPER", + "TRAINER_CLASS_DOUBLE_TEAM", + "TRAINER_CLASS_RICH_BOY", + "TRAINER_CLASS_LADY", + "TRAINER_CLASS_GENTLEMAN", + "TRAINER_CLASS_SOCIALITE", + "TRAINER_CLASS_BEAUTY", + "TRAINER_CLASS_COLLECTOR", + "TRAINER_CLASS_POLICEMAN", + "TRAINER_CLASS_RANGER_MALE", + "TRAINER_CLASS_RANGER_FEMALE", + "TRAINER_CLASS_SCIENTIST", + "TRAINER_CLASS_SWIMMER_MALE", + "TRAINER_CLASS_SWIMMER_FEMALE", + "TRAINER_CLASS_TUBER_MALE", + "TRAINER_CLASS_TUBER_FEMALE", + "TRAINER_CLASS_SAILOR", + "TRAINER_CLASS_SIS_AND_BRO", + "TRAINER_CLASS_RUIN_MANIAC", + "TRAINER_CLASS_PSYCHIC_MALE", + "TRAINER_CLASS_PSYCHIC_FEMALE", + "TRAINER_CLASS_PI", + "TRAINER_CLASS_GUITARIST", + "TRAINER_CLASS_ACE_TRAINER_SNOW_MALE", + "TRAINER_CLASS_ACE_TRAINER_SNOW_FEMALE", + "TRAINER_CLASS_SKIER_MALE", + "TRAINER_CLASS_SKIER_FEMALE", + "TRAINER_CLASS_ROUGHNECK", + "TRAINER_CLASS_CLOWN", + "TRAINER_CLASS_WORKER", + "TRAINER_CLASS_SCHOOL_KID_MALE", + "TRAINER_CLASS_SCHOOL_KID_FEMALE", + "TRAINER_CLASS_LEADER_ROARK", + "TRAINER_CLASS_RIVAL", + "TRAINER_CLASS_LEADER_BYRON", + "TRAINER_CLASS_ELITE_FOUR_AARON", + "TRAINER_CLASS_ELITE_FOUR_BERTHA", + "TRAINER_CLASS_ELITE_FOUR_FLINT", + "TRAINER_CLASS_ELITE_FOUR_LUCIAN", + "TRAINER_CLASS_CHAMPION_CYNTHIA", + "TRAINER_CLASS_BELLE_AND_PA", + "TRAINER_CLASS_RANCHER", + "TRAINER_CLASS_COMMANDER_MARS", + "TRAINER_CLASS_GALACTIC_GRUNT_MALE", + "TRAINER_CLASS_LEADER_GARDENIA", + "TRAINER_CLASS_LEADER_WAKE", + "TRAINER_CLASS_LEADER_MAYLENE", + "TRAINER_CLASS_LEADER_FANTINA", + "TRAINER_CLASS_LEADER_CANDICE", + "TRAINER_CLASS_LEADER_VOLKNER", + "TRAINER_CLASS_PARASOL_LADY", + "TRAINER_CLASS_WAITER", + "TRAINER_CLASS_INTERVIEWERS", + "TRAINER_CLASS_CAMERAMAN", + "TRAINER_CLASS_REPORTERS", + "TRAINER_CLASS_IDOL", + "TRAINER_CLASS_GALACTIC_BOSS", + "TRAINER_CLASS_COMMANDER_JUPITER", + "TRAINER_CLASS_COMMANDER_SATURN", + "TRAINER_CLASS_GALACTIC_GRUNT_FEMALE", + "TRAINER_CLASS_TRAINER_CHERYL", + "TRAINER_CLASS_TRAINER_RILEY", + "TRAINER_CLASS_TRAINER_MARLEY", + "TRAINER_CLASS_TRAINER_BUCK", + "TRAINER_CLASS_TRAINER_MIRA", + "TRAINER_CLASS_DP_PLAYER_MALE", + "TRAINER_CLASS_DP_PLAYER_FEMALE", + "TRAINER_CLASS_TOWER_TYCOON", + "TRAINER_CLASS_MAID", + "TRAINER_CLASS_HALL_MATRON", + "TRAINER_CLASS_FACTORY_HEAD", + "TRAINER_CLASS_ARCADE_STAR", + "TRAINER_CLASS_CASTLE_VALET", + "TRAINER_CLASS_DP_PLAYER_MALE_2", + "TRAINER_CLASS_DP_PLAYER_FEMALE_2" + ] + }, + "@LoadTypeTarget": { + "type": "enum", + "values": [ + "LOAD_DEFENDER_TYPE_1", + "LOAD_ATTACKER_TYPE_1", + "LOAD_DEFENDER_TYPE_2", + "LOAD_ATTACKER_TYPE_2", + "LOAD_MOVE_TYPE", + "LOAD_DEFENDER_PARTNER_TYPE_1", + "LOAD_ATTACKER_PARTNER_TYPE_1", + "LOAD_DEFENDER_PARTNER_TYPE_2", + "LOAD_ATTACKER_PARTNER_TYPE_2" + ] + }, + "@AIWeather": { + "type": "enum", + "values": [ + "AI_WEATHER_CLEAR", + "AI_WEATHER_SUNNY", + "AI_WEATHER_RAINING", + "AI_WEATHER_SANDSTORM", + "AI_WEATHER_HAILING", + "AI_WEATHER_DEEP_FOG" + ] + }, + "@CheckEffect": { + "type": "enum", + "values": [ + "CHECK_DISABLE", + "CHECK_ENCORE" + ] + }, + "@CheckLevel": { + "type": "enum", + "values": [ + "CHECK_HIGHER_THAN_TARGET", + "CHECK_LOWER_THAN_TARGET", + "CHECK_EQUAL_TO_TARGET" + ] + }, + "@AIFlag": { + "type": "flags", + "values": [ + "AI_FLAG_NONE", + "AI_FLAG_BASIC", + "AI_FLAG_EVAL_ATTACK", + "AI_FLAG_EXPERT", + "AI_FLAG_SETUP_FIRST_TURN", + "AI_FLAG_RISKY", + "AI_FLAG_DAMAGE_PRIORITY", + "AI_FLAG_BATON_PASS", + "AI_FLAG_TAG_STRATEGY", + "AI_FLAG_CHECK_HP", + "AI_FLAG_WEATHER", + "AI_FLAG_HARRASSMENT", + "AI_FLAG_UNUSED_11", + "AI_FLAG_UNUSED_12", + "AI_FLAG_UNUSED_13", + "AI_FLAG_UNUSED_14", + "AI_FLAG_UNUSED_15", + "AI_FLAG_UNUSED_16", + "AI_FLAG_UNUSED_17", + "AI_FLAG_UNUSED_18", + "AI_FLAG_UNUSED_19", + "AI_FLAG_UNUSED_20", + "AI_FLAG_UNUSED_21", + "AI_FLAG_UNUSED_22", + "AI_FLAG_UNUSED_23", + "AI_FLAG_UNUSED_24", + "AI_FLAG_UNUSED_25", + "AI_FLAG_UNUSED_26", + "AI_FLAG_UNUSED_27", + "AI_FLAG_UNUSED_28", + "AI_FLAG_ROAMING_POKEMON", + "AI_FLAG_SAFARI", + "AI_FLAG_CATCH_TUTORIAL" + ] + } + } +} diff --git a/consts/trainer_ai.json b/consts/trainer_ai.json deleted file mode 100644 index e4e78d717d..0000000000 --- a/consts/trainer_ai.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "targets": { - "trainer_ai": [ - "@LoadTypeTarget", - "@AIWeather", - "@CheckEffect", - "@CheckLevel" - ] - }, - "definitions": { - "@LoadTypeTarget": { - "type": "enum", - "values": [ - "LOAD_DEFENDER_TYPE_1", - "LOAD_ATTACKER_TYPE_1", - "LOAD_DEFENDER_TYPE_2", - "LOAD_ATTACKER_TYPE_2", - "LOAD_MOVE_TYPE", - "LOAD_DEFENDER_PARTNER_TYPE_1", - "LOAD_ATTACKER_PARTNER_TYPE_1", - "LOAD_DEFENDER_PARTNER_TYPE_2", - "LOAD_ATTACKER_PARTNER_TYPE_2" - ] - }, - "@AIWeather": { - "type": "enum", - "values": [ - "AI_WEATHER_CLEAR", - "AI_WEATHER_SUNNY", - "AI_WEATHER_RAINING", - "AI_WEATHER_SANDSTORM", - "AI_WEATHER_HAILING", - "AI_WEATHER_DEEP_FOG" - ] - }, - "@CheckEffect": { - "type": "enum", - "values": [ - "CHECK_DISABLE", - "CHECK_ENCORE" - ] - }, - "@CheckLevel": { - "type": "enum", - "values": [ - "CHECK_HIGHER_THAN_TARGET", - "CHECK_LOWER_THAN_TARGET", - "CHECK_EQUAL_TO_TARGET" - ] - } - } -} diff --git a/include/constants/battle/moves.h b/include/constants/battle/moves.h index ed0d465e55..6edc8b5b9e 100644 --- a/include/constants/battle/moves.h +++ b/include/constants/battle/moves.h @@ -85,28 +85,4 @@ #define MOVE_STATUS_GENERAL_MISS (MOVE_STATUS_MISSED | MOVE_STATUS_SEMI_INVULNERABLE) #define MOVE_STATUS_BASIC_EFFECTIVENESS (MOVE_STATUS_SUPER_EFFECTIVE | MOVE_STATUS_NOT_VERY_EFFECTIVE) -#define RANGE_SINGLE_TARGET 0 -#define RANGE_SINGLE_TARGET_SPECIAL (1 << 0) -#define RANGE_RANDOM_OPPONENT (1 << 1) -#define RANGE_ADJACENT_OPPONENTS (1 << 2) -#define RANGE_ALL_ADJACENT (1 << 3) -#define RANGE_USER (1 << 4) -#define RANGE_USER_SIDE (1 << 5) -#define RANGE_FIELD (1 << 6) -#define RANGE_OPPONENT_SIDE (1 << 7) -#define RANGE_ALLY (1 << 8) -#define RANGE_USER_OR_ALLY (1 << 9) -#define RANGE_SINGLE_TARGET_ME_FIRST (1 << 10) - -#define RANGE_MY_SIDE (RANGE_SINGLE_TARGET_SPECIAL | RANGE_USER | RANGE_FIELD | RANGE_USER_OR_ALLY) - -#define MOVE_FLAG_MAKES_CONTACT (1 << 0) -#define MOVE_FLAG_CAN_PROTECT (1 << 1) -#define MOVE_FLAG_CAN_MAGIC_COAT (1 << 2) -#define MOVE_FLAG_CAN_SNATCH (1 << 3) -#define MOVE_FLAG_CAN_MIRROR_MOVE (1 << 4) -#define MOVE_FLAG_TRIGGERS_KINGS_ROCK (1 << 5) -#define MOVE_FLAG_HIDES_HP_GAUGES (1 << 6) -#define MOVE_FLAG_HIDES_SHADOWS (1 << 7) - #endif // POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H diff --git a/include/constants/battle/trainer_ai.h b/include/constants/battle/trainer_ai.h index dc37a95a02..fb0135e8f4 100644 --- a/include/constants/battle/trainer_ai.h +++ b/include/constants/battle/trainer_ai.h @@ -17,21 +17,6 @@ enum AIActionChoice { #define AI_CONTEXT (battleCtx->aiContext) #endif -#define AI_FLAG_BASIC (1 << 0) -#define AI_FLAG_EVAL_ATTACK (1 << 1) -#define AI_FLAG_EXPERT (1 << 2) -#define AI_FLAG_SETUP_FIRST_TURN (1 << 3) -#define AI_FLAG_RISKY (1 << 4) -#define AI_FLAG_DAMAGE_PRIORITY (1 << 5) -#define AI_FLAG_BATON_PASS (1 << 6) -#define AI_FLAG_TAG_STRATEGY (1 << 7) -#define AI_FLAG_CHECK_HP (1 << 8) -#define AI_FLAG_WEATHER (1 << 9) -#define AI_FLAG_HARRASSMENT (1 << 10) -#define AI_FLAG_ROAMING_POKEMON (1 << 29) -#define AI_FLAG_SAFARI (1 << 30) -#define AI_FLAG_CATCH_TUTORIAL (1 << 31) - #define AI_INIT_SCORE_MOVE_1 (1 << 0) #define AI_INIT_SCORE_MOVE_2 (1 << 1) #define AI_INIT_SCORE_MOVE_3 (1 << 2) diff --git a/include/constants/items.h b/include/constants/items.h index 48db908372..5cae267847 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -46,6 +46,16 @@ enum { | ITEM_RECOVER_FREEZE \ | ITEM_RECOVER_PARALYSIS) +#define FIRST_MAIL_IDX ITEM_GRASS_MAIL +#define LAST_MAIL_IDX ITEM_BRICK_MAIL +#define NUM_MAILS (LAST_MAIL_IDX - FIRST_MAIL_IDX + 1) + +#define FIRST_BERRY_IDX ITEM_CHERI_BERRY +#define LAST_BERRY_IDX ITEM_ROWAP_BERRY +#define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) + +#define NUM_ITEMS MAX_ITEMS - 1 + #define FLING_EFFECT_NONE 0 #define FLING_EFFECT_PRZ_RESTORE 1 #define FLING_EFFECT_SLP_RESTORE 2 @@ -103,517 +113,6 @@ enum { #define PLUCK_EFFECT_RANDOM_UP2 22 #define PLUCK_EFFECT_TEMP_ACC_UP 23 -#define ITEM_NONE 0 - -// Balls -#define ITEM_MASTER_BALL 1 -#define ITEM_ULTRA_BALL 2 -#define ITEM_GREAT_BALL 3 -#define ITEM_POKE_BALL 4 -#define ITEM_SAFARI_BALL 5 -#define ITEM_NET_BALL 6 -#define ITEM_DIVE_BALL 7 -#define ITEM_NEST_BALL 8 -#define ITEM_REPEAT_BALL 9 -#define ITEM_TIMER_BALL 10 -#define ITEM_LUXURY_BALL 11 -#define ITEM_PREMIER_BALL 12 -#define ITEM_DUSK_BALL 13 -#define ITEM_HEAL_BALL 14 -#define ITEM_QUICK_BALL 15 -#define ITEM_CHERISH_BALL 16 - -// Pokemon Items -#define ITEM_POTION 17 -#define ITEM_ANTIDOTE 18 -#define ITEM_BURN_HEAL 19 -#define ITEM_ICE_HEAL 20 -#define ITEM_AWAKENING 21 -#define ITEM_PARLYZ_HEAL 22 -#define ITEM_FULL_RESTORE 23 -#define ITEM_MAX_POTION 24 -#define ITEM_HYPER_POTION 25 -#define ITEM_SUPER_POTION 26 -#define ITEM_FULL_HEAL 27 -#define ITEM_REVIVE 28 -#define ITEM_MAX_REVIVE 29 -#define ITEM_FRESH_WATER 30 -#define ITEM_SODA_POP 31 -#define ITEM_LEMONADE 32 -#define ITEM_MOOMOO_MILK 33 -#define ITEM_ENERGYPOWDER 34 -#define ITEM_ENERGY_ROOT 35 -#define ITEM_HEAL_POWDER 36 -#define ITEM_REVIVAL_HERB 37 -#define ITEM_ETHER 38 -#define ITEM_MAX_ETHER 39 -#define ITEM_ELIXIR 40 -#define ITEM_MAX_ELIXIR 41 -#define ITEM_LAVA_COOKIE 42 -#define ITEM_BERRY_JUICE 43 -#define ITEM_SACRED_ASH 44 -#define ITEM_HP_UP 45 -#define ITEM_PROTEIN 46 -#define ITEM_IRON 47 -#define ITEM_CARBOS 48 -#define ITEM_CALCIUM 49 -#define ITEM_RARE_CANDY 50 -#define ITEM_PP_UP 51 -#define ITEM_ZINC 52 -#define ITEM_PP_MAX 53 -#define ITEM_OLD_GATEAU 54 -#define ITEM_GUARD_SPEC_ 55 -#define ITEM_DIRE_HIT 56 -#define ITEM_X_ATTACK 57 -#define ITEM_X_DEFENSE 58 -#define ITEM_X_SPEED 59 -#define ITEM_X_ACCURACY 60 -#define ITEM_X_SPECIAL 61 -#define ITEM_X_SP__DEF 62 -#define ITEM_POKE_DOLL 63 -#define ITEM_FLUFFY_TAIL 64 -#define ITEM_BLUE_FLUTE 65 -#define ITEM_YELLOW_FLUTE 66 -#define ITEM_RED_FLUTE 67 -#define ITEM_BLACK_FLUTE 68 -#define ITEM_WHITE_FLUTE 69 -#define ITEM_SHOAL_SALT 70 -#define ITEM_SHOAL_SHELL 71 -#define ITEM_RED_SHARD 72 -#define ITEM_BLUE_SHARD 73 -#define ITEM_YELLOW_SHARD 74 -#define ITEM_GREEN_SHARD 75 -#define ITEM_SUPER_REPEL 76 -#define ITEM_MAX_REPEL 77 -#define ITEM_ESCAPE_ROPE 78 -#define ITEM_REPEL 79 -#define ITEM_SUN_STONE 80 -#define ITEM_MOON_STONE 81 -#define ITEM_FIRE_STONE 82 -#define ITEM_THUNDERSTONE 83 -#define ITEM_WATER_STONE 84 -#define ITEM_LEAF_STONE 85 - -// Unusable -#define ITEM_TINYMUSHROOM 86 -#define ITEM_BIG_MUSHROOM 87 -#define ITEM_PEARL 88 -#define ITEM_BIG_PEARL 89 -#define ITEM_STARDUST 90 -#define ITEM_STAR_PIECE 91 -#define ITEM_NUGGET 92 -#define ITEM_HEART_SCALE 93 -#define ITEM_HONEY 94 -#define ITEM_GROWTH_MULCH 95 -#define ITEM_DAMP_MULCH 96 -#define ITEM_STABLE_MULCH 97 -#define ITEM_GOOEY_MULCH 98 -#define ITEM_ROOT_FOSSIL 99 -#define ITEM_CLAW_FOSSIL 100 -#define ITEM_HELIX_FOSSIL 101 -#define ITEM_DOME_FOSSIL 102 -#define ITEM_OLD_AMBER 103 -#define ITEM_ARMOR_FOSSIL 104 -#define ITEM_SKULL_FOSSIL 105 -#define ITEM_RARE_BONE 106 -#define ITEM_SHINY_STONE 107 -#define ITEM_DUSK_STONE 108 -#define ITEM_DAWN_STONE 109 -#define ITEM_OVAL_STONE 110 -#define ITEM_ODD_KEYSTONE 111 -#define ITEM_GRISEOUS_ORB 112 - -// Unused -#define ITEM_UNUSED_113 113 -#define ITEM_UNUSED_114 114 -#define ITEM_UNUSED_115 115 -#define ITEM_UNUSED_116 116 -#define ITEM_UNUSED_117 117 -#define ITEM_UNUSED_118 118 -#define ITEM_UNUSED_119 119 -#define ITEM_UNUSED_120 120 -#define ITEM_UNUSED_121 121 -#define ITEM_UNUSED_122 122 -#define ITEM_UNUSED_123 123 -#define ITEM_UNUSED_124 124 -#define ITEM_UNUSED_125 125 -#define ITEM_UNUSED_126 126 -#define ITEM_UNUSED_127 127 -#define ITEM_UNUSED_128 128 -#define ITEM_UNUSED_129 129 -#define ITEM_UNUSED_130 130 -#define ITEM_UNUSED_131 131 -#define ITEM_UNUSED_132 132 -#define ITEM_UNUSED_133 133 -#define ITEM_UNUSED_134 134 - -#define ITEM_ADAMANT_ORB 135 -#define ITEM_LUSTROUS_ORB 136 - -// Mails -#define ITEM_GRASS_MAIL 137 -#define ITEM_FLAME_MAIL 138 -#define ITEM_BUBBLE_MAIL 139 -#define ITEM_BLOOM_MAIL 140 -#define ITEM_TUNNEL_MAIL 141 -#define ITEM_STEEL_MAIL 142 -#define ITEM_HEART_MAIL 143 -#define ITEM_SNOW_MAIL 144 -#define ITEM_SPACE_MAIL 145 -#define ITEM_AIR_MAIL 146 -#define ITEM_MOSAIC_MAIL 147 -#define ITEM_BRICK_MAIL 148 - -#define FIRST_MAIL_IDX ITEM_GRASS_MAIL -#define LAST_MAIL_IDX ITEM_BRICK_MAIL -#define NUM_MAILS (LAST_MAIL_IDX - FIRST_MAIL_IDX + 1) - -// Berries -#define ITEM_CHERI_BERRY 149 -#define ITEM_CHESTO_BERRY 150 -#define ITEM_PECHA_BERRY 151 -#define ITEM_RAWST_BERRY 152 -#define ITEM_ASPEAR_BERRY 153 -#define ITEM_LEPPA_BERRY 154 -#define ITEM_ORAN_BERRY 155 -#define ITEM_PERSIM_BERRY 156 -#define ITEM_LUM_BERRY 157 -#define ITEM_SITRUS_BERRY 158 -#define ITEM_FIGY_BERRY 159 -#define ITEM_WIKI_BERRY 160 -#define ITEM_MAGO_BERRY 161 -#define ITEM_AGUAV_BERRY 162 -#define ITEM_IAPAPA_BERRY 163 -#define ITEM_RAZZ_BERRY 164 -#define ITEM_BLUK_BERRY 165 -#define ITEM_NANAB_BERRY 166 -#define ITEM_WEPEAR_BERRY 167 -#define ITEM_PINAP_BERRY 168 -#define ITEM_POMEG_BERRY 169 -#define ITEM_KELPSY_BERRY 170 -#define ITEM_QUALOT_BERRY 171 -#define ITEM_HONDEW_BERRY 172 -#define ITEM_GREPA_BERRY 173 -#define ITEM_TAMATO_BERRY 174 -#define ITEM_CORNN_BERRY 175 -#define ITEM_MAGOST_BERRY 176 -#define ITEM_RABUTA_BERRY 177 -#define ITEM_NOMEL_BERRY 178 -#define ITEM_SPELON_BERRY 179 -#define ITEM_PAMTRE_BERRY 180 -#define ITEM_WATMEL_BERRY 181 -#define ITEM_DURIN_BERRY 182 -#define ITEM_BELUE_BERRY 183 -#define ITEM_OCCA_BERRY 184 -#define ITEM_PASSHO_BERRY 185 -#define ITEM_WACAN_BERRY 186 -#define ITEM_RINDO_BERRY 187 -#define ITEM_YACHE_BERRY 188 -#define ITEM_CHOPLE_BERRY 189 -#define ITEM_KEBIA_BERRY 190 -#define ITEM_SHUCA_BERRY 191 -#define ITEM_COBA_BERRY 192 -#define ITEM_PAYAPA_BERRY 193 -#define ITEM_TANGA_BERRY 194 -#define ITEM_CHARTI_BERRY 195 -#define ITEM_KASIB_BERRY 196 -#define ITEM_HABAN_BERRY 197 -#define ITEM_COLBUR_BERRY 198 -#define ITEM_BABIRI_BERRY 199 -#define ITEM_CHILAN_BERRY 200 -#define ITEM_LIECHI_BERRY 201 -#define ITEM_GANLON_BERRY 202 -#define ITEM_SALAC_BERRY 203 -#define ITEM_PETAYA_BERRY 204 -#define ITEM_APICOT_BERRY 205 -#define ITEM_LANSAT_BERRY 206 -#define ITEM_STARF_BERRY 207 -#define ITEM_ENIGMA_BERRY 208 -#define ITEM_MICLE_BERRY 209 -#define ITEM_CUSTAP_BERRY 210 -#define ITEM_JABOCA_BERRY 211 -#define ITEM_ROWAP_BERRY 212 - -#define FIRST_BERRY_IDX ITEM_CHERI_BERRY -#define LAST_BERRY_IDX ITEM_ROWAP_BERRY -#define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) - -// Battle Held items -#define ITEM_BRIGHTPOWDER 213 -#define ITEM_WHITE_HERB 214 -#define ITEM_MACHO_BRACE 215 -#define ITEM_EXP_SHARE 216 -#define ITEM_QUICK_CLAW 217 -#define ITEM_SOOTHE_BELL 218 -#define ITEM_MENTAL_HERB 219 -#define ITEM_CHOICE_BAND 220 -#define ITEM_KINGS_ROCK 221 -#define ITEM_SILVERPOWDER 222 -#define ITEM_AMULET_COIN 223 -#define ITEM_CLEANSE_TAG 224 -#define ITEM_SOUL_DEW 225 -#define ITEM_DEEPSEATOOTH 226 -#define ITEM_DEEPSEASCALE 227 -#define ITEM_SMOKE_BALL 228 -#define ITEM_EVERSTONE 229 -#define ITEM_FOCUS_BAND 230 -#define ITEM_LUCKY_EGG 231 -#define ITEM_SCOPE_LENS 232 -#define ITEM_METAL_COAT 233 -#define ITEM_LEFTOVERS 234 -#define ITEM_DRAGON_SCALE 235 -#define ITEM_LIGHT_BALL 236 -#define ITEM_SOFT_SAND 237 -#define ITEM_HARD_STONE 238 -#define ITEM_MIRACLE_SEED 239 -#define ITEM_BLACKGLASSES 240 -#define ITEM_BLACK_BELT 241 -#define ITEM_MAGNET 242 -#define ITEM_MYSTIC_WATER 243 -#define ITEM_SHARP_BEAK 244 -#define ITEM_POISON_BARB 245 -#define ITEM_NEVERMELTICE 246 -#define ITEM_SPELL_TAG 247 -#define ITEM_TWISTEDSPOON 248 -#define ITEM_CHARCOAL 249 -#define ITEM_DRAGON_FANG 250 -#define ITEM_SILK_SCARF 251 -#define ITEM_UPGRADE 252 -#define ITEM_SHELL_BELL 253 -#define ITEM_SEA_INCENSE 254 -#define ITEM_LAX_INCENSE 255 -#define ITEM_LUCKY_PUNCH 256 -#define ITEM_METAL_POWDER 257 -#define ITEM_THICK_CLUB 258 -#define ITEM_STICK 259 - -// Contest held items -#define ITEM_RED_SCARF 260 -#define ITEM_BLUE_SCARF 261 -#define ITEM_PINK_SCARF 262 -#define ITEM_GREEN_SCARF 263 -#define ITEM_YELLOW_SCARF 264 - -// New battle held items -#define ITEM_WIDE_LENS 265 -#define ITEM_MUSCLE_BAND 266 -#define ITEM_WISE_GLASSES 267 -#define ITEM_EXPERT_BELT 268 -#define ITEM_LIGHT_CLAY 269 -#define ITEM_LIFE_ORB 270 -#define ITEM_POWER_HERB 271 -#define ITEM_TOXIC_ORB 272 -#define ITEM_FLAME_ORB 273 -#define ITEM_QUICK_POWDER 274 -#define ITEM_FOCUS_SASH 275 -#define ITEM_ZOOM_LENS 276 -#define ITEM_METRONOME 277 -#define ITEM_IRON_BALL 278 -#define ITEM_LAGGING_TAIL 279 -#define ITEM_DESTINY_KNOT 280 -#define ITEM_BLACK_SLUDGE 281 -#define ITEM_ICY_ROCK 282 -#define ITEM_SMOOTH_ROCK 283 -#define ITEM_HEAT_ROCK 284 -#define ITEM_DAMP_ROCK 285 -#define ITEM_GRIP_CLAW 286 -#define ITEM_CHOICE_SCARF 287 -#define ITEM_STICKY_BARB 288 -#define ITEM_POWER_BRACER 289 -#define ITEM_POWER_BELT 290 -#define ITEM_POWER_LENS 291 -#define ITEM_POWER_BAND 292 -#define ITEM_POWER_ANKLET 293 -#define ITEM_POWER_WEIGHT 294 -#define ITEM_SHED_SHELL 295 -#define ITEM_BIG_ROOT 296 -#define ITEM_CHOICE_SPECS 297 - -// Arceus plates -#define ITEM_FLAME_PLATE 298 -#define ITEM_SPLASH_PLATE 299 -#define ITEM_ZAP_PLATE 300 -#define ITEM_MEADOW_PLATE 301 -#define ITEM_ICICLE_PLATE 302 -#define ITEM_FIST_PLATE 303 -#define ITEM_TOXIC_PLATE 304 -#define ITEM_EARTH_PLATE 305 -#define ITEM_SKY_PLATE 306 -#define ITEM_MIND_PLATE 307 -#define ITEM_INSECT_PLATE 308 -#define ITEM_STONE_PLATE 309 -#define ITEM_SPOOKY_PLATE 310 -#define ITEM_DRACO_PLATE 311 -#define ITEM_DREAD_PLATE 312 -#define ITEM_IRON_PLATE 313 - -// Incenses -#define ITEM_ODD_INCENSE 314 -#define ITEM_ROCK_INCENSE 315 -#define ITEM_FULL_INCENSE 316 -#define ITEM_WAVE_INCENSE 317 -#define ITEM_ROSE_INCENSE 318 -#define ITEM_LUCK_INCENSE 319 -#define ITEM_PURE_INCENSE 320 - -// Evolution held items -#define ITEM_PROTECTOR 321 -#define ITEM_ELECTIRIZER 322 -#define ITEM_MAGMARIZER 323 -#define ITEM_DUBIOUS_DISC 324 -#define ITEM_REAPER_CLOTH 325 -#define ITEM_RAZOR_CLAW 326 -#define ITEM_RAZOR_FANG 327 - -// TMs/HMs -#define ITEM_TM01 328 -#define ITEM_TM02 329 -#define ITEM_TM03 330 -#define ITEM_TM04 331 -#define ITEM_TM05 332 -#define ITEM_TM06 333 -#define ITEM_TM07 334 -#define ITEM_TM08 335 -#define ITEM_TM09 336 -#define ITEM_TM10 337 -#define ITEM_TM11 338 -#define ITEM_TM12 339 -#define ITEM_TM13 340 -#define ITEM_TM14 341 -#define ITEM_TM15 342 -#define ITEM_TM16 343 -#define ITEM_TM17 344 -#define ITEM_TM18 345 -#define ITEM_TM19 346 -#define ITEM_TM20 347 -#define ITEM_TM21 348 -#define ITEM_TM22 349 -#define ITEM_TM23 350 -#define ITEM_TM24 351 -#define ITEM_TM25 352 -#define ITEM_TM26 353 -#define ITEM_TM27 354 -#define ITEM_TM28 355 -#define ITEM_TM29 356 -#define ITEM_TM30 357 -#define ITEM_TM31 358 -#define ITEM_TM32 359 -#define ITEM_TM33 360 -#define ITEM_TM34 361 -#define ITEM_TM35 362 -#define ITEM_TM36 363 -#define ITEM_TM37 364 -#define ITEM_TM38 365 -#define ITEM_TM39 366 -#define ITEM_TM40 367 -#define ITEM_TM41 368 -#define ITEM_TM42 369 -#define ITEM_TM43 370 -#define ITEM_TM44 371 -#define ITEM_TM45 372 -#define ITEM_TM46 373 -#define ITEM_TM47 374 -#define ITEM_TM48 375 -#define ITEM_TM49 376 -#define ITEM_TM50 377 -#define ITEM_TM51 378 -#define ITEM_TM52 379 -#define ITEM_TM53 380 -#define ITEM_TM54 381 -#define ITEM_TM55 382 -#define ITEM_TM56 383 -#define ITEM_TM57 384 -#define ITEM_TM58 385 -#define ITEM_TM59 386 -#define ITEM_TM60 387 -#define ITEM_TM61 388 -#define ITEM_TM62 389 -#define ITEM_TM63 390 -#define ITEM_TM64 391 -#define ITEM_TM65 392 -#define ITEM_TM66 393 -#define ITEM_TM67 394 -#define ITEM_TM68 395 -#define ITEM_TM69 396 -#define ITEM_TM70 397 -#define ITEM_TM71 398 -#define ITEM_TM72 399 -#define ITEM_TM73 400 -#define ITEM_TM74 401 -#define ITEM_TM75 402 -#define ITEM_TM76 403 -#define ITEM_TM77 404 -#define ITEM_TM78 405 -#define ITEM_TM79 406 -#define ITEM_TM80 407 -#define ITEM_TM81 408 -#define ITEM_TM82 409 -#define ITEM_TM83 410 -#define ITEM_TM84 411 -#define ITEM_TM85 412 -#define ITEM_TM86 413 -#define ITEM_TM87 414 -#define ITEM_TM88 415 -#define ITEM_TM89 416 -#define ITEM_TM90 417 -#define ITEM_TM91 418 -#define ITEM_TM92 419 -#define ITEM_HM01 420 -#define ITEM_HM02 421 -#define ITEM_HM03 422 -#define ITEM_HM04 423 -#define ITEM_HM05 424 -#define ITEM_HM06 425 -#define ITEM_HM07 426 -#define ITEM_HM08 427 - -// Key Items -#define ITEM_EXPLORER_KIT 428 -#define ITEM_LOOT_SACK 429 -#define ITEM_RULE_BOOK 430 -#define ITEM_POKE_RADAR 431 -#define ITEM_POINT_CARD 432 -#define ITEM_JOURNAL 433 -#define ITEM_SEAL_CASE 434 -#define ITEM_FASHION_CASE 435 -#define ITEM_SEAL_BAG 436 -#define ITEM_PAL_PAD 437 -#define ITEM_WORKS_KEY 438 -#define ITEM_OLD_CHARM 439 -#define ITEM_GALACTIC_KEY 440 -#define ITEM_RED_CHAIN 441 -#define ITEM_TOWN_MAP 442 -#define ITEM_VS_SEEKER 443 -#define ITEM_COIN_CASE 444 -#define ITEM_OLD_ROD 445 -#define ITEM_GOOD_ROD 446 -#define ITEM_SUPER_ROD 447 -#define ITEM_SPRAYDUCK 448 -#define ITEM_POFFIN_CASE 449 -#define ITEM_BICYCLE 450 -#define ITEM_SUITE_KEY 451 -#define ITEM_OAKS_LETTER 452 -#define ITEM_LUNAR_WING 453 -#define ITEM_MEMBER_CARD 454 -#define ITEM_AZURE_FLUTE 455 -#define ITEM_S_S_TICKET 456 -#define ITEM_CONTEST_PASS 457 -#define ITEM_MAGMA_STONE 458 -#define ITEM_PARCEL 459 -#define ITEM_COUPON_1 460 -#define ITEM_COUPON_2 461 -#define ITEM_COUPON_3 462 -#define ITEM_STORAGE_KEY 463 -#define ITEM_SECRETPOTION 464 - -// New to Platinum -#define ITEM_VS_RECORDER 465 -#define ITEM_GRACIDEA 466 -#define ITEM_SECRET_KEY 467 - -#define NUM_ITEMS ITEM_SECRET_KEY -#define MAX_ITEMS (NUM_ITEMS + 1) - #define ITEM_RETURN_ID 0xFFFF #endif // POKEPLATINUM_CONSTANTS_ITEMS_H diff --git a/include/constants/moves.h b/include/constants/moves.h index e401e74c65..089505438e 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -5,10 +5,6 @@ #define LEARNED_MOVES_MAX 4 -#define CLASS_PHYSICAL 0 -#define CLASS_SPECIAL 1 -#define CLASS_STATUS 2 - #define NUM_MOVES MOVE_SHADOW_FORCE #endif //POKEPLATINUM_CONSTANTS_MOVES_H diff --git a/include/constants/species.h b/include/constants/species.h index 9a1a2ca0ce..f7771a1d4e 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1,515 +1,16 @@ #ifndef POKEPLATINUM_CONSTANTS_SPECIES_H #define POKEPLATINUM_CONSTANTS_SPECIES_H -#define SPECIES_NONE 0 -#define SPECIES_BULBASAUR 1 -#define SPECIES_IVYSAUR 2 -#define SPECIES_VENUSAUR 3 -#define SPECIES_CHARMANDER 4 -#define SPECIES_CHARMELEON 5 -#define SPECIES_CHARIZARD 6 -#define SPECIES_SQUIRTLE 7 -#define SPECIES_WARTORTLE 8 -#define SPECIES_BLASTOISE 9 -#define SPECIES_CATERPIE 10 -#define SPECIES_METAPOD 11 -#define SPECIES_BUTTERFREE 12 -#define SPECIES_WEEDLE 13 -#define SPECIES_KAKUNA 14 -#define SPECIES_BEEDRILL 15 -#define SPECIES_PIDGEY 16 -#define SPECIES_PIDGEOTTO 17 -#define SPECIES_PIDGEOT 18 -#define SPECIES_RATTATA 19 -#define SPECIES_RATICATE 20 -#define SPECIES_SPEAROW 21 -#define SPECIES_FEAROW 22 -#define SPECIES_EKANS 23 -#define SPECIES_ARBOK 24 -#define SPECIES_PIKACHU 25 -#define SPECIES_RAICHU 26 -#define SPECIES_SANDSHREW 27 -#define SPECIES_SANDSLASH 28 -#define SPECIES_NIDORAN_F 29 -#define SPECIES_NIDORINA 30 -#define SPECIES_NIDOQUEEN 31 -#define SPECIES_NIDORAN_M 32 -#define SPECIES_NIDORINO 33 -#define SPECIES_NIDOKING 34 -#define SPECIES_CLEFAIRY 35 -#define SPECIES_CLEFABLE 36 -#define SPECIES_VULPIX 37 -#define SPECIES_NINETALES 38 -#define SPECIES_JIGGLYPUFF 39 -#define SPECIES_WIGGLYTUFF 40 -#define SPECIES_ZUBAT 41 -#define SPECIES_GOLBAT 42 -#define SPECIES_ODDISH 43 -#define SPECIES_GLOOM 44 -#define SPECIES_VILEPLUME 45 -#define SPECIES_PARAS 46 -#define SPECIES_PARASECT 47 -#define SPECIES_VENONAT 48 -#define SPECIES_VENOMOTH 49 -#define SPECIES_DIGLETT 50 -#define SPECIES_DUGTRIO 51 -#define SPECIES_MEOWTH 52 -#define SPECIES_PERSIAN 53 -#define SPECIES_PSYDUCK 54 -#define SPECIES_GOLDUCK 55 -#define SPECIES_MANKEY 56 -#define SPECIES_PRIMEAPE 57 -#define SPECIES_GROWLITHE 58 -#define SPECIES_ARCANINE 59 -#define SPECIES_POLIWAG 60 -#define SPECIES_POLIWHIRL 61 -#define SPECIES_POLIWRATH 62 -#define SPECIES_ABRA 63 -#define SPECIES_KADABRA 64 -#define SPECIES_ALAKAZAM 65 -#define SPECIES_MACHOP 66 -#define SPECIES_MACHOKE 67 -#define SPECIES_MACHAMP 68 -#define SPECIES_BELLSPROUT 69 -#define SPECIES_WEEPINBELL 70 -#define SPECIES_VICTREEBEL 71 -#define SPECIES_TENTACOOL 72 -#define SPECIES_TENTACRUEL 73 -#define SPECIES_GEODUDE 74 -#define SPECIES_GRAVELER 75 -#define SPECIES_GOLEM 76 -#define SPECIES_PONYTA 77 -#define SPECIES_RAPIDASH 78 -#define SPECIES_SLOWPOKE 79 -#define SPECIES_SLOWBRO 80 -#define SPECIES_MAGNEMITE 81 -#define SPECIES_MAGNETON 82 -#define SPECIES_FARFETCHD 83 -#define SPECIES_DODUO 84 -#define SPECIES_DODRIO 85 -#define SPECIES_SEEL 86 -#define SPECIES_DEWGONG 87 -#define SPECIES_GRIMER 88 -#define SPECIES_MUK 89 -#define SPECIES_SHELLDER 90 -#define SPECIES_CLOYSTER 91 -#define SPECIES_GASTLY 92 -#define SPECIES_HAUNTER 93 -#define SPECIES_GENGAR 94 -#define SPECIES_ONIX 95 -#define SPECIES_DROWZEE 96 -#define SPECIES_HYPNO 97 -#define SPECIES_KRABBY 98 -#define SPECIES_KINGLER 99 -#define SPECIES_VOLTORB 100 -#define SPECIES_ELECTRODE 101 -#define SPECIES_EXEGGCUTE 102 -#define SPECIES_EXEGGUTOR 103 -#define SPECIES_CUBONE 104 -#define SPECIES_MAROWAK 105 -#define SPECIES_HITMONLEE 106 -#define SPECIES_HITMONCHAN 107 -#define SPECIES_LICKITUNG 108 -#define SPECIES_KOFFING 109 -#define SPECIES_WEEZING 110 -#define SPECIES_RHYHORN 111 -#define SPECIES_RHYDON 112 -#define SPECIES_CHANSEY 113 -#define SPECIES_TANGELA 114 -#define SPECIES_KANGASKHAN 115 -#define SPECIES_HORSEA 116 -#define SPECIES_SEADRA 117 -#define SPECIES_GOLDEEN 118 -#define SPECIES_SEAKING 119 -#define SPECIES_STARYU 120 -#define SPECIES_STARMIE 121 -#define SPECIES_MR_MIME 122 -#define SPECIES_SCYTHER 123 -#define SPECIES_JYNX 124 -#define SPECIES_ELECTABUZZ 125 -#define SPECIES_MAGMAR 126 -#define SPECIES_PINSIR 127 -#define SPECIES_TAUROS 128 -#define SPECIES_MAGIKARP 129 -#define SPECIES_GYARADOS 130 -#define SPECIES_LAPRAS 131 -#define SPECIES_DITTO 132 -#define SPECIES_EEVEE 133 -#define SPECIES_VAPOREON 134 -#define SPECIES_JOLTEON 135 -#define SPECIES_FLAREON 136 -#define SPECIES_PORYGON 137 -#define SPECIES_OMANYTE 138 -#define SPECIES_OMASTAR 139 -#define SPECIES_KABUTO 140 -#define SPECIES_KABUTOPS 141 -#define SPECIES_AERODACTYL 142 -#define SPECIES_SNORLAX 143 -#define SPECIES_ARTICUNO 144 -#define SPECIES_ZAPDOS 145 -#define SPECIES_MOLTRES 146 -#define SPECIES_DRATINI 147 -#define SPECIES_DRAGONAIR 148 -#define SPECIES_DRAGONITE 149 -#define SPECIES_MEWTWO 150 -#define SPECIES_MEW 151 - -#define KANTO_DEX_COUNT SPECIES_MEW - -#define SPECIES_CHIKORITA 152 -#define SPECIES_BAYLEEF 153 -#define SPECIES_MEGANIUM 154 -#define SPECIES_CYNDAQUIL 155 -#define SPECIES_QUILAVA 156 -#define SPECIES_TYPHLOSION 157 -#define SPECIES_TOTODILE 158 -#define SPECIES_CROCONAW 159 -#define SPECIES_FERALIGATR 160 -#define SPECIES_SENTRET 161 -#define SPECIES_FURRET 162 -#define SPECIES_HOOTHOOT 163 -#define SPECIES_NOCTOWL 164 -#define SPECIES_LEDYBA 165 -#define SPECIES_LEDIAN 166 -#define SPECIES_SPINARAK 167 -#define SPECIES_ARIADOS 168 -#define SPECIES_CROBAT 169 -#define SPECIES_CHINCHOU 170 -#define SPECIES_LANTURN 171 -#define SPECIES_PICHU 172 -#define SPECIES_CLEFFA 173 -#define SPECIES_IGGLYBUFF 174 -#define SPECIES_TOGEPI 175 -#define SPECIES_TOGETIC 176 -#define SPECIES_NATU 177 -#define SPECIES_XATU 178 -#define SPECIES_MAREEP 179 -#define SPECIES_FLAAFFY 180 -#define SPECIES_AMPHAROS 181 -#define SPECIES_BELLOSSOM 182 -#define SPECIES_MARILL 183 -#define SPECIES_AZUMARILL 184 -#define SPECIES_SUDOWOODO 185 -#define SPECIES_POLITOED 186 -#define SPECIES_HOPPIP 187 -#define SPECIES_SKIPLOOM 188 -#define SPECIES_JUMPLUFF 189 -#define SPECIES_AIPOM 190 -#define SPECIES_SUNKERN 191 -#define SPECIES_SUNFLORA 192 -#define SPECIES_YANMA 193 -#define SPECIES_WOOPER 194 -#define SPECIES_QUAGSIRE 195 -#define SPECIES_ESPEON 196 -#define SPECIES_UMBREON 197 -#define SPECIES_MURKROW 198 -#define SPECIES_SLOWKING 199 -#define SPECIES_MISDREAVUS 200 -#define SPECIES_UNOWN 201 -#define SPECIES_WOBBUFFET 202 -#define SPECIES_GIRAFARIG 203 -#define SPECIES_PINECO 204 -#define SPECIES_FORRETRESS 205 -#define SPECIES_DUNSPARCE 206 -#define SPECIES_GLIGAR 207 -#define SPECIES_STEELIX 208 -#define SPECIES_SNUBBULL 209 -#define SPECIES_GRANBULL 210 -#define SPECIES_QWILFISH 211 -#define SPECIES_SCIZOR 212 -#define SPECIES_SHUCKLE 213 -#define SPECIES_HERACROSS 214 -#define SPECIES_SNEASEL 215 -#define SPECIES_TEDDIURSA 216 -#define SPECIES_URSARING 217 -#define SPECIES_SLUGMA 218 -#define SPECIES_MAGCARGO 219 -#define SPECIES_SWINUB 220 -#define SPECIES_PILOSWINE 221 -#define SPECIES_CORSOLA 222 -#define SPECIES_REMORAID 223 -#define SPECIES_OCTILLERY 224 -#define SPECIES_DELIBIRD 225 -#define SPECIES_MANTINE 226 -#define SPECIES_SKARMORY 227 -#define SPECIES_HOUNDOUR 228 -#define SPECIES_HOUNDOOM 229 -#define SPECIES_KINGDRA 230 -#define SPECIES_PHANPY 231 -#define SPECIES_DONPHAN 232 -#define SPECIES_PORYGON2 233 -#define SPECIES_STANTLER 234 -#define SPECIES_SMEARGLE 235 -#define SPECIES_TYROGUE 236 -#define SPECIES_HITMONTOP 237 -#define SPECIES_SMOOCHUM 238 -#define SPECIES_ELEKID 239 -#define SPECIES_MAGBY 240 -#define SPECIES_MILTANK 241 -#define SPECIES_BLISSEY 242 -#define SPECIES_RAIKOU 243 -#define SPECIES_ENTEI 244 -#define SPECIES_SUICUNE 245 -#define SPECIES_LARVITAR 246 -#define SPECIES_PUPITAR 247 -#define SPECIES_TYRANITAR 248 -#define SPECIES_LUGIA 249 -#define SPECIES_HO_OH 250 -#define SPECIES_CELEBI 251 - -#define JOHTO_DEX_COUNT (SPECIES_CELEBI - KANTO_DEX_COUNT) - -#define SPECIES_TREECKO 252 -#define SPECIES_GROVYLE 253 -#define SPECIES_SCEPTILE 254 -#define SPECIES_TORCHIC 255 -#define SPECIES_COMBUSKEN 256 -#define SPECIES_BLAZIKEN 257 -#define SPECIES_MUDKIP 258 -#define SPECIES_MARSHTOMP 259 -#define SPECIES_SWAMPERT 260 -#define SPECIES_POOCHYENA 261 -#define SPECIES_MIGHTYENA 262 -#define SPECIES_ZIGZAGOON 263 -#define SPECIES_LINOONE 264 -#define SPECIES_WURMPLE 265 -#define SPECIES_SILCOON 266 -#define SPECIES_BEAUTIFLY 267 -#define SPECIES_CASCOON 268 -#define SPECIES_DUSTOX 269 -#define SPECIES_LOTAD 270 -#define SPECIES_LOMBRE 271 -#define SPECIES_LUDICOLO 272 -#define SPECIES_SEEDOT 273 -#define SPECIES_NUZLEAF 274 -#define SPECIES_SHIFTRY 275 -#define SPECIES_TAILLOW 276 -#define SPECIES_SWELLOW 277 -#define SPECIES_WINGULL 278 -#define SPECIES_PELIPPER 279 -#define SPECIES_RALTS 280 -#define SPECIES_KIRLIA 281 -#define SPECIES_GARDEVOIR 282 -#define SPECIES_SURSKIT 283 -#define SPECIES_MASQUERAIN 284 -#define SPECIES_SHROOMISH 285 -#define SPECIES_BRELOOM 286 -#define SPECIES_SLAKOTH 287 -#define SPECIES_VIGOROTH 288 -#define SPECIES_SLAKING 289 -#define SPECIES_NINCADA 290 -#define SPECIES_NINJASK 291 -#define SPECIES_SHEDINJA 292 -#define SPECIES_WHISMUR 293 -#define SPECIES_LOUDRED 294 -#define SPECIES_EXPLOUD 295 -#define SPECIES_MAKUHITA 296 -#define SPECIES_HARIYAMA 297 -#define SPECIES_AZURILL 298 -#define SPECIES_NOSEPASS 299 -#define SPECIES_SKITTY 300 -#define SPECIES_DELCATTY 301 -#define SPECIES_SABLEYE 302 -#define SPECIES_MAWILE 303 -#define SPECIES_ARON 304 -#define SPECIES_LAIRON 305 -#define SPECIES_AGGRON 306 -#define SPECIES_MEDITITE 307 -#define SPECIES_MEDICHAM 308 -#define SPECIES_ELECTRIKE 309 -#define SPECIES_MANECTRIC 310 -#define SPECIES_PLUSLE 311 -#define SPECIES_MINUN 312 -#define SPECIES_VOLBEAT 313 -#define SPECIES_ILLUMISE 314 -#define SPECIES_ROSELIA 315 -#define SPECIES_GULPIN 316 -#define SPECIES_SWALOT 317 -#define SPECIES_CARVANHA 318 -#define SPECIES_SHARPEDO 319 -#define SPECIES_WAILMER 320 -#define SPECIES_WAILORD 321 -#define SPECIES_NUMEL 322 -#define SPECIES_CAMERUPT 323 -#define SPECIES_TORKOAL 324 -#define SPECIES_SPOINK 325 -#define SPECIES_GRUMPIG 326 -#define SPECIES_SPINDA 327 -#define SPECIES_TRAPINCH 328 -#define SPECIES_VIBRAVA 329 -#define SPECIES_FLYGON 330 -#define SPECIES_CACNEA 331 -#define SPECIES_CACTURNE 332 -#define SPECIES_SWABLU 333 -#define SPECIES_ALTARIA 334 -#define SPECIES_ZANGOOSE 335 -#define SPECIES_SEVIPER 336 -#define SPECIES_LUNATONE 337 -#define SPECIES_SOLROCK 338 -#define SPECIES_BARBOACH 339 -#define SPECIES_WHISCASH 340 -#define SPECIES_CORPHISH 341 -#define SPECIES_CRAWDAUNT 342 -#define SPECIES_BALTOY 343 -#define SPECIES_CLAYDOL 344 -#define SPECIES_LILEEP 345 -#define SPECIES_CRADILY 346 -#define SPECIES_ANORITH 347 -#define SPECIES_ARMALDO 348 -#define SPECIES_FEEBAS 349 -#define SPECIES_MILOTIC 350 -#define SPECIES_CASTFORM 351 -#define SPECIES_KECLEON 352 -#define SPECIES_SHUPPET 353 -#define SPECIES_BANETTE 354 -#define SPECIES_DUSKULL 355 -#define SPECIES_DUSCLOPS 356 -#define SPECIES_TROPIUS 357 -#define SPECIES_CHIMECHO 358 -#define SPECIES_ABSOL 359 -#define SPECIES_WYNAUT 360 -#define SPECIES_SNORUNT 361 -#define SPECIES_GLALIE 362 -#define SPECIES_SPHEAL 363 -#define SPECIES_SEALEO 364 -#define SPECIES_WALREIN 365 -#define SPECIES_CLAMPERL 366 -#define SPECIES_HUNTAIL 367 -#define SPECIES_GOREBYSS 368 -#define SPECIES_RELICANTH 369 -#define SPECIES_LUVDISC 370 -#define SPECIES_BAGON 371 -#define SPECIES_SHELGON 372 -#define SPECIES_SALAMENCE 373 -#define SPECIES_BELDUM 374 -#define SPECIES_METANG 375 -#define SPECIES_METAGROSS 376 -#define SPECIES_REGIROCK 377 -#define SPECIES_REGICE 378 -#define SPECIES_REGISTEEL 379 -#define SPECIES_LATIAS 380 -#define SPECIES_LATIOS 381 -#define SPECIES_KYOGRE 382 -#define SPECIES_GROUDON 383 -#define SPECIES_RAYQUAZA 384 -#define SPECIES_JIRACHI 385 -#define SPECIES_DEOXYS 386 - -#define HOENN_DEX_COUNT (SPECIES_DEOXYS - JOHTO_DEX_COUNT) - -#define SPECIES_TURTWIG 387 -#define SPECIES_GROTLE 388 -#define SPECIES_TORTERRA 389 -#define SPECIES_CHIMCHAR 390 -#define SPECIES_MONFERNO 391 -#define SPECIES_INFERNAPE 392 -#define SPECIES_PIPLUP 393 -#define SPECIES_PRINPLUP 394 -#define SPECIES_EMPOLEON 395 -#define SPECIES_STARLY 396 -#define SPECIES_STARAVIA 397 -#define SPECIES_STARAPTOR 398 -#define SPECIES_BIDOOF 399 -#define SPECIES_BIBAREL 400 -#define SPECIES_KRICKETOT 401 -#define SPECIES_KRICKETUNE 402 -#define SPECIES_SHINX 403 -#define SPECIES_LUXIO 404 -#define SPECIES_LUXRAY 405 -#define SPECIES_BUDEW 406 -#define SPECIES_ROSERADE 407 -#define SPECIES_CRANIDOS 408 -#define SPECIES_RAMPARDOS 409 -#define SPECIES_SHIELDON 410 -#define SPECIES_BASTIODON 411 -#define SPECIES_BURMY 412 -#define SPECIES_WORMADAM 413 -#define SPECIES_MOTHIM 414 -#define SPECIES_COMBEE 415 -#define SPECIES_VESPIQUEN 416 -#define SPECIES_PACHIRISU 417 -#define SPECIES_BUIZEL 418 -#define SPECIES_FLOATZEL 419 -#define SPECIES_CHERUBI 420 -#define SPECIES_CHERRIM 421 -#define SPECIES_SHELLOS 422 -#define SPECIES_GASTRODON 423 -#define SPECIES_AMBIPOM 424 -#define SPECIES_DRIFLOON 425 -#define SPECIES_DRIFBLIM 426 -#define SPECIES_BUNEARY 427 -#define SPECIES_LOPUNNY 428 -#define SPECIES_MISMAGIUS 429 -#define SPECIES_HONCHKROW 430 -#define SPECIES_GLAMEOW 431 -#define SPECIES_PURUGLY 432 -#define SPECIES_CHINGLING 433 -#define SPECIES_STUNKY 434 -#define SPECIES_SKUNTANK 435 -#define SPECIES_BRONZOR 436 -#define SPECIES_BRONZONG 437 -#define SPECIES_BONSLY 438 -#define SPECIES_MIME_JR 439 -#define SPECIES_HAPPINY 440 -#define SPECIES_CHATOT 441 -#define SPECIES_SPIRITOMB 442 -#define SPECIES_GIBLE 443 -#define SPECIES_GABITE 444 -#define SPECIES_GARCHOMP 445 -#define SPECIES_MUNCHLAX 446 -#define SPECIES_RIOLU 447 -#define SPECIES_LUCARIO 448 -#define SPECIES_HIPPOPOTAS 449 -#define SPECIES_HIPPOWDON 450 -#define SPECIES_SKORUPI 451 -#define SPECIES_DRAPION 452 -#define SPECIES_CROAGUNK 453 -#define SPECIES_TOXICROAK 454 -#define SPECIES_CARNIVINE 455 -#define SPECIES_FINNEON 456 -#define SPECIES_LUMINEON 457 -#define SPECIES_MANTYKE 458 -#define SPECIES_SNOVER 459 -#define SPECIES_ABOMASNOW 460 -#define SPECIES_WEAVILE 461 -#define SPECIES_MAGNEZONE 462 -#define SPECIES_LICKILICKY 463 -#define SPECIES_RHYPERIOR 464 -#define SPECIES_TANGROWTH 465 -#define SPECIES_ELECTIVIRE 466 -#define SPECIES_MAGMORTAR 467 -#define SPECIES_TOGEKISS 468 -#define SPECIES_YANMEGA 469 -#define SPECIES_LEAFEON 470 -#define SPECIES_GLACEON 471 -#define SPECIES_GLISCOR 472 -#define SPECIES_MAMOSWINE 473 -#define SPECIES_PORYGON_Z 474 -#define SPECIES_GALLADE 475 -#define SPECIES_PROBOPASS 476 -#define SPECIES_DUSKNOIR 477 -#define SPECIES_FROSLASS 478 -#define SPECIES_ROTOM 479 -#define SPECIES_UXIE 480 -#define SPECIES_MESPRIT 481 -#define SPECIES_AZELF 482 -#define SPECIES_DIALGA 483 -#define SPECIES_PALKIA 484 -#define SPECIES_HEATRAN 485 -#define SPECIES_REGIGIGAS 486 -#define SPECIES_GIRATINA 487 -#define SPECIES_CRESSELIA 488 -#define SPECIES_PHIONE 489 -#define SPECIES_MANAPHY 490 -#define SPECIES_DARKRAI 491 -#define SPECIES_SHAYMIN 492 -#define SPECIES_ARCEUS 493 - -#define SINNOH_DEX_COUNT (SPECIES_ARCEUS - HOENN_DEX_COUNT) -#define NATIONAL_DEX_COUNT SPECIES_ARCEUS - -#define SPECIES_EGG 494 -#define SPECIES_BAD_EGG 495 +#include "consts/generated/c/species.h" + +#define KANTO_DEX_COUNT (SPECIES_MEW - SPECIES_NONE) +#define JOHTO_DEX_COUNT (SPECIES_CELEBI - SPECIES_MEW) +#define HOENN_DEX_COUNT (SPECIES_DEOXYS - SPECIES_CELEBI) +#define SINNOH_DEX_COUNT (SPECIES_ARCEUS - SPECIES_DEOXYS) +#define NATIONAL_DEX_COUNT (KANTO_DEX_COUNT \ + + JOHTO_DEX_COUNT \ + + HOENN_DEX_COUNT \ + + SINNOH_DEX_COUNT) #define MAX_SPECIES SPECIES_BAD_EGG From b4d2a180773fb5616a86f6d3dd6f9da251be8eb1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 19:44:10 -0800 Subject: [PATCH 02/10] Use an env for json2bin to support constgen modules --- consts/meson.build | 14 ++++++++++++++ res/field/encounters/meson.build | 2 ++ res/pokemon/meson.build | 8 ++++++++ res/trainers/meson.build | 4 ++++ tools/json2bin/meson.build | 3 +++ 5 files changed, 31 insertions(+) diff --git a/consts/meson.build b/consts/meson.build index 7c964e6a95..f230bf7e5e 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -9,6 +9,7 @@ consts_manifests = files( gen_consts_root = meson.current_build_dir() / 'generated' gen_c_consts_root = gen_consts_root / 'c' gen_asm_consts_root = gen_consts_root / 'asm' +gen_py_consts_root = gen_consts_root / 'py' generated_consts_c = custom_target('generated_consts_c', build_by_default: true, @@ -35,3 +36,16 @@ generated_consts_asm = custom_target('generated_consts_asm', '-l', 'asm' ] ) + +generated_consts_py = custom_target('generated_consts_py', + build_by_default: true, + capture: true, + output: 'generated_consts_py', + input: consts_manifests, + command: [ + constgen_py, + '-f', '@INPUT@', + '-r', gen_py_consts_root, + '-l', 'py' + ] +) diff --git a/res/field/encounters/meson.build b/res/field/encounters/meson.build index a15f8a511a..c26393036b 100644 --- a/res/field/encounters/meson.build +++ b/res/field/encounters/meson.build @@ -187,6 +187,8 @@ pl_enc_data_srcs = files( pl_enc_tbl_narc = custom_target('pl_enc_data.narc', output: 'pl_enc_data.narc', input: pl_enc_data_srcs, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ encounters_py, '--knarc', knarc_exe, diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build index 32155ee4e5..8c96f68212 100644 --- a/res/pokemon/meson.build +++ b/res/pokemon/meson.build @@ -607,6 +607,8 @@ endforeach wotbl_narc = custom_target('wotbl.narc', output: 'wotbl.narc', input: personal_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ pokemon_wotbl_data_py, '--knarc', knarc_exe, @@ -619,6 +621,8 @@ wotbl_narc = custom_target('wotbl.narc', pl_personal_narc = custom_target('pl_personal.narc', output: 'pl_personal.narc', input: personal_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ pokemon_personal_data_py, '--knarc', knarc_exe, @@ -631,6 +635,8 @@ pl_personal_narc = custom_target('pl_personal.narc', evo_narc = custom_target('evo.narc', output: 'evo.narc', input: personal_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ evo_py, '--knarc', knarc_exe, @@ -706,6 +712,8 @@ height_narc = custom_target('height.narc', pl_poke_data_narc = custom_target('pl_poke_data.narc', output: 'pl_poke_data.narc', input: personal_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ pl_poke_data_py, '--knarc', knarc_exe, diff --git a/res/trainers/meson.build b/res/trainers/meson.build index 7c5c4c1096..4c8c3da43f 100644 --- a/res/trainers/meson.build +++ b/res/trainers/meson.build @@ -8,6 +8,8 @@ endforeach trdata_narc = custom_target('trdata.narc', output: 'trdata.narc', input: trainer_data_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ trainer_data_py, '--mode', 'data', @@ -21,6 +23,8 @@ trdata_narc = custom_target('trdata.narc', trpoke_narc = custom_target('trpoke.narc', output: 'trpoke.narc', input: trainer_data_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ trainer_data_py, '--mode', 'poke', diff --git a/tools/json2bin/meson.build b/tools/json2bin/meson.build index fa515fdaa0..5ad73b3b8d 100644 --- a/tools/json2bin/meson.build +++ b/tools/json2bin/meson.build @@ -1,3 +1,6 @@ +json2bin_env = environment() +json2bin_env.set('PYTHONPATH', meson.project_build_root()) # access to constants geneated by constgen + encounters_py = find_program('encounters.py', native: true) movedata_py = find_program('movedata.py', native: true) pokemon_personal_data_py = find_program('pokemon_personal_data.py', native: true) From 2021ba8eaaab84b1ec93d79c327c43aff1e6c491 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 19:50:54 -0800 Subject: [PATCH 03/10] Migrate encounters.py to constgen headers --- tools/json2bin/encounters.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/json2bin/encounters.py b/tools/json2bin/encounters.py index 9c2fe2707c..9dc33d78a6 100644 --- a/tools/json2bin/encounters.py +++ b/tools/json2bin/encounters.py @@ -1,12 +1,9 @@ #!/usr/bin/env python3 import pathlib - -from consts.pokemon import ( - species -) - import json2bin as j2b +from consts.generated.py import species + SCHEMA = j2b.Parser().register('land_rate', 4, j2b.parse_int) From 58fbb5c3aa3efe2d187c53f769c0b6c530d970f6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 20:51:30 -0800 Subject: [PATCH 04/10] Migrate evo.py to constgen headers --- tools/json2bin/evo.py | 75 ++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/tools/json2bin/evo.py b/tools/json2bin/evo.py index 59d8517385..88857e0d4f 100644 --- a/tools/json2bin/evo.py +++ b/tools/json2bin/evo.py @@ -1,63 +1,56 @@ #!/usr/bin/env python3 from collections.abc import Sequence import pathlib - - import json2bin as j2b - -from consts import ( - item, - moves -) - - -from consts.pokemon import ( - evo_methods, +from consts.generated.py import ( + items, + moves, + pokemon, species ) -def get_evo_params(method: evo_methods.EvoMethod, evo: Sequence): +def get_evo_params(method: pokemon.PokemonEvoMethod, evo: Sequence): maybe_param = evo[1] final_param = 0 #None of these take an extra parameter if method in set([ - evo_methods.EvoMethod.EVO_NONE, - evo_methods.EvoMethod.EVO_HAPPINESS, - evo_methods.EvoMethod.EVO_HAPPINESS_DAY, - evo_methods.EvoMethod.EVO_HAPPINESS_NIGHT, - evo_methods.EvoMethod.EVO_TRADE, - evo_methods.EvoMethod.EVO_ELECTRIC_FIELD, - evo_methods.EvoMethod.EVO_MOSSY_STONE, - evo_methods.EvoMethod.EVO_ICY_STONE]): + pokemon.PokemonEvoMethod.EVO_NONE, + pokemon.PokemonEvoMethod.EVO_HAPPINESS, + pokemon.PokemonEvoMethod.EVO_HAPPINESS_DAY, + pokemon.PokemonEvoMethod.EVO_HAPPINESS_NIGHT, + pokemon.PokemonEvoMethod.EVO_TRADE, + pokemon.PokemonEvoMethod.EVO_ELECTRIC_FIELD, + pokemon.PokemonEvoMethod.EVO_MOSSY_STONE, + pokemon.PokemonEvoMethod.EVO_ICY_STONE]): final_param = 0 # These all specify a basic integer param elif method in set([ - evo_methods.EvoMethod.EVO_LEVEL_UP, - evo_methods.EvoMethod.EVO_LEVEL_ATK_GT_DEF, - evo_methods.EvoMethod.EVO_LEVEL_ATK_EQ_DEF, - evo_methods.EvoMethod.EVO_LEVEL_ATK_LT_DEF, - evo_methods.EvoMethod.EVO_LEVEL_PID_LOW, - evo_methods.EvoMethod.EVO_LEVEL_PID_HIGH, - evo_methods.EvoMethod.EVO_LEVEL_NINJASK, - evo_methods.EvoMethod.EVO_LEVEL_SHEDINJA, - evo_methods.EvoMethod.EVO_LEVEL_MALE, - evo_methods.EvoMethod.EVO_LEVEL_FEMALE, - evo_methods.EvoMethod.EVO_BEAUTY]): + pokemon.PokemonEvoMethod.EVO_LEVEL_UP, + pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_GT_DEF, + pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_EQ_DEF, + pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_LT_DEF, + pokemon.PokemonEvoMethod.EVO_LEVEL_PID_LOW, + pokemon.PokemonEvoMethod.EVO_LEVEL_PID_HIGH, + pokemon.PokemonEvoMethod.EVO_LEVEL_NINJASK, + pokemon.PokemonEvoMethod.EVO_LEVEL_SHEDINJA, + pokemon.PokemonEvoMethod.EVO_LEVEL_MALE, + pokemon.PokemonEvoMethod.EVO_LEVEL_FEMALE, + pokemon.PokemonEvoMethod.EVO_BEAUTY]): final_param = maybe_param # These specify an item elif method in set([ - evo_methods.EvoMethod.EVO_TRADE_WITH_ITEM, - evo_methods.EvoMethod.EVO_USE_ITEM, - evo_methods.EvoMethod.EVO_USE_ITEM_MALE, - evo_methods.EvoMethod.EVO_USE_ITEM_FEMALE, - evo_methods.EvoMethod.EVO_USE_ITEM_DAY, - evo_methods.EvoMethod.EVO_USE_ITEM_NIGHT]): - final_param = item.Item[maybe_param].value - elif method == evo_methods.EvoMethod.EVO_KNOW_MOVE: + pokemon.PokemonEvoMethod.EVO_TRADE_WITH_ITEM, + pokemon.PokemonEvoMethod.EVO_USE_ITEM, + pokemon.PokemonEvoMethod.EVO_USE_ITEM_MALE, + pokemon.PokemonEvoMethod.EVO_USE_ITEM_FEMALE, + pokemon.PokemonEvoMethod.EVO_USE_ITEM_DAY, + pokemon.PokemonEvoMethod.EVO_USE_ITEM_NIGHT]): + final_param = items.Item[maybe_param].value + elif method == pokemon.PokemonEvoMethod.EVO_KNOW_MOVE: final_param = moves.Move[maybe_param].value - elif method == evo_methods.EvoMethod.EVO_MON_IN_PARTY: + elif method == pokemon.PokemonEvoMethod.EVO_MON_IN_PARTY: final_param = species.PokemonSpecies[maybe_param].value return final_param @@ -75,7 +68,7 @@ def parse_evolutions(table: Sequence, _size: int, _enum: None) -> bytes: out = bytearray([]) for j in range(min(len(table), 7)): evo = table[j] - method = evo_methods.EvoMethod[evo[0]] + method = pokemon.PokemonEvoMethod[evo[0]] params = get_evo_params(method, evo) target = species.PokemonSpecies[evo[-1]] out.extend(table_line(method.value, params, target.value)) From 3f630c978e180d0e37c8c2a410a8117f989bda14 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 20:52:17 -0800 Subject: [PATCH 05/10] Migrate pl_poke_data.py to constgen headers --- tools/json2bin/pl_poke_data.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/json2bin/pl_poke_data.py b/tools/json2bin/pl_poke_data.py index 969903fd91..d7d68c9dc2 100644 --- a/tools/json2bin/pl_poke_data.py +++ b/tools/json2bin/pl_poke_data.py @@ -1,9 +1,11 @@ #!/usr/bin/env python3 import pathlib - import json2bin as j2b -from consts.pokemon import species, shadow +from consts.generated.py import ( + species, + shadows +) def parse_frame(frame: dict) -> bytes: @@ -33,7 +35,7 @@ def parse_face(face: dict, _size: int, _consts: type = None) -> bytes: .register('back', 43, parse_face) \ .register('front.addl_y_offset', 1, j2b.parse_sint) \ .register('shadow.x_offset', 1, j2b.parse_sint) \ - .register('shadow.size', 1, j2b.parse_const, shadow.ShadowSize) + .register('shadow.size', 1, j2b.parse_const, shadows.PokemonBattleShadowSize) def indexer(file_path: pathlib.Path) -> int: From 71d2e0fa1b1dc3153ac710712c5ba983cd15036c Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 21:45:05 -0800 Subject: [PATCH 06/10] Migrate pokemon_personal_data.py to constgen headers --- res/pokemon/000/data.json | 8 ++-- res/pokemon/abomasnow/data.json | 8 ++-- res/pokemon/abra/data.json | 8 ++-- res/pokemon/absol/data.json | 8 ++-- res/pokemon/aerodactyl/data.json | 8 ++-- res/pokemon/aggron/data.json | 8 ++-- res/pokemon/aipom/data.json | 8 ++-- res/pokemon/alakazam/data.json | 8 ++-- res/pokemon/altaria/data.json | 8 ++-- res/pokemon/ambipom/data.json | 8 ++-- res/pokemon/ampharos/data.json | 8 ++-- res/pokemon/anorith/data.json | 8 ++-- res/pokemon/arbok/data.json | 8 ++-- res/pokemon/arcanine/data.json | 8 ++-- res/pokemon/arceus/data.json | 8 ++-- res/pokemon/ariados/data.json | 8 ++-- res/pokemon/armaldo/data.json | 8 ++-- res/pokemon/aron/data.json | 8 ++-- res/pokemon/articuno/data.json | 8 ++-- res/pokemon/azelf/data.json | 8 ++-- res/pokemon/azumarill/data.json | 8 ++-- res/pokemon/azurill/data.json | 8 ++-- res/pokemon/bad_egg/data.json | 8 ++-- res/pokemon/bagon/data.json | 8 ++-- res/pokemon/baltoy/data.json | 8 ++-- res/pokemon/banette/data.json | 8 ++-- res/pokemon/barboach/data.json | 8 ++-- res/pokemon/bastiodon/data.json | 8 ++-- res/pokemon/bayleef/data.json | 8 ++-- res/pokemon/beautifly/data.json | 8 ++-- res/pokemon/beedrill/data.json | 8 ++-- res/pokemon/beldum/data.json | 8 ++-- res/pokemon/bellossom/data.json | 8 ++-- res/pokemon/bellsprout/data.json | 8 ++-- res/pokemon/bibarel/data.json | 8 ++-- res/pokemon/bidoof/data.json | 8 ++-- res/pokemon/blastoise/data.json | 8 ++-- res/pokemon/blaziken/data.json | 8 ++-- res/pokemon/blissey/data.json | 8 ++-- res/pokemon/bonsly/data.json | 8 ++-- res/pokemon/breloom/data.json | 8 ++-- res/pokemon/bronzong/data.json | 8 ++-- res/pokemon/bronzor/data.json | 8 ++-- res/pokemon/budew/data.json | 8 ++-- res/pokemon/buizel/data.json | 8 ++-- res/pokemon/bulbasaur/data.json | 8 ++-- res/pokemon/buneary/data.json | 8 ++-- res/pokemon/burmy/data.json | 8 ++-- res/pokemon/butterfree/data.json | 8 ++-- res/pokemon/cacnea/data.json | 8 ++-- res/pokemon/cacturne/data.json | 8 ++-- res/pokemon/camerupt/data.json | 8 ++-- res/pokemon/carnivine/data.json | 8 ++-- res/pokemon/carvanha/data.json | 8 ++-- res/pokemon/cascoon/data.json | 8 ++-- res/pokemon/castform/data.json | 8 ++-- res/pokemon/caterpie/data.json | 8 ++-- res/pokemon/celebi/data.json | 8 ++-- res/pokemon/chansey/data.json | 8 ++-- res/pokemon/charizard/data.json | 8 ++-- res/pokemon/charmander/data.json | 8 ++-- res/pokemon/charmeleon/data.json | 8 ++-- res/pokemon/chatot/data.json | 8 ++-- res/pokemon/cherrim/data.json | 8 ++-- res/pokemon/cherubi/data.json | 8 ++-- res/pokemon/chikorita/data.json | 8 ++-- res/pokemon/chimchar/data.json | 8 ++-- res/pokemon/chimecho/data.json | 8 ++-- res/pokemon/chinchou/data.json | 8 ++-- res/pokemon/chingling/data.json | 8 ++-- res/pokemon/clamperl/data.json | 8 ++-- res/pokemon/claydol/data.json | 8 ++-- res/pokemon/clefable/data.json | 8 ++-- res/pokemon/clefairy/data.json | 8 ++-- res/pokemon/cleffa/data.json | 8 ++-- res/pokemon/cloyster/data.json | 8 ++-- res/pokemon/combee/data.json | 8 ++-- res/pokemon/combusken/data.json | 8 ++-- res/pokemon/corphish/data.json | 8 ++-- res/pokemon/corsola/data.json | 8 ++-- res/pokemon/cradily/data.json | 8 ++-- res/pokemon/cranidos/data.json | 8 ++-- res/pokemon/crawdaunt/data.json | 8 ++-- res/pokemon/cresselia/data.json | 8 ++-- res/pokemon/croagunk/data.json | 8 ++-- res/pokemon/crobat/data.json | 8 ++-- res/pokemon/croconaw/data.json | 8 ++-- res/pokemon/cubone/data.json | 8 ++-- res/pokemon/cyndaquil/data.json | 8 ++-- res/pokemon/darkrai/data.json | 8 ++-- res/pokemon/delcatty/data.json | 8 ++-- res/pokemon/delibird/data.json | 8 ++-- res/pokemon/deoxys/data.json | 8 ++-- res/pokemon/deoxys/forms/attack/data.json | 8 ++-- res/pokemon/deoxys/forms/defense/data.json | 8 ++-- res/pokemon/deoxys/forms/speed/data.json | 8 ++-- res/pokemon/dewgong/data.json | 8 ++-- res/pokemon/dialga/data.json | 8 ++-- res/pokemon/diglett/data.json | 8 ++-- res/pokemon/ditto/data.json | 8 ++-- res/pokemon/dodrio/data.json | 8 ++-- res/pokemon/doduo/data.json | 8 ++-- res/pokemon/donphan/data.json | 8 ++-- res/pokemon/dragonair/data.json | 8 ++-- res/pokemon/dragonite/data.json | 8 ++-- res/pokemon/drapion/data.json | 8 ++-- res/pokemon/dratini/data.json | 8 ++-- res/pokemon/drifblim/data.json | 8 ++-- res/pokemon/drifloon/data.json | 8 ++-- res/pokemon/drowzee/data.json | 8 ++-- res/pokemon/dugtrio/data.json | 8 ++-- res/pokemon/dunsparce/data.json | 8 ++-- res/pokemon/dusclops/data.json | 8 ++-- res/pokemon/dusknoir/data.json | 8 ++-- res/pokemon/duskull/data.json | 8 ++-- res/pokemon/dustox/data.json | 8 ++-- res/pokemon/eevee/data.json | 8 ++-- res/pokemon/egg/data.json | 8 ++-- res/pokemon/ekans/data.json | 8 ++-- res/pokemon/electabuzz/data.json | 8 ++-- res/pokemon/electivire/data.json | 8 ++-- res/pokemon/electrike/data.json | 8 ++-- res/pokemon/electrode/data.json | 8 ++-- res/pokemon/elekid/data.json | 8 ++-- res/pokemon/empoleon/data.json | 8 ++-- res/pokemon/entei/data.json | 8 ++-- res/pokemon/espeon/data.json | 8 ++-- res/pokemon/exeggcute/data.json | 8 ++-- res/pokemon/exeggutor/data.json | 8 ++-- res/pokemon/exploud/data.json | 8 ++-- res/pokemon/farfetchd/data.json | 8 ++-- res/pokemon/fearow/data.json | 8 ++-- res/pokemon/feebas/data.json | 8 ++-- res/pokemon/feraligatr/data.json | 8 ++-- res/pokemon/finneon/data.json | 8 ++-- res/pokemon/flaaffy/data.json | 8 ++-- res/pokemon/flareon/data.json | 8 ++-- res/pokemon/floatzel/data.json | 8 ++-- res/pokemon/flygon/data.json | 8 ++-- res/pokemon/forretress/data.json | 8 ++-- res/pokemon/froslass/data.json | 8 ++-- res/pokemon/furret/data.json | 8 ++-- res/pokemon/gabite/data.json | 8 ++-- res/pokemon/gallade/data.json | 8 ++-- res/pokemon/garchomp/data.json | 8 ++-- res/pokemon/gardevoir/data.json | 8 ++-- res/pokemon/gastly/data.json | 8 ++-- res/pokemon/gastrodon/data.json | 8 ++-- res/pokemon/gengar/data.json | 8 ++-- res/pokemon/geodude/data.json | 8 ++-- res/pokemon/gible/data.json | 8 ++-- res/pokemon/girafarig/data.json | 8 ++-- res/pokemon/giratina/data.json | 8 ++-- res/pokemon/giratina/forms/origin/data.json | 8 ++-- res/pokemon/glaceon/data.json | 8 ++-- res/pokemon/glalie/data.json | 8 ++-- res/pokemon/glameow/data.json | 8 ++-- res/pokemon/gligar/data.json | 8 ++-- res/pokemon/gliscor/data.json | 8 ++-- res/pokemon/gloom/data.json | 8 ++-- res/pokemon/golbat/data.json | 8 ++-- res/pokemon/goldeen/data.json | 8 ++-- res/pokemon/golduck/data.json | 8 ++-- res/pokemon/golem/data.json | 8 ++-- res/pokemon/gorebyss/data.json | 8 ++-- res/pokemon/granbull/data.json | 8 ++-- res/pokemon/graveler/data.json | 8 ++-- res/pokemon/grimer/data.json | 8 ++-- res/pokemon/grotle/data.json | 8 ++-- res/pokemon/groudon/data.json | 8 ++-- res/pokemon/grovyle/data.json | 8 ++-- res/pokemon/growlithe/data.json | 8 ++-- res/pokemon/grumpig/data.json | 8 ++-- res/pokemon/gulpin/data.json | 8 ++-- res/pokemon/gyarados/data.json | 8 ++-- res/pokemon/happiny/data.json | 8 ++-- res/pokemon/hariyama/data.json | 8 ++-- res/pokemon/haunter/data.json | 8 ++-- res/pokemon/heatran/data.json | 8 ++-- res/pokemon/heracross/data.json | 8 ++-- res/pokemon/hippopotas/data.json | 8 ++-- res/pokemon/hippowdon/data.json | 8 ++-- res/pokemon/hitmonchan/data.json | 8 ++-- res/pokemon/hitmonlee/data.json | 8 ++-- res/pokemon/hitmontop/data.json | 8 ++-- res/pokemon/ho_oh/data.json | 8 ++-- res/pokemon/honchkrow/data.json | 8 ++-- res/pokemon/hoothoot/data.json | 8 ++-- res/pokemon/hoppip/data.json | 8 ++-- res/pokemon/horsea/data.json | 8 ++-- res/pokemon/houndoom/data.json | 8 ++-- res/pokemon/houndour/data.json | 8 ++-- res/pokemon/huntail/data.json | 8 ++-- res/pokemon/hypno/data.json | 8 ++-- res/pokemon/igglybuff/data.json | 8 ++-- res/pokemon/illumise/data.json | 8 ++-- res/pokemon/infernape/data.json | 8 ++-- res/pokemon/ivysaur/data.json | 8 ++-- res/pokemon/jigglypuff/data.json | 8 ++-- res/pokemon/jirachi/data.json | 8 ++-- res/pokemon/jolteon/data.json | 8 ++-- res/pokemon/jumpluff/data.json | 8 ++-- res/pokemon/jynx/data.json | 8 ++-- res/pokemon/kabuto/data.json | 8 ++-- res/pokemon/kabutops/data.json | 8 ++-- res/pokemon/kadabra/data.json | 8 ++-- res/pokemon/kakuna/data.json | 8 ++-- res/pokemon/kangaskhan/data.json | 8 ++-- res/pokemon/kecleon/data.json | 8 ++-- res/pokemon/kingdra/data.json | 8 ++-- res/pokemon/kingler/data.json | 8 ++-- res/pokemon/kirlia/data.json | 8 ++-- res/pokemon/koffing/data.json | 8 ++-- res/pokemon/krabby/data.json | 8 ++-- res/pokemon/kricketot/data.json | 8 ++-- res/pokemon/kricketune/data.json | 8 ++-- res/pokemon/kyogre/data.json | 8 ++-- res/pokemon/lairon/data.json | 8 ++-- res/pokemon/lanturn/data.json | 8 ++-- res/pokemon/lapras/data.json | 8 ++-- res/pokemon/larvitar/data.json | 8 ++-- res/pokemon/latias/data.json | 8 ++-- res/pokemon/latios/data.json | 8 ++-- res/pokemon/leafeon/data.json | 8 ++-- res/pokemon/ledian/data.json | 8 ++-- res/pokemon/ledyba/data.json | 8 ++-- res/pokemon/lickilicky/data.json | 8 ++-- res/pokemon/lickitung/data.json | 8 ++-- res/pokemon/lileep/data.json | 8 ++-- res/pokemon/linoone/data.json | 8 ++-- res/pokemon/lombre/data.json | 8 ++-- res/pokemon/lopunny/data.json | 8 ++-- res/pokemon/lotad/data.json | 8 ++-- res/pokemon/loudred/data.json | 8 ++-- res/pokemon/lucario/data.json | 8 ++-- res/pokemon/ludicolo/data.json | 8 ++-- res/pokemon/lugia/data.json | 8 ++-- res/pokemon/lumineon/data.json | 8 ++-- res/pokemon/lunatone/data.json | 8 ++-- res/pokemon/luvdisc/data.json | 8 ++-- res/pokemon/luxio/data.json | 8 ++-- res/pokemon/luxray/data.json | 8 ++-- res/pokemon/machamp/data.json | 8 ++-- res/pokemon/machoke/data.json | 8 ++-- res/pokemon/machop/data.json | 8 ++-- res/pokemon/magby/data.json | 8 ++-- res/pokemon/magcargo/data.json | 8 ++-- res/pokemon/magikarp/data.json | 8 ++-- res/pokemon/magmar/data.json | 8 ++-- res/pokemon/magmortar/data.json | 8 ++-- res/pokemon/magnemite/data.json | 8 ++-- res/pokemon/magneton/data.json | 8 ++-- res/pokemon/magnezone/data.json | 8 ++-- res/pokemon/makuhita/data.json | 8 ++-- res/pokemon/mamoswine/data.json | 8 ++-- res/pokemon/manaphy/data.json | 8 ++-- res/pokemon/manectric/data.json | 8 ++-- res/pokemon/mankey/data.json | 8 ++-- res/pokemon/mantine/data.json | 8 ++-- res/pokemon/mantyke/data.json | 8 ++-- res/pokemon/mareep/data.json | 8 ++-- res/pokemon/marill/data.json | 8 ++-- res/pokemon/marowak/data.json | 8 ++-- res/pokemon/marshtomp/data.json | 8 ++-- res/pokemon/masquerain/data.json | 8 ++-- res/pokemon/mawile/data.json | 8 ++-- res/pokemon/medicham/data.json | 8 ++-- res/pokemon/meditite/data.json | 8 ++-- res/pokemon/meganium/data.json | 8 ++-- res/pokemon/meowth/data.json | 8 ++-- res/pokemon/meson.build | 2 + res/pokemon/mesprit/data.json | 8 ++-- res/pokemon/metagross/data.json | 8 ++-- res/pokemon/metang/data.json | 8 ++-- res/pokemon/metapod/data.json | 8 ++-- res/pokemon/mew/data.json | 8 ++-- res/pokemon/mewtwo/data.json | 8 ++-- res/pokemon/mightyena/data.json | 8 ++-- res/pokemon/milotic/data.json | 8 ++-- res/pokemon/miltank/data.json | 8 ++-- res/pokemon/mime_jr/data.json | 8 ++-- res/pokemon/minun/data.json | 8 ++-- res/pokemon/misdreavus/data.json | 8 ++-- res/pokemon/mismagius/data.json | 8 ++-- res/pokemon/moltres/data.json | 8 ++-- res/pokemon/monferno/data.json | 8 ++-- res/pokemon/mothim/data.json | 8 ++-- res/pokemon/mr_mime/data.json | 8 ++-- res/pokemon/mudkip/data.json | 8 ++-- res/pokemon/muk/data.json | 8 ++-- res/pokemon/munchlax/data.json | 8 ++-- res/pokemon/murkrow/data.json | 8 ++-- res/pokemon/natu/data.json | 8 ++-- res/pokemon/nidoking/data.json | 8 ++-- res/pokemon/nidoqueen/data.json | 8 ++-- res/pokemon/nidoran_f/data.json | 8 ++-- res/pokemon/nidoran_m/data.json | 8 ++-- res/pokemon/nidorina/data.json | 8 ++-- res/pokemon/nidorino/data.json | 8 ++-- res/pokemon/nincada/data.json | 8 ++-- res/pokemon/ninetales/data.json | 8 ++-- res/pokemon/ninjask/data.json | 8 ++-- res/pokemon/noctowl/data.json | 8 ++-- res/pokemon/nosepass/data.json | 8 ++-- res/pokemon/numel/data.json | 8 ++-- res/pokemon/nuzleaf/data.json | 8 ++-- res/pokemon/octillery/data.json | 8 ++-- res/pokemon/oddish/data.json | 8 ++-- res/pokemon/omanyte/data.json | 8 ++-- res/pokemon/omastar/data.json | 8 ++-- res/pokemon/onix/data.json | 8 ++-- res/pokemon/pachirisu/data.json | 8 ++-- res/pokemon/palkia/data.json | 8 ++-- res/pokemon/paras/data.json | 8 ++-- res/pokemon/parasect/data.json | 8 ++-- res/pokemon/pelipper/data.json | 8 ++-- res/pokemon/persian/data.json | 8 ++-- res/pokemon/phanpy/data.json | 8 ++-- res/pokemon/phione/data.json | 8 ++-- res/pokemon/pichu/data.json | 8 ++-- res/pokemon/pidgeot/data.json | 8 ++-- res/pokemon/pidgeotto/data.json | 8 ++-- res/pokemon/pidgey/data.json | 8 ++-- res/pokemon/pikachu/data.json | 8 ++-- res/pokemon/piloswine/data.json | 8 ++-- res/pokemon/pineco/data.json | 8 ++-- res/pokemon/pinsir/data.json | 8 ++-- res/pokemon/piplup/data.json | 8 ++-- res/pokemon/plusle/data.json | 8 ++-- res/pokemon/politoed/data.json | 8 ++-- res/pokemon/poliwag/data.json | 8 ++-- res/pokemon/poliwhirl/data.json | 8 ++-- res/pokemon/poliwrath/data.json | 8 ++-- res/pokemon/ponyta/data.json | 8 ++-- res/pokemon/poochyena/data.json | 8 ++-- res/pokemon/porygon/data.json | 8 ++-- res/pokemon/porygon2/data.json | 8 ++-- res/pokemon/porygon_z/data.json | 8 ++-- res/pokemon/primeape/data.json | 8 ++-- res/pokemon/prinplup/data.json | 8 ++-- res/pokemon/probopass/data.json | 8 ++-- res/pokemon/psyduck/data.json | 8 ++-- res/pokemon/pupitar/data.json | 8 ++-- res/pokemon/purugly/data.json | 8 ++-- res/pokemon/quagsire/data.json | 8 ++-- res/pokemon/quilava/data.json | 8 ++-- res/pokemon/qwilfish/data.json | 8 ++-- res/pokemon/raichu/data.json | 8 ++-- res/pokemon/raikou/data.json | 8 ++-- res/pokemon/ralts/data.json | 8 ++-- res/pokemon/rampardos/data.json | 8 ++-- res/pokemon/rapidash/data.json | 8 ++-- res/pokemon/raticate/data.json | 8 ++-- res/pokemon/rattata/data.json | 8 ++-- res/pokemon/rayquaza/data.json | 8 ++-- res/pokemon/regice/data.json | 8 ++-- res/pokemon/regigigas/data.json | 8 ++-- res/pokemon/regirock/data.json | 8 ++-- res/pokemon/registeel/data.json | 8 ++-- res/pokemon/relicanth/data.json | 8 ++-- res/pokemon/remoraid/data.json | 8 ++-- res/pokemon/rhydon/data.json | 8 ++-- res/pokemon/rhyhorn/data.json | 8 ++-- res/pokemon/rhyperior/data.json | 8 ++-- res/pokemon/riolu/data.json | 8 ++-- res/pokemon/roselia/data.json | 8 ++-- res/pokemon/roserade/data.json | 8 ++-- res/pokemon/rotom/data.json | 8 ++-- res/pokemon/rotom/forms/fan/data.json | 8 ++-- res/pokemon/rotom/forms/frost/data.json | 8 ++-- res/pokemon/rotom/forms/heat/data.json | 8 ++-- res/pokemon/rotom/forms/mow/data.json | 8 ++-- res/pokemon/rotom/forms/wash/data.json | 8 ++-- res/pokemon/sableye/data.json | 8 ++-- res/pokemon/salamence/data.json | 8 ++-- res/pokemon/sandshrew/data.json | 8 ++-- res/pokemon/sandslash/data.json | 8 ++-- res/pokemon/sceptile/data.json | 8 ++-- res/pokemon/scizor/data.json | 8 ++-- res/pokemon/scyther/data.json | 8 ++-- res/pokemon/seadra/data.json | 8 ++-- res/pokemon/seaking/data.json | 8 ++-- res/pokemon/sealeo/data.json | 8 ++-- res/pokemon/seedot/data.json | 8 ++-- res/pokemon/seel/data.json | 8 ++-- res/pokemon/sentret/data.json | 8 ++-- res/pokemon/seviper/data.json | 8 ++-- res/pokemon/sharpedo/data.json | 8 ++-- res/pokemon/shaymin/data.json | 8 ++-- res/pokemon/shaymin/forms/sky/data.json | 8 ++-- res/pokemon/shedinja/data.json | 8 ++-- res/pokemon/shelgon/data.json | 8 ++-- res/pokemon/shellder/data.json | 8 ++-- res/pokemon/shellos/data.json | 8 ++-- res/pokemon/shieldon/data.json | 8 ++-- res/pokemon/shiftry/data.json | 8 ++-- res/pokemon/shinx/data.json | 8 ++-- res/pokemon/shroomish/data.json | 8 ++-- res/pokemon/shuckle/data.json | 8 ++-- res/pokemon/shuppet/data.json | 8 ++-- res/pokemon/silcoon/data.json | 8 ++-- res/pokemon/skarmory/data.json | 8 ++-- res/pokemon/skiploom/data.json | 8 ++-- res/pokemon/skitty/data.json | 8 ++-- res/pokemon/skorupi/data.json | 8 ++-- res/pokemon/skuntank/data.json | 8 ++-- res/pokemon/slaking/data.json | 8 ++-- res/pokemon/slakoth/data.json | 8 ++-- res/pokemon/slowbro/data.json | 8 ++-- res/pokemon/slowking/data.json | 8 ++-- res/pokemon/slowpoke/data.json | 8 ++-- res/pokemon/slugma/data.json | 8 ++-- res/pokemon/smeargle/data.json | 8 ++-- res/pokemon/smoochum/data.json | 8 ++-- res/pokemon/sneasel/data.json | 8 ++-- res/pokemon/snorlax/data.json | 8 ++-- res/pokemon/snorunt/data.json | 8 ++-- res/pokemon/snover/data.json | 8 ++-- res/pokemon/snubbull/data.json | 8 ++-- res/pokemon/solrock/data.json | 8 ++-- res/pokemon/spearow/data.json | 8 ++-- res/pokemon/spheal/data.json | 8 ++-- res/pokemon/spinarak/data.json | 8 ++-- res/pokemon/spinda/data.json | 8 ++-- res/pokemon/spiritomb/data.json | 8 ++-- res/pokemon/spoink/data.json | 8 ++-- res/pokemon/squirtle/data.json | 8 ++-- res/pokemon/stantler/data.json | 8 ++-- res/pokemon/staraptor/data.json | 8 ++-- res/pokemon/staravia/data.json | 8 ++-- res/pokemon/starly/data.json | 8 ++-- res/pokemon/starmie/data.json | 8 ++-- res/pokemon/staryu/data.json | 8 ++-- res/pokemon/steelix/data.json | 8 ++-- res/pokemon/stunky/data.json | 8 ++-- res/pokemon/sudowoodo/data.json | 8 ++-- res/pokemon/suicune/data.json | 8 ++-- res/pokemon/sunflora/data.json | 8 ++-- res/pokemon/sunkern/data.json | 8 ++-- res/pokemon/surskit/data.json | 8 ++-- res/pokemon/swablu/data.json | 8 ++-- res/pokemon/swalot/data.json | 8 ++-- res/pokemon/swampert/data.json | 8 ++-- res/pokemon/swellow/data.json | 8 ++-- res/pokemon/swinub/data.json | 8 ++-- res/pokemon/taillow/data.json | 8 ++-- res/pokemon/tangela/data.json | 8 ++-- res/pokemon/tangrowth/data.json | 8 ++-- res/pokemon/tauros/data.json | 8 ++-- res/pokemon/teddiursa/data.json | 8 ++-- res/pokemon/tentacool/data.json | 8 ++-- res/pokemon/tentacruel/data.json | 8 ++-- res/pokemon/togekiss/data.json | 8 ++-- res/pokemon/togepi/data.json | 8 ++-- res/pokemon/togetic/data.json | 8 ++-- res/pokemon/torchic/data.json | 8 ++-- res/pokemon/torkoal/data.json | 8 ++-- res/pokemon/torterra/data.json | 8 ++-- res/pokemon/totodile/data.json | 8 ++-- res/pokemon/toxicroak/data.json | 8 ++-- res/pokemon/trapinch/data.json | 8 ++-- res/pokemon/treecko/data.json | 8 ++-- res/pokemon/tropius/data.json | 8 ++-- res/pokemon/turtwig/data.json | 8 ++-- res/pokemon/typhlosion/data.json | 8 ++-- res/pokemon/tyranitar/data.json | 8 ++-- res/pokemon/tyrogue/data.json | 8 ++-- res/pokemon/umbreon/data.json | 8 ++-- res/pokemon/unown/data.json | 8 ++-- res/pokemon/ursaring/data.json | 8 ++-- res/pokemon/uxie/data.json | 8 ++-- res/pokemon/vaporeon/data.json | 8 ++-- res/pokemon/venomoth/data.json | 8 ++-- res/pokemon/venonat/data.json | 8 ++-- res/pokemon/venusaur/data.json | 8 ++-- res/pokemon/vespiquen/data.json | 8 ++-- res/pokemon/vibrava/data.json | 8 ++-- res/pokemon/victreebel/data.json | 8 ++-- res/pokemon/vigoroth/data.json | 8 ++-- res/pokemon/vileplume/data.json | 8 ++-- res/pokemon/volbeat/data.json | 8 ++-- res/pokemon/voltorb/data.json | 8 ++-- res/pokemon/vulpix/data.json | 8 ++-- res/pokemon/wailmer/data.json | 8 ++-- res/pokemon/wailord/data.json | 8 ++-- res/pokemon/walrein/data.json | 8 ++-- res/pokemon/wartortle/data.json | 8 ++-- res/pokemon/weavile/data.json | 8 ++-- res/pokemon/weedle/data.json | 8 ++-- res/pokemon/weepinbell/data.json | 8 ++-- res/pokemon/weezing/data.json | 8 ++-- res/pokemon/whiscash/data.json | 8 ++-- res/pokemon/whismur/data.json | 8 ++-- res/pokemon/wigglytuff/data.json | 8 ++-- res/pokemon/wingull/data.json | 8 ++-- res/pokemon/wobbuffet/data.json | 8 ++-- res/pokemon/wooper/data.json | 8 ++-- res/pokemon/wormadam/data.json | 8 ++-- res/pokemon/wormadam/forms/sandy/data.json | 8 ++-- res/pokemon/wormadam/forms/trash/data.json | 8 ++-- res/pokemon/wurmple/data.json | 8 ++-- res/pokemon/wynaut/data.json | 8 ++-- res/pokemon/xatu/data.json | 8 ++-- res/pokemon/yanma/data.json | 8 ++-- res/pokemon/yanmega/data.json | 8 ++-- res/pokemon/zangoose/data.json | 8 ++-- res/pokemon/zapdos/data.json | 8 ++-- res/pokemon/zigzagoon/data.json | 8 ++-- res/pokemon/zubat/data.json | 8 ++-- tools/json2bin/pokemon_personal_data.py | 43 +++++++++------------ tools/scripts/make_height.py | 9 ++++- 511 files changed, 2059 insertions(+), 2059 deletions(-) diff --git a/res/pokemon/000/data.json b/res/pokemon/000/data.json index 36d4b8e50a..c232d6015f 100644 --- a/res/pokemon/000/data.json +++ b/res/pokemon/000/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 0, "base_friendship": 0, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "NONE", - "NONE" + "EGG_GROUP_NONE", + "EGG_GROUP_NONE" ], "abilities": [ "ABILITY_NONE", diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index d38b347c95..9927cd72fd 100644 --- a/res/pokemon/abomasnow/data.json +++ b/res/pokemon/abomasnow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NEVERMELTICE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SNOW_WARNING", diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index 8836f183ec..4f7f449a40 100644 --- a/res/pokemon/abra/data.json +++ b/res/pokemon/abra/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_TWISTEDSPOON" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/absol/data.json b/res/pokemon/absol/data.json index 71eee1d8d5..1f51cde0ab 100644 --- a/res/pokemon/absol/data.json +++ b/res/pokemon/absol/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/aerodactyl/data.json b/res/pokemon/aerodactyl/data.json index e2015317a7..6b0b71a597 100644 --- a/res/pokemon/aerodactyl/data.json +++ b/res/pokemon/aerodactyl/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/aggron/data.json b/res/pokemon/aggron/data.json index ae53d6d66a..da94379085 100644 --- a/res/pokemon/aggron/data.json +++ b/res/pokemon/aggron/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index e60e819345..b78fd03878 100644 --- a/res/pokemon/aipom/data.json +++ b/res/pokemon/aipom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/alakazam/data.json b/res/pokemon/alakazam/data.json index 6d9c35f9cb..28e7e2afc7 100644 --- a/res/pokemon/alakazam/data.json +++ b/res/pokemon/alakazam/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_TWISTEDSPOON" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/altaria/data.json b/res/pokemon/altaria/data.json index 425b578c15..64f3be9c66 100644 --- a/res/pokemon/altaria/data.json +++ b/res/pokemon/altaria/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "FLYING", - "DRAGON" + "EGG_GROUP_FLYING", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/ambipom/data.json b/res/pokemon/ambipom/data.json index 9f68cdee11..6a09a37fb1 100644 --- a/res/pokemon/ambipom/data.json +++ b/res/pokemon/ambipom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 100, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TECHNICIAN", diff --git a/res/pokemon/ampharos/data.json b/res/pokemon/ampharos/data.json index b2955683a8..c9510bde8f 100644 --- a/res/pokemon/ampharos/data.json +++ b/res/pokemon/ampharos/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index 88c8c9ac93..23fc93705d 100644 --- a/res/pokemon/anorith/data.json +++ b/res/pokemon/anorith/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", diff --git a/res/pokemon/arbok/data.json b/res/pokemon/arbok/data.json index 2b7775da5c..6fb58dc654 100644 --- a/res/pokemon/arbok/data.json +++ b/res/pokemon/arbok/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "DRAGON" + "EGG_GROUP_FIELD", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/arcanine/data.json b/res/pokemon/arcanine/data.json index 45f8f6207a..7ee0583e2e 100644 --- a/res/pokemon/arcanine/data.json +++ b/res/pokemon/arcanine/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/arceus/data.json b/res/pokemon/arceus/data.json index 4dd196e367..30aa3c6e0d 100644 --- a/res/pokemon/arceus/data.json +++ b/res/pokemon/arceus/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_MULTITYPE", diff --git a/res/pokemon/ariados/data.json b/res/pokemon/ariados/data.json index f62090b81a..7605b882f1 100644 --- a/res/pokemon/ariados/data.json +++ b/res/pokemon/ariados/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/armaldo/data.json b/res/pokemon/armaldo/data.json index 7521b8cf15..88b7025a1a 100644 --- a/res/pokemon/armaldo/data.json +++ b/res/pokemon/armaldo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index f4bc725319..963f0dc88e 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/articuno/data.json b/res/pokemon/articuno/data.json index 0c2de923ba..93e085c2e2 100644 --- a/res/pokemon/articuno/data.json +++ b/res/pokemon/articuno/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/azelf/data.json b/res/pokemon/azelf/data.json index 7331ec71aa..4ed353bd9f 100644 --- a/res/pokemon/azelf/data.json +++ b/res/pokemon/azelf/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 140, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/azumarill/data.json b/res/pokemon/azumarill/data.json index f993c74aca..10d656a300 100644 --- a/res/pokemon/azumarill/data.json +++ b/res/pokemon/azumarill/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "WATER_1", - "FAIRY" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index dc646ec3bf..b1742d38c8 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/bad_egg/data.json b/res/pokemon/bad_egg/data.json index 1594c73a70..50f5db6ca3 100644 --- a/res/pokemon/bad_egg/data.json +++ b/res/pokemon/bad_egg/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NONE", diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index 91312efe58..82d4da2027 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_FANG" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "DRAGON", - "DRAGON" + "EGG_GROUP_DRAGON", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index 3aa65d4a84..8776512bdc 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/banette/data.json b/res/pokemon/banette/data.json index ab8a15c6dc..2e29d0bf6f 100644 --- a/res/pokemon/banette/data.json +++ b/res/pokemon/banette/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SPELL_TAG" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index 31e1d59f13..5486bcc3e1 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/bastiodon/data.json b/res/pokemon/bastiodon/data.json index 39cd282ef7..9352eb289e 100644 --- a/res/pokemon/bastiodon/data.json +++ b/res/pokemon/bastiodon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index b351599d2a..1289c65bb4 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/beautifly/data.json b/res/pokemon/beautifly/data.json index 758a9a74b3..b9f191f608 100644 --- a/res/pokemon/beautifly/data.json +++ b/res/pokemon/beautifly/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHED_SHELL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/beedrill/data.json b/res/pokemon/beedrill/data.json index f4fd382ef5..6f05633945 100644 --- a/res/pokemon/beedrill/data.json +++ b/res/pokemon/beedrill/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index 344fb44966..e43cfc7705 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/bellossom/data.json b/res/pokemon/bellossom/data.json index 644e88d404..32197ddfd1 100644 --- a/res/pokemon/bellossom/data.json +++ b/res/pokemon/bellossom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index 982198a7db..d58e27d3fc 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/bibarel/data.json b/res/pokemon/bibarel/data.json index 31abafadb1..5ee3f0decb 100644 --- a/res/pokemon/bibarel/data.json +++ b/res/pokemon/bibarel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ORAN_BERRY", "rare": "ITEM_SITRUS_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SIMPLE", diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index 1baff21c06..985f96aa1b 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SIMPLE", diff --git a/res/pokemon/blastoise/data.json b/res/pokemon/blastoise/data.json index 582a990dc8..af946d2bf5 100644 --- a/res/pokemon/blastoise/data.json +++ b/res/pokemon/blastoise/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/blaziken/data.json b/res/pokemon/blaziken/data.json index ccd9049ecd..9ae7f7e73d 100644 --- a/res/pokemon/blaziken/data.json +++ b/res/pokemon/blaziken/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/blissey/data.json b/res/pokemon/blissey/data.json index 0b08a61754..2ba732a46c 100644 --- a/res/pokemon/blissey/data.json +++ b/res/pokemon/blissey/data.json @@ -26,13 +26,13 @@ "common": "ITEM_OVAL_STONE", "rare": "ITEM_LUCKY_EGG" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 40, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index 774e13387b..7e9cd98aeb 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/breloom/data.json b/res/pokemon/breloom/data.json index 4cf40aecaa..8b4502802c 100644 --- a/res/pokemon/breloom/data.json +++ b/res/pokemon/breloom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KEBIA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", diff --git a/res/pokemon/bronzong/data.json b/res/pokemon/bronzong/data.json index ab2c40b8f5..4bb093660e 100644 --- a/res/pokemon/bronzong/data.json +++ b/res/pokemon/bronzong/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index 4d60689b37..7a2f1bb47b 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index 2a28959012..0c608d3b24 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index bc3f5ed45a..4b1147cb75 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_WACAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index b1218d2c86..0ff559ce91 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index 778dc33b39..28381b1d1f 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHOPLE_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 0, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json index e53d111215..5335ff7f8f 100644 --- a/res/pokemon/burmy/data.json +++ b/res/pokemon/burmy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/butterfree/data.json b/res/pokemon/butterfree/data.json index 5cc2018179..095351b224 100644 --- a/res/pokemon/butterfree/data.json +++ b/res/pokemon/butterfree/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index 11894b5d07..a42cf2c3ce 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_STICKY_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "HUMAN_LIKE" + "EGG_GROUP_GRASS", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/cacturne/data.json b/res/pokemon/cacturne/data.json index 1f7b1a6dda..fc51fd78eb 100644 --- a/res/pokemon/cacturne/data.json +++ b/res/pokemon/cacturne/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_STICKY_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "HUMAN_LIKE" + "EGG_GROUP_GRASS", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/camerupt/data.json b/res/pokemon/camerupt/data.json index 74d2c0cc0d..397834165a 100644 --- a/res/pokemon/camerupt/data.json +++ b/res/pokemon/camerupt/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_MAGMA_ARMOR", diff --git a/res/pokemon/carnivine/data.json b/res/pokemon/carnivine/data.json index eaf0b67abb..e14f559f5a 100644 --- a/res/pokemon/carnivine/data.json +++ b/res/pokemon/carnivine/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index 7c99cc3a65..af45d6217d 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEATOOTH" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_ROUGH_SKIN", diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index 5fcf5664a2..248a5478d3 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/castform/data.json b/res/pokemon/castform/data.json index 5140360ac9..8b66b021f1 100644 --- a/res/pokemon/castform/data.json +++ b/res/pokemon/castform/data.json @@ -26,13 +26,13 @@ "common": "ITEM_MYSTIC_WATER", "rare": "ITEM_MYSTIC_WATER" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "AMORPHOUS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_FORECAST", diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index 079347d5ad..4cc264d32a 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", diff --git a/res/pokemon/celebi/data.json b/res/pokemon/celebi/data.json index 46d1bb5c4e..86decced1b 100644 --- a/res/pokemon/celebi/data.json +++ b/res/pokemon/celebi/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LUM_BERRY", "rare": "ITEM_LUM_BERRY" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 4ac3612bc6..0957833e3f 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -26,13 +26,13 @@ "common": "ITEM_OVAL_STONE", "rare": "ITEM_LUCKY_EGG" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 40, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/charizard/data.json b/res/pokemon/charizard/data.json index cf1f93723c..9d36172fc1 100644 --- a/res/pokemon/charizard/data.json +++ b/res/pokemon/charizard/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index 0b6bb7433f..71570192f8 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index 387acf61f7..f35b5ca015 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/chatot/data.json b/res/pokemon/chatot/data.json index d6781daf5a..682179e095 100644 --- a/res/pokemon/chatot/data.json +++ b/res/pokemon/chatot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METRONOME" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/cherrim/data.json b/res/pokemon/cherrim/data.json index 2d4afb7670..6938a27415 100644 --- a/res/pokemon/cherrim/data.json +++ b/res/pokemon/cherrim/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MIRACLE_SEED" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_FLOWER_GIFT", diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index 4be3456876..da294822d7 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MIRACLE_SEED" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index 89bfcbf644..c999f5b295 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index f1c07c40a9..8d6a6531c8 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/chimecho/data.json b/res/pokemon/chimecho/data.json index e4187e3844..3b547cee82 100644 --- a/res/pokemon/chimecho/data.json +++ b/res/pokemon/chimecho/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_COLBUR_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index bca6489225..f26ad10a60 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEASCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_VOLT_ABSORB", diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index 9a7df1bf8a..abeb6cac69 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_COLBUR_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index d43d0816f9..7c2f5fd868 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BIG_PEARL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SHELL_ARMOR", diff --git a/res/pokemon/claydol/data.json b/res/pokemon/claydol/data.json index 357ba28067..19c0154450 100644 --- a/res/pokemon/claydol/data.json +++ b/res/pokemon/claydol/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/clefable/data.json b/res/pokemon/clefable/data.json index 37157135ed..712e261d22 100644 --- a/res/pokemon/clefable/data.json +++ b/res/pokemon/clefable/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LEPPA_BERRY", "rare": "ITEM_MOON_STONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json index 62de1cadf7..4281cb2e88 100644 --- a/res/pokemon/clefairy/data.json +++ b/res/pokemon/clefairy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LEPPA_BERRY", "rare": "ITEM_MOON_STONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index c346d28512..602bc05de0 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LEPPA_BERRY", "rare": "ITEM_MOON_STONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/cloyster/data.json b/res/pokemon/cloyster/data.json index 30d5731a55..4af2f17809 100644 --- a/res/pokemon/cloyster/data.json +++ b/res/pokemon/cloyster/data.json @@ -26,13 +26,13 @@ "common": "ITEM_PEARL", "rare": "ITEM_BIG_PEARL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SHELL_ARMOR", diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json index 981ea2dcf5..cac9f1239c 100644 --- a/res/pokemon/combee/data.json +++ b/res/pokemon/combee/data.json @@ -26,13 +26,13 @@ "common": "ITEM_HONEY", "rare": "ITEM_HONEY" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HONEY_GATHER", diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index d78b86071d..a52ab287af 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index da64477bbf..d70dbc3638 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/corsola/data.json b/res/pokemon/corsola/data.json index 6691fac741..bb28fb6440 100644 --- a/res/pokemon/corsola/data.json +++ b/res/pokemon/corsola/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HUSTLE", diff --git a/res/pokemon/cradily/data.json b/res/pokemon/cradily/data.json index d1115ecac5..99cc3af250 100644 --- a/res/pokemon/cradily/data.json +++ b/res/pokemon/cradily/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BIG_ROOT" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SUCTION_CUPS", diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index 714a7eb482..6c151c8ad1 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_MOLD_BREAKER", diff --git a/res/pokemon/crawdaunt/data.json b/res/pokemon/crawdaunt/data.json index 37f1d11ac8..79bb318335 100644 --- a/res/pokemon/crawdaunt/data.json +++ b/res/pokemon/crawdaunt/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/cresselia/data.json b/res/pokemon/cresselia/data.json index 75288a83a7..3168db2906 100644 --- a/res/pokemon/cresselia/data.json +++ b/res/pokemon/cresselia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index 97f5179e62..6021946186 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BLACK_SLUDGE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 100, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ANTICIPATION", diff --git a/res/pokemon/crobat/data.json b/res/pokemon/crobat/data.json index 0d75f49f99..bbf28ac446 100644 --- a/res/pokemon/crobat/data.json +++ b/res/pokemon/crobat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index c8c9107ab9..c8e2ccad96 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index 56bf952e0a..9b32b2b60f 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_THICK_CLUB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index 8531aa8088..509e65c6ab 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/darkrai/data.json b/res/pokemon/darkrai/data.json index 91c733d0d3..be19803a0d 100644 --- a/res/pokemon/darkrai/data.json +++ b/res/pokemon/darkrai/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_BAD_DREAMS", diff --git a/res/pokemon/delcatty/data.json b/res/pokemon/delcatty/data.json index 1ddcd4d94e..ef30e23933 100644 --- a/res/pokemon/delcatty/data.json +++ b/res/pokemon/delcatty/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LEPPA_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/delibird/data.json b/res/pokemon/delibird/data.json index 7d26ae2d96..494d0f2959 100644 --- a/res/pokemon/delibird/data.json +++ b/res/pokemon/delibird/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", diff --git a/res/pokemon/deoxys/data.json b/res/pokemon/deoxys/data.json index 04213f4c13..d0c05bf458 100644 --- a/res/pokemon/deoxys/data.json +++ b/res/pokemon/deoxys/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/deoxys/forms/attack/data.json b/res/pokemon/deoxys/forms/attack/data.json index e884fc4083..966a83623b 100644 --- a/res/pokemon/deoxys/forms/attack/data.json +++ b/res/pokemon/deoxys/forms/attack/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/deoxys/forms/defense/data.json b/res/pokemon/deoxys/forms/defense/data.json index 5d979e1a54..af2f24633a 100644 --- a/res/pokemon/deoxys/forms/defense/data.json +++ b/res/pokemon/deoxys/forms/defense/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/deoxys/forms/speed/data.json b/res/pokemon/deoxys/forms/speed/data.json index 9c0c0c5283..47d51c2af0 100644 --- a/res/pokemon/deoxys/forms/speed/data.json +++ b/res/pokemon/deoxys/forms/speed/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/dewgong/data.json b/res/pokemon/dewgong/data.json index 5a8a823636..0f127b3a2f 100644 --- a/res/pokemon/dewgong/data.json +++ b/res/pokemon/dewgong/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/dialga/data.json b/res/pokemon/dialga/data.json index e9a0a31000..9deab8b04f 100644 --- a/res/pokemon/dialga/data.json +++ b/res/pokemon/dialga/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index f25d5385c4..2c53db8192 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SOFT_SAND" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/ditto/data.json b/res/pokemon/ditto/data.json index ee461ede85..60f75b1867 100644 --- a/res/pokemon/ditto/data.json +++ b/res/pokemon/ditto/data.json @@ -26,13 +26,13 @@ "common": "ITEM_QUICK_POWDER", "rare": "ITEM_METAL_POWDER" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "DITTO", - "DITTO" + "EGG_GROUP_DITTO", + "EGG_GROUP_DITTO" ], "abilities": [ "ABILITY_LIMBER", diff --git a/res/pokemon/dodrio/data.json b/res/pokemon/dodrio/data.json index 0161b578bd..08d634b830 100644 --- a/res/pokemon/dodrio/data.json +++ b/res/pokemon/dodrio/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHARP_BEAK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index e55d6aa279..98a3af17b1 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHARP_BEAK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/donphan/data.json b/res/pokemon/donphan/data.json index 1be4ca6e56..9a91ddc9aa 100644 --- a/res/pokemon/donphan/data.json +++ b/res/pokemon/donphan/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PASSHO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index 276056da43..da26a54b94 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/dragonite/data.json b/res/pokemon/dragonite/data.json index 46ced2fd5c..3f596813ed 100644 --- a/res/pokemon/dragonite/data.json +++ b/res/pokemon/dragonite/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/drapion/data.json b/res/pokemon/drapion/data.json index c698191b01..2d9112860c 100644 --- a/res/pokemon/drapion/data.json +++ b/res/pokemon/drapion/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "BUG", - "WATER_3" + "EGG_GROUP_BUG", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index 4816bef7e9..bb5d40e48c 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/drifblim/data.json b/res/pokemon/drifblim/data.json index c96b5f64ea..4fd7ebde1d 100644 --- a/res/pokemon/drifblim/data.json +++ b/res/pokemon/drifblim/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_AFTERMATH", diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 619005e504..194329f443 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_AFTERMATH", diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index d172e03825..34b6857d6d 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/dugtrio/data.json b/res/pokemon/dugtrio/data.json index 9db713dee0..760a0ea2c4 100644 --- a/res/pokemon/dugtrio/data.json +++ b/res/pokemon/dugtrio/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SOFT_SAND" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/dunsparce/data.json b/res/pokemon/dunsparce/data.json index cedc8a1ae1..1f27d25886 100644 --- a/res/pokemon/dunsparce/data.json +++ b/res/pokemon/dunsparce/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SERENE_GRACE", diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index d58212f36a..66ef87a0c3 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KASIB_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/dusknoir/data.json b/res/pokemon/dusknoir/data.json index f9e9ad1d0b..49bf69c23f 100644 --- a/res/pokemon/dusknoir/data.json +++ b/res/pokemon/dusknoir/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KASIB_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index 612da273e8..c41607ff60 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KASIB_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/dustox/data.json b/res/pokemon/dustox/data.json index d6ee0dbde7..2937b7ffad 100644 --- a/res/pokemon/dustox/data.json +++ b/res/pokemon/dustox/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHED_SHELL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index e4a0ce5943..1aa00a8b45 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/egg/data.json b/res/pokemon/egg/data.json index 13790a137e..76a6bcf139 100644 --- a/res/pokemon/egg/data.json +++ b/res/pokemon/egg/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NONE", diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index 486c62ee5d..c342883411 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "DRAGON" + "EGG_GROUP_FIELD", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index da2de30e55..e05b8cc5dd 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ELECTIRIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/electivire/data.json b/res/pokemon/electivire/data.json index c8c338694c..4e56a5166e 100644 --- a/res/pokemon/electivire/data.json +++ b/res/pokemon/electivire/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ELECTIRIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_MOTOR_DRIVE", diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index e626bc3fd2..cabe32d21d 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/electrode/data.json b/res/pokemon/electrode/data.json index e51dea2dc8..90e5cce19c 100644 --- a/res/pokemon/electrode/data.json +++ b/res/pokemon/electrode/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index 2396e79d5c..0f0276d9cf 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ELECTIRIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/empoleon/data.json b/res/pokemon/empoleon/data.json index 7fd464eaa5..1ef5ca3923 100644 --- a/res/pokemon/empoleon/data.json +++ b/res/pokemon/empoleon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/entei/data.json b/res/pokemon/entei/data.json index e895d8ebf2..b2f05a9fa4 100644 --- a/res/pokemon/entei/data.json +++ b/res/pokemon/entei/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/espeon/data.json b/res/pokemon/espeon/data.json index 7405c048bf..0181b9f691 100644 --- a/res/pokemon/espeon/data.json +++ b/res/pokemon/espeon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/exeggcute/data.json b/res/pokemon/exeggcute/data.json index 2c5c6d4b72..3846a343c4 100644 --- a/res/pokemon/exeggcute/data.json +++ b/res/pokemon/exeggcute/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 27ca7bc317..f7709922d5 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/exploud/data.json b/res/pokemon/exploud/data.json index 981fc59bcc..f525b6f422 100644 --- a/res/pokemon/exploud/data.json +++ b/res/pokemon/exploud/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHESTO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/farfetchd/data.json b/res/pokemon/farfetchd/data.json index 4e809026ee..5ba4b12198 100644 --- a/res/pokemon/farfetchd/data.json +++ b/res/pokemon/farfetchd/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_STICK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FIELD" + "EGG_GROUP_FLYING", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/fearow/data.json b/res/pokemon/fearow/data.json index 10b6905e67..0337cc3d37 100644 --- a/res/pokemon/fearow/data.json +++ b/res/pokemon/fearow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHARP_BEAK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index 14c63b1111..643c89b875 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/feraligatr/data.json b/res/pokemon/feraligatr/data.json index 64affec134..8e65445158 100644 --- a/res/pokemon/feraligatr/data.json +++ b/res/pokemon/feraligatr/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index d3d32b3bab..d40e0a8a67 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_RINDO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index 2f5870ac24..8ccce4b11a 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/flareon/data.json b/res/pokemon/flareon/data.json index 1efe918175..55ae0872d9 100644 --- a/res/pokemon/flareon/data.json +++ b/res/pokemon/flareon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", diff --git a/res/pokemon/floatzel/data.json b/res/pokemon/floatzel/data.json index fab541efd8..63b8bbf82b 100644 --- a/res/pokemon/floatzel/data.json +++ b/res/pokemon/floatzel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_WACAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index ac8171cb03..72afaf6fdd 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/forretress/data.json b/res/pokemon/forretress/data.json index c041c3cf72..862c3d92f7 100644 --- a/res/pokemon/forretress/data.json +++ b/res/pokemon/forretress/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/froslass/data.json b/res/pokemon/froslass/data.json index 0807d29ac7..645c04ea48 100644 --- a/res/pokemon/froslass/data.json +++ b/res/pokemon/froslass/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BABIRI_BERRY" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "MINERAL" + "EGG_GROUP_FAIRY", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SNOW_CLOAK", diff --git a/res/pokemon/furret/data.json b/res/pokemon/furret/data.json index f836b10df1..067278df7a 100644 --- a/res/pokemon/furret/data.json +++ b/res/pokemon/furret/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ORAN_BERRY", "rare": "ITEM_SITRUS_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index 5549a00e73..c8a314ae69 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HABAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/gallade/data.json b/res/pokemon/gallade/data.json index 0f50fceff7..95d942c6bc 100644 --- a/res/pokemon/gallade/data.json +++ b/res/pokemon/gallade/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STEADFAST", diff --git a/res/pokemon/garchomp/data.json b/res/pokemon/garchomp/data.json index 18a1ae855d..dd0eee6a02 100644 --- a/res/pokemon/garchomp/data.json +++ b/res/pokemon/garchomp/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HABAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/gardevoir/data.json b/res/pokemon/gardevoir/data.json index 687d7b2841..766dac96d7 100644 --- a/res/pokemon/gardevoir/data.json +++ b/res/pokemon/gardevoir/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index 8c890dd019..5cc7393153 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/gastrodon/data.json b/res/pokemon/gastrodon/data.json index 8ee1738f4d..b498bbbd59 100644 --- a/res/pokemon/gastrodon/data.json +++ b/res/pokemon/gastrodon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "AMORPHOUS" + "EGG_GROUP_WATER_1", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STICKY_HOLD", diff --git a/res/pokemon/gengar/data.json b/res/pokemon/gengar/data.json index fa84b852da..6cc05fde58 100644 --- a/res/pokemon/gengar/data.json +++ b/res/pokemon/gengar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index 5e771e6c1d..b5208218db 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_EVERSTONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index 6150ffd3b6..6516fdce14 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HABAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/girafarig/data.json b/res/pokemon/girafarig/data.json index 40e74ede47..0fd4d82f9b 100644 --- a/res/pokemon/girafarig/data.json +++ b/res/pokemon/girafarig/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PERSIM_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/giratina/data.json b/res/pokemon/giratina/data.json index fb7b658272..07781ef184 100644 --- a/res/pokemon/giratina/data.json +++ b/res/pokemon/giratina/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/giratina/forms/origin/data.json b/res/pokemon/giratina/forms/origin/data.json index 8c20d09c7b..b357091fcd 100644 --- a/res/pokemon/giratina/forms/origin/data.json +++ b/res/pokemon/giratina/forms/origin/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/glaceon/data.json b/res/pokemon/glaceon/data.json index b22a3e7bb7..a9f76ae91e 100644 --- a/res/pokemon/glaceon/data.json +++ b/res/pokemon/glaceon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SNOW_CLOAK", diff --git a/res/pokemon/glalie/data.json b/res/pokemon/glalie/data.json index ba3543bd28..fe0c24b1fe 100644 --- a/res/pokemon/glalie/data.json +++ b/res/pokemon/glalie/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BABIRI_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "MINERAL" + "EGG_GROUP_FAIRY", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index 25fc577d2d..d0c8bc3985 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHERI_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIMBER", diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index 0cc09d6262..b6b2e1eafb 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/gliscor/data.json b/res/pokemon/gliscor/data.json index 5b5d59016e..8b3cdbfd76 100644 --- a/res/pokemon/gliscor/data.json +++ b/res/pokemon/gliscor/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/gloom/data.json b/res/pokemon/gloom/data.json index 339ef87d91..f10fa0025c 100644 --- a/res/pokemon/gloom/data.json +++ b/res/pokemon/gloom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index 96a6ca095b..4e810d2773 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index f3ece3851c..fbeeff6332 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/golduck/data.json b/res/pokemon/golduck/data.json index 118371ce4d..0c61235ebe 100644 --- a/res/pokemon/golduck/data.json +++ b/res/pokemon/golduck/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", diff --git a/res/pokemon/golem/data.json b/res/pokemon/golem/data.json index 473fb92903..a829687012 100644 --- a/res/pokemon/golem/data.json +++ b/res/pokemon/golem/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_EVERSTONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/gorebyss/data.json b/res/pokemon/gorebyss/data.json index 67ee4c07d9..c128eb36a8 100644 --- a/res/pokemon/gorebyss/data.json +++ b/res/pokemon/gorebyss/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEASCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/granbull/data.json b/res/pokemon/granbull/data.json index 9763631788..5902a13fb6 100644 --- a/res/pokemon/granbull/data.json +++ b/res/pokemon/granbull/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/graveler/data.json b/res/pokemon/graveler/data.json index ad0d2cb3d3..de16499fdc 100644 --- a/res/pokemon/graveler/data.json +++ b/res/pokemon/graveler/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_EVERSTONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index b99db1987a..aa1a28ee94 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NUGGET" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STENCH", diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index fe6c3e533a..6f3df01e8a 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/groudon/data.json b/res/pokemon/groudon/data.json index 36896572cc..6efeb6c614 100644 --- a/res/pokemon/groudon/data.json +++ b/res/pokemon/groudon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_DROUGHT", diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 8013dbcaff..1c7a758126 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/growlithe/data.json b/res/pokemon/growlithe/data.json index a8a14f4307..30be51a3cf 100644 --- a/res/pokemon/growlithe/data.json +++ b/res/pokemon/growlithe/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/grumpig/data.json b/res/pokemon/grumpig/data.json index 58d6331000..48a62632bb 100644 --- a/res/pokemon/grumpig/data.json +++ b/res/pokemon/grumpig/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_TANGA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index 20d2747eea..8aa4b481dc 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BIG_PEARL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LIQUID_OOZE", diff --git a/res/pokemon/gyarados/data.json b/res/pokemon/gyarados/data.json index 68ab8a8a32..9980ea64ae 100644 --- a/res/pokemon/gyarados/data.json +++ b/res/pokemon/gyarados/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 5, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "DRAGON" + "EGG_GROUP_WATER_2", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index ca5bd469f4..26ba3fa956 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -26,13 +26,13 @@ "common": "ITEM_OVAL_STONE", "rare": "ITEM_LUCKY_PUNCH" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 40, "base_friendship": 140, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/hariyama/data.json b/res/pokemon/hariyama/data.json index 067abed8f5..f84bad552b 100644 --- a/res/pokemon/hariyama/data.json +++ b/res/pokemon/hariyama/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/haunter/data.json b/res/pokemon/haunter/data.json index 6c23823378..66db7fb554 100644 --- a/res/pokemon/haunter/data.json +++ b/res/pokemon/haunter/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/heatran/data.json b/res/pokemon/heatran/data.json index 9a8aaf0590..9d1ccfc219 100644 --- a/res/pokemon/heatran/data.json +++ b/res/pokemon/heatran/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 100, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_FLASH_FIRE", diff --git a/res/pokemon/heracross/data.json b/res/pokemon/heracross/data.json index 0651c436ad..1b4cf2f740 100644 --- a/res/pokemon/heracross/data.json +++ b/res/pokemon/heracross/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index de575cd7f9..2db27e1388 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_STREAM", diff --git a/res/pokemon/hippowdon/data.json b/res/pokemon/hippowdon/data.json index f2a9066f9e..d6b203a138 100644 --- a/res/pokemon/hippowdon/data.json +++ b/res/pokemon/hippowdon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_STREAM", diff --git a/res/pokemon/hitmonchan/data.json b/res/pokemon/hitmonchan/data.json index 5621f29fcb..feddac8f0e 100644 --- a/res/pokemon/hitmonchan/data.json +++ b/res/pokemon/hitmonchan/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/hitmonlee/data.json b/res/pokemon/hitmonlee/data.json index 709bbac83a..644f712b57 100644 --- a/res/pokemon/hitmonlee/data.json +++ b/res/pokemon/hitmonlee/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_LIMBER", diff --git a/res/pokemon/hitmontop/data.json b/res/pokemon/hitmontop/data.json index a59b3acd36..944ff29c7f 100644 --- a/res/pokemon/hitmontop/data.json +++ b/res/pokemon/hitmontop/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/ho_oh/data.json b/res/pokemon/ho_oh/data.json index 0dd444534e..52b91d85f6 100644 --- a/res/pokemon/ho_oh/data.json +++ b/res/pokemon/ho_oh/data.json @@ -26,13 +26,13 @@ "common": "ITEM_SACRED_ASH", "rare": "ITEM_SACRED_ASH" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index 947b30c3a5..8f07f54a6c 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index 60b024a7fe..77236e01a1 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index 837177a543..b11169e13e 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 2d1c1e6bf0..dda4d70987 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/houndoom/data.json b/res/pokemon/houndoom/data.json index c97fa31896..5710e1d8d2 100644 --- a/res/pokemon/houndoom/data.json +++ b/res/pokemon/houndoom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_EARLY_BIRD", diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index 0c041023f7..d46b4c6679 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_EARLY_BIRD", diff --git a/res/pokemon/huntail/data.json b/res/pokemon/huntail/data.json index 5fe8483ec2..194deb6a34 100644 --- a/res/pokemon/huntail/data.json +++ b/res/pokemon/huntail/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEATOOTH" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/hypno/data.json b/res/pokemon/hypno/data.json index 72b29fbd76..66827f295a 100644 --- a/res/pokemon/hypno/data.json +++ b/res/pokemon/hypno/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index 510d8e5d8d..ddac3570fe 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/illumise/data.json b/res/pokemon/illumise/data.json index 87e365ccd9..9943beb13d 100644 --- a/res/pokemon/illumise/data.json +++ b/res/pokemon/illumise/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "BUG", - "HUMAN_LIKE" + "EGG_GROUP_BUG", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/infernape/data.json b/res/pokemon/infernape/data.json index 007b46851f..8790171448 100644 --- a/res/pokemon/infernape/data.json +++ b/res/pokemon/infernape/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index acf3f69e3b..6b6b32abad 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/jigglypuff/data.json b/res/pokemon/jigglypuff/data.json index 48fde04a20..755722dae9 100644 --- a/res/pokemon/jigglypuff/data.json +++ b/res/pokemon/jigglypuff/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/jirachi/data.json b/res/pokemon/jirachi/data.json index fc2a07ab24..c2859e5e89 100644 --- a/res/pokemon/jirachi/data.json +++ b/res/pokemon/jirachi/data.json @@ -26,13 +26,13 @@ "common": "ITEM_STAR_PIECE", "rare": "ITEM_STAR_PIECE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SERENE_GRACE", diff --git a/res/pokemon/jolteon/data.json b/res/pokemon/jolteon/data.json index ab52c0351f..ab1c2602e6 100644 --- a/res/pokemon/jolteon/data.json +++ b/res/pokemon/jolteon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VOLT_ABSORB", diff --git a/res/pokemon/jumpluff/data.json b/res/pokemon/jumpluff/data.json index c765c6611b..708ca0380b 100644 --- a/res/pokemon/jumpluff/data.json +++ b/res/pokemon/jumpluff/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/jynx/data.json b/res/pokemon/jynx/data.json index 99f29227bb..fabbd0f3d1 100644 --- a/res/pokemon/jynx/data.json +++ b/res/pokemon/jynx/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ASPEAR_BERRY", "rare": "ITEM_ASPEAR_BERRY" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index d00b8eac61..9ce7683b49 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/kabutops/data.json b/res/pokemon/kabutops/data.json index 6157a5de36..798f103b92 100644 --- a/res/pokemon/kabutops/data.json +++ b/res/pokemon/kabutops/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/kadabra/data.json b/res/pokemon/kadabra/data.json index f7b07d8b99..9fca190541 100644 --- a/res/pokemon/kadabra/data.json +++ b/res/pokemon/kadabra/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_TWISTEDSPOON" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index bece954d6e..12550933ba 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/kangaskhan/data.json b/res/pokemon/kangaskhan/data.json index c8f76b5992..2eb3ca01b9 100644 --- a/res/pokemon/kangaskhan/data.json +++ b/res/pokemon/kangaskhan/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_EARLY_BIRD", diff --git a/res/pokemon/kecleon/data.json b/res/pokemon/kecleon/data.json index 567b051043..226b232c5e 100644 --- a/res/pokemon/kecleon/data.json +++ b/res/pokemon/kecleon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PERSIM_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_COLOR_CHANGE", diff --git a/res/pokemon/kingdra/data.json b/res/pokemon/kingdra/data.json index f540a1c227..bf1cde151a 100644 --- a/res/pokemon/kingdra/data.json +++ b/res/pokemon/kingdra/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/kingler/data.json b/res/pokemon/kingler/data.json index 8ed9d10e94..d19a3c8699 100644 --- a/res/pokemon/kingler/data.json +++ b/res/pokemon/kingler/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index cf6839c78a..d2e9c7467f 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index 39a0a52ae7..74252c2399 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SMOKE_BALL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index 1446fa494d..a0d3a3e051 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index 07a00727f8..d92db64345 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METRONOME" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/kricketune/data.json b/res/pokemon/kricketune/data.json index 1d093a59d6..2ced1a05c1 100644 --- a/res/pokemon/kricketune/data.json +++ b/res/pokemon/kricketune/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METRONOME" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/kyogre/data.json b/res/pokemon/kyogre/data.json index 8f19be1989..3c97db3157 100644 --- a/res/pokemon/kyogre/data.json +++ b/res/pokemon/kyogre/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_DRIZZLE", diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index d3e5618b08..87f8f10dba 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index 8ce4b72eb7..99a74f16c8 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEASCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_VOLT_ABSORB", diff --git a/res/pokemon/lapras/data.json b/res/pokemon/lapras/data.json index a595d16d1d..6e26a5967a 100644 --- a/res/pokemon/lapras/data.json +++ b/res/pokemon/lapras/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index f8d06fb635..88d65e8224 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/latias/data.json b/res/pokemon/latias/data.json index 8c4f38bbaf..7e926b2ab7 100644 --- a/res/pokemon/latias/data.json +++ b/res/pokemon/latias/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 120, "base_friendship": 90, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/latios/data.json b/res/pokemon/latios/data.json index 608cf697a0..e5e5115372 100644 --- a/res/pokemon/latios/data.json +++ b/res/pokemon/latios/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 120, "base_friendship": 90, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/leafeon/data.json b/res/pokemon/leafeon/data.json index ff62af1339..93e5e95c06 100644 --- a/res/pokemon/leafeon/data.json +++ b/res/pokemon/leafeon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LEAF_GUARD", diff --git a/res/pokemon/ledian/data.json b/res/pokemon/ledian/data.json index 58ba79aa8c..5864409217 100644 --- a/res/pokemon/ledian/data.json +++ b/res/pokemon/ledian/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index 936bc7b279..64b77b0795 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/lickilicky/data.json b/res/pokemon/lickilicky/data.json index 1fd09a7846..b335f3c2cd 100644 --- a/res/pokemon/lickilicky/data.json +++ b/res/pokemon/lickilicky/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LAGGING_TAIL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_OWN_TEMPO", diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index 48ee2bbf68..6017477bff 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LAGGING_TAIL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_OWN_TEMPO", diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index 34e020e8e3..8e5720633e 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BIG_ROOT" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SUCTION_CUPS", diff --git a/res/pokemon/linoone/data.json b/res/pokemon/linoone/data.json index 22d408df6f..c0c7f2d0a8 100644 --- a/res/pokemon/linoone/data.json +++ b/res/pokemon/linoone/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ORAN_BERRY", "rare": "ITEM_SITRUS_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/lombre/data.json b/res/pokemon/lombre/data.json index 9a4054f251..e63d95a44b 100644 --- a/res/pokemon/lombre/data.json +++ b/res/pokemon/lombre/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "GRASS" + "EGG_GROUP_WATER_1", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/lopunny/data.json b/res/pokemon/lopunny/data.json index 165aa6aa85..3722698cea 100644 --- a/res/pokemon/lopunny/data.json +++ b/res/pokemon/lopunny/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHOPLE_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 140, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index ff40afbf9d..1035ad618d 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "GRASS" + "EGG_GROUP_WATER_1", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index 57c1cc7cf7..65d7c62182 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHESTO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/lucario/data.json b/res/pokemon/lucario/data.json index fe24c611fb..62292ba9b5 100644 --- a/res/pokemon/lucario/data.json +++ b/res/pokemon/lucario/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_STEADFAST", diff --git a/res/pokemon/ludicolo/data.json b/res/pokemon/ludicolo/data.json index d51865d347..84f7c7b23f 100644 --- a/res/pokemon/ludicolo/data.json +++ b/res/pokemon/ludicolo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "GRASS" + "EGG_GROUP_WATER_1", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/lugia/data.json b/res/pokemon/lugia/data.json index 75ebf564a2..c300bb3564 100644 --- a/res/pokemon/lugia/data.json +++ b/res/pokemon/lugia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/lumineon/data.json b/res/pokemon/lumineon/data.json index ce1c4468ce..37249d26f6 100644 --- a/res/pokemon/lumineon/data.json +++ b/res/pokemon/lumineon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_RINDO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/lunatone/data.json b/res/pokemon/lunatone/data.json index 0d958d60fe..b6d57be29d 100644 --- a/res/pokemon/lunatone/data.json +++ b/res/pokemon/lunatone/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MOON_STONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/luvdisc/data.json b/res/pokemon/luvdisc/data.json index c516cff14c..b23c987014 100644 --- a/res/pokemon/luvdisc/data.json +++ b/res/pokemon/luvdisc/data.json @@ -26,13 +26,13 @@ "common": "ITEM_HEART_SCALE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index 2928ff71f1..dcbc72c391 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 100, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", diff --git a/res/pokemon/luxray/data.json b/res/pokemon/luxray/data.json index 417290462b..9a41070804 100644 --- a/res/pokemon/luxray/data.json +++ b/res/pokemon/luxray/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", diff --git a/res/pokemon/machamp/data.json b/res/pokemon/machamp/data.json index e72da9f5f1..0dbe649b17 100644 --- a/res/pokemon/machamp/data.json +++ b/res/pokemon/machamp/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/machoke/data.json b/res/pokemon/machoke/data.json index 9e16dee59f..96f527bca2 100644 --- a/res/pokemon/machoke/data.json +++ b/res/pokemon/machoke/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index 2e2355fd3b..8e1f3699fb 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index ee78e2615d..8aaf9a7997 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MAGMARIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_FLAME_BODY", diff --git a/res/pokemon/magcargo/data.json b/res/pokemon/magcargo/data.json index 0f23c517f5..6ca72b3b0f 100644 --- a/res/pokemon/magcargo/data.json +++ b/res/pokemon/magcargo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_MAGMA_ARMOR", diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index 25f9bf26f1..9b3dd816a4 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 5, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "DRAGON" + "EGG_GROUP_WATER_2", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index 6db0e369cb..45f228b040 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MAGMARIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_FLAME_BODY", diff --git a/res/pokemon/magmortar/data.json b/res/pokemon/magmortar/data.json index ae647ced83..ec7cb55c79 100644 --- a/res/pokemon/magmortar/data.json +++ b/res/pokemon/magmortar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_MAGMARIZER" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_FLAME_BODY", diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index 3bc54edb1c..2d565a7dcd 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index fbb8d2ba74..1a096a6d83 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", diff --git a/res/pokemon/magnezone/data.json b/res/pokemon/magnezone/data.json index d60f267ec1..c1b0f03da8 100644 --- a/res/pokemon/magnezone/data.json +++ b/res/pokemon/magnezone/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index 76a5254a6c..252a802d28 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_25", + "gender_ratio": "GENDER_RATIO_FEMALE_25", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/mamoswine/data.json b/res/pokemon/mamoswine/data.json index 9360e8401a..375c0f60dd 100644 --- a/res/pokemon/mamoswine/data.json +++ b/res/pokemon/mamoswine/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/manaphy/data.json b/res/pokemon/manaphy/data.json index d8100761ab..f7bfb8d5e8 100644 --- a/res/pokemon/manaphy/data.json +++ b/res/pokemon/manaphy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "FAIRY" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYDRATION", diff --git a/res/pokemon/manectric/data.json b/res/pokemon/manectric/data.json index 8e92a0335c..f0fc75047c 100644 --- a/res/pokemon/manectric/data.json +++ b/res/pokemon/manectric/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index b7e7fa3f46..ec80eee739 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PAYAPA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", diff --git a/res/pokemon/mantine/data.json b/res/pokemon/mantine/data.json index ff697dc797..2e5b0c6794 100644 --- a/res/pokemon/mantine/data.json +++ b/res/pokemon/mantine/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index 35d5dc79fc..6578abf510 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index 20d5793230..005b99e353 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index fc40359671..ad4e7a5b8b 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "WATER_1", - "FAIRY" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/marowak/data.json b/res/pokemon/marowak/data.json index 6ae4f7c5be..7edab5000f 100644 --- a/res/pokemon/marowak/data.json +++ b/res/pokemon/marowak/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_THICK_CLUB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index a21b60def1..5f7c4f7b47 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/masquerain/data.json b/res/pokemon/masquerain/data.json index eb62036ff8..10e67e8033 100644 --- a/res/pokemon/masquerain/data.json +++ b/res/pokemon/masquerain/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "BUG" + "EGG_GROUP_WATER_1", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/mawile/data.json b/res/pokemon/mawile/data.json index ea3a5471f4..91bb13e692 100644 --- a/res/pokemon/mawile/data.json +++ b/res/pokemon/mawile/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_OCCA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/medicham/data.json b/res/pokemon/medicham/data.json index 794bf901d3..f87d284057 100644 --- a/res/pokemon/medicham/data.json +++ b/res/pokemon/medicham/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_PURE_POWER", diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index 0eef77af22..94ab446249 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_PURE_POWER", diff --git a/res/pokemon/meganium/data.json b/res/pokemon/meganium/data.json index 513b3c1bb7..1af5fc8771 100644 --- a/res/pokemon/meganium/data.json +++ b/res/pokemon/meganium/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index 3fcf0505cc..f5e1470cf7 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build index 8c96f68212..325b6eabbc 100644 --- a/res/pokemon/meson.build +++ b/res/pokemon/meson.build @@ -699,6 +699,8 @@ pl_otherpoke_narc = custom_target('pl_otherpoke.narc', height_narc = custom_target('height.narc', output: 'height.narc', input: personal_files, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ make_height_py, '--knarc', knarc_exe, diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index 47d9cded82..4e66b14b63 100644 --- a/res/pokemon/mesprit/data.json +++ b/res/pokemon/mesprit/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 140, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/metagross/data.json b/res/pokemon/metagross/data.json index ff2228653d..279a835d06 100644 --- a/res/pokemon/metagross/data.json +++ b/res/pokemon/metagross/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index ffc29e15dd..fe238c8046 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index f71dd1b906..d5d257eb53 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/mew/data.json b/res/pokemon/mew/data.json index 67ed1f8b0f..101bac9f43 100644 --- a/res/pokemon/mew/data.json +++ b/res/pokemon/mew/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LUM_BERRY", "rare": "ITEM_LUM_BERRY" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/mewtwo/data.json b/res/pokemon/mewtwo/data.json index be2a6cf68a..a99d63a613 100644 --- a/res/pokemon/mewtwo/data.json +++ b/res/pokemon/mewtwo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/mightyena/data.json b/res/pokemon/mightyena/data.json index dd4ab46932..fd4363e2f4 100644 --- a/res/pokemon/mightyena/data.json +++ b/res/pokemon/mightyena/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PECHA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/milotic/data.json b/res/pokemon/milotic/data.json index 18baef6ca5..01a6c26e29 100644 --- a/res/pokemon/milotic/data.json +++ b/res/pokemon/milotic/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_MARVEL_SCALE", diff --git a/res/pokemon/miltank/data.json b/res/pokemon/miltank/data.json index fc134246b2..59d30cab56 100644 --- a/res/pokemon/miltank/data.json +++ b/res/pokemon/miltank/data.json @@ -26,13 +26,13 @@ "common": "ITEM_MOOMOO_MILK", "rare": "ITEM_MOOMOO_MILK" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index 6c176d2287..6f5fab63b4 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LEPPA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/minun/data.json b/res/pokemon/minun/data.json index 9f66aa2c34..7ecd638bd8 100644 --- a/res/pokemon/minun/data.json +++ b/res/pokemon/minun/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_MINUS", diff --git a/res/pokemon/misdreavus/data.json b/res/pokemon/misdreavus/data.json index 444f2fcad7..19099edd84 100644 --- a/res/pokemon/misdreavus/data.json +++ b/res/pokemon/misdreavus/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/mismagius/data.json b/res/pokemon/mismagius/data.json index a59a99e6ff..b1b4d51fc0 100644 --- a/res/pokemon/mismagius/data.json +++ b/res/pokemon/mismagius/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/moltres/data.json b/res/pokemon/moltres/data.json index 6d09f967ec..884b70161a 100644 --- a/res/pokemon/moltres/data.json +++ b/res/pokemon/moltres/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index 97ef9cabca..c3be242cf2 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/mothim/data.json b/res/pokemon/mothim/data.json index 6ec9dbcd5d..8c794d1034 100644 --- a/res/pokemon/mothim/data.json +++ b/res/pokemon/mothim/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/mr_mime/data.json b/res/pokemon/mr_mime/data.json index e02bc7dfd1..c8f05868d0 100644 --- a/res/pokemon/mr_mime/data.json +++ b/res/pokemon/mr_mime/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LEPPA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index c09e7f027c..ff5a559ea5 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/muk/data.json b/res/pokemon/muk/data.json index 497d289d36..ed07866d93 100644 --- a/res/pokemon/muk/data.json +++ b/res/pokemon/muk/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NUGGET" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STENCH", diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index 0de4cba6ba..2318d5f5de 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LEFTOVERS", "rare": "ITEM_LEFTOVERS" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/murkrow/data.json b/res/pokemon/murkrow/data.json index 6d6a718ca6..9d9ae86514 100644 --- a/res/pokemon/murkrow/data.json +++ b/res/pokemon/murkrow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index bda759fe61..2223ea05b6 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/nidoking/data.json b/res/pokemon/nidoking/data.json index b08021770e..4e6c9c1616 100644 --- a/res/pokemon/nidoking/data.json +++ b/res/pokemon/nidoking/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nidoqueen/data.json b/res/pokemon/nidoqueen/data.json index 174ab975b1..8b0f695728 100644 --- a/res/pokemon/nidoqueen/data.json +++ b/res/pokemon/nidoqueen/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index dbe8fcca0e..16df113617 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index e6abd76ef4..7728e7dad1 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nidorina/data.json b/res/pokemon/nidorina/data.json index 55c8c0c482..98b1bc2b8a 100644 --- a/res/pokemon/nidorina/data.json +++ b/res/pokemon/nidorina/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nidorino/data.json b/res/pokemon/nidorino/data.json index 93141463da..894692dcff 100644 --- a/res/pokemon/nidorino/data.json +++ b/res/pokemon/nidorino/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/nincada/data.json b/res/pokemon/nincada/data.json index 07b093d1ce..634e924880 100644 --- a/res/pokemon/nincada/data.json +++ b/res/pokemon/nincada/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", diff --git a/res/pokemon/ninetales/data.json b/res/pokemon/ninetales/data.json index 6e852dd65e..a67a8822db 100644 --- a/res/pokemon/ninetales/data.json +++ b/res/pokemon/ninetales/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", diff --git a/res/pokemon/ninjask/data.json b/res/pokemon/ninjask/data.json index 7902cd8080..05c53448ce 100644 --- a/res/pokemon/ninjask/data.json +++ b/res/pokemon/ninjask/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", diff --git a/res/pokemon/noctowl/data.json b/res/pokemon/noctowl/data.json index 4c5b5dc20a..86997ca573 100644 --- a/res/pokemon/noctowl/data.json +++ b/res/pokemon/noctowl/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index d9d1cb5ba4..88f94a91e6 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index f90c587b8a..5250e715c4 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/nuzleaf/data.json b/res/pokemon/nuzleaf/data.json index 7cb8c30ac2..8c72a8e0a7 100644 --- a/res/pokemon/nuzleaf/data.json +++ b/res/pokemon/nuzleaf/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "GRASS" + "EGG_GROUP_FIELD", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/octillery/data.json b/res/pokemon/octillery/data.json index e540c0d25d..6d39ef702d 100644 --- a/res/pokemon/octillery/data.json +++ b/res/pokemon/octillery/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_2" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SUCTION_CUPS", diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index 89da94ce9a..9529df177f 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 12b7307176..4030e4c300 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/omastar/data.json b/res/pokemon/omastar/data.json index d683f95796..cc7de7fd05 100644 --- a/res/pokemon/omastar/data.json +++ b/res/pokemon/omastar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_3" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index 9bd0db1ae5..1469593362 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/pachirisu/data.json b/res/pokemon/pachirisu/data.json index f15721aa76..8b3bea99e2 100644 --- a/res/pokemon/pachirisu/data.json +++ b/res/pokemon/pachirisu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 100, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/palkia/data.json b/res/pokemon/palkia/data.json index 08393aeac5..5d4a6ccadd 100644 --- a/res/pokemon/palkia/data.json +++ b/res/pokemon/palkia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index 75c4b28369..e9951ef478 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -26,13 +26,13 @@ "common": "ITEM_TINYMUSHROOM", "rare": "ITEM_BIG_MUSHROOM" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "GRASS" + "EGG_GROUP_BUG", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", diff --git a/res/pokemon/parasect/data.json b/res/pokemon/parasect/data.json index ebede1c1d9..756926761f 100644 --- a/res/pokemon/parasect/data.json +++ b/res/pokemon/parasect/data.json @@ -26,13 +26,13 @@ "common": "ITEM_TINYMUSHROOM", "rare": "ITEM_BIG_MUSHROOM" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "GRASS" + "EGG_GROUP_BUG", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", diff --git a/res/pokemon/pelipper/data.json b/res/pokemon/pelipper/data.json index 4e6ec4ff10..27c0a8d4de 100644 --- a/res/pokemon/pelipper/data.json +++ b/res/pokemon/pelipper/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FLYING" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/persian/data.json b/res/pokemon/persian/data.json index 883d036688..53245c6e98 100644 --- a/res/pokemon/persian/data.json +++ b/res/pokemon/persian/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIMBER", diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index a059e9a164..0e53b2fb13 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PASSHO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/phione/data.json b/res/pokemon/phione/data.json index 9f48292c55..28fa5aed04 100644 --- a/res/pokemon/phione/data.json +++ b/res/pokemon/phione/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "FAIRY" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYDRATION", diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index e8465238cf..e668c6680a 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ORAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/pidgeot/data.json b/res/pokemon/pidgeot/data.json index c212623372..46dd1b7386 100644 --- a/res/pokemon/pidgeot/data.json +++ b/res/pokemon/pidgeot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index b54805b9f4..d4324b6c63 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index 2cc038e84c..05a469fd8b 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/pikachu/data.json b/res/pokemon/pikachu/data.json index 15a09cb255..21b9977d34 100644 --- a/res/pokemon/pikachu/data.json +++ b/res/pokemon/pikachu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ORAN_BERRY", "rare": "ITEM_LIGHT_BALL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index bd0edd4b12..106984f11d 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index 7ac940046c..8cd4b11fb0 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/pinsir/data.json b/res/pokemon/pinsir/data.json index fab63e8452..6c71ad4b45 100644 --- a/res/pokemon/pinsir/data.json +++ b/res/pokemon/pinsir/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index 71b12aefd8..f7e43da8a0 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/plusle/data.json b/res/pokemon/plusle/data.json index d75affad9b..c56664078f 100644 --- a/res/pokemon/plusle/data.json +++ b/res/pokemon/plusle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_PLUS", diff --git a/res/pokemon/politoed/data.json b/res/pokemon/politoed/data.json index fd94a7287d..f5d3e4f554 100644 --- a/res/pokemon/politoed/data.json +++ b/res/pokemon/politoed/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index 653f45bdd0..fc04f24ecb 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index c7dd7b3430..42f0717787 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/poliwrath/data.json b/res/pokemon/poliwrath/data.json index 6bcd49d5b3..a9529cadf0 100644 --- a/res/pokemon/poliwrath/data.json +++ b/res/pokemon/poliwrath/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "WATER_1" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index 4a323b4bb1..683cd5579e 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHUCA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index 72631a910b..470659d563 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PECHA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index a4a6ee29dd..8262d5449b 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_TRACE", diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index 68bf6c0d18..ef9b45d1a7 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_TRACE", diff --git a/res/pokemon/porygon_z/data.json b/res/pokemon/porygon_z/data.json index c0c76cc775..b00520e737 100644 --- a/res/pokemon/porygon_z/data.json +++ b/res/pokemon/porygon_z/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ADAPTABILITY", diff --git a/res/pokemon/primeape/data.json b/res/pokemon/primeape/data.json index 7ee67cb18b..e60db8e62b 100644 --- a/res/pokemon/primeape/data.json +++ b/res/pokemon/primeape/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PAYAPA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index d67c9e7d2f..e2cd084018 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/probopass/data.json b/res/pokemon/probopass/data.json index 6d04cbaf95..496390ac60 100644 --- a/res/pokemon/probopass/data.json +++ b/res/pokemon/probopass/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_HARD_STONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index e6374d0226..bc4fff4b98 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index 4d7fa94ea9..b38c0f187b 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/purugly/data.json b/res/pokemon/purugly/data.json index 7c893fc86a..96f2543122 100644 --- a/res/pokemon/purugly/data.json +++ b/res/pokemon/purugly/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHERI_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/quagsire/data.json b/res/pokemon/quagsire/data.json index 231a0222c3..44e5ee4464 100644 --- a/res/pokemon/quagsire/data.json +++ b/res/pokemon/quagsire/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index 15fd9d85a9..5f51463384 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/qwilfish/data.json b/res/pokemon/qwilfish/data.json index a1fc9112ae..acdf4e64b9 100644 --- a/res/pokemon/qwilfish/data.json +++ b/res/pokemon/qwilfish/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/raichu/data.json b/res/pokemon/raichu/data.json index aead5a2ce4..2533e79dca 100644 --- a/res/pokemon/raichu/data.json +++ b/res/pokemon/raichu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ORAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_STATIC", diff --git a/res/pokemon/raikou/data.json b/res/pokemon/raikou/data.json index 64710b6803..863ffee626 100644 --- a/res/pokemon/raikou/data.json +++ b/res/pokemon/raikou/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index 8bb828ec43..be8561b64c 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/rampardos/data.json b/res/pokemon/rampardos/data.json index e1115400b1..76dac2f451 100644 --- a/res/pokemon/rampardos/data.json +++ b/res/pokemon/rampardos/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_MOLD_BREAKER", diff --git a/res/pokemon/rapidash/data.json b/res/pokemon/rapidash/data.json index f5491e17ce..58c58511ef 100644 --- a/res/pokemon/rapidash/data.json +++ b/res/pokemon/rapidash/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHUCA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/raticate/data.json b/res/pokemon/raticate/data.json index d0f8f52073..854251adce 100644 --- a/res/pokemon/raticate/data.json +++ b/res/pokemon/raticate/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHILAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index 767a58d77f..eeb0e066d2 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHILAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/rayquaza/data.json b/res/pokemon/rayquaza/data.json index 8fe4b0af76..490f053733 100644 --- a/res/pokemon/rayquaza/data.json +++ b/res/pokemon/rayquaza/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_AIR_LOCK", diff --git a/res/pokemon/regice/data.json b/res/pokemon/regice/data.json index 947be54b46..97d02482de 100644 --- a/res/pokemon/regice/data.json +++ b/res/pokemon/regice/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/regigigas/data.json b/res/pokemon/regigigas/data.json index f4fc1061e7..a5c8d116d8 100644 --- a/res/pokemon/regigigas/data.json +++ b/res/pokemon/regigigas/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 0, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SLOW_START", diff --git a/res/pokemon/regirock/data.json b/res/pokemon/regirock/data.json index a8968313ec..1eb18183c7 100644 --- a/res/pokemon/regirock/data.json +++ b/res/pokemon/regirock/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/registeel/data.json b/res/pokemon/registeel/data.json index 9aacaa48df..c89508ef90 100644 --- a/res/pokemon/registeel/data.json +++ b/res/pokemon/registeel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/relicanth/data.json b/res/pokemon/relicanth/data.json index f569e982f2..a49cf9ad71 100644 --- a/res/pokemon/relicanth/data.json +++ b/res/pokemon/relicanth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEASCALE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_1", - "WATER_2" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index d0e9428a11..4b00ea607e 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "WATER_2" + "EGG_GROUP_WATER_1", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_HUSTLE", diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index b4a25a75a7..6678531d71 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 61f6530169..e88a580ad5 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", diff --git a/res/pokemon/rhyperior/data.json b/res/pokemon/rhyperior/data.json index db19f62d31..dbccdce881 100644 --- a/res/pokemon/rhyperior/data.json +++ b/res/pokemon/rhyperior/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index 8750fdb726..f0ab254131 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STEADFAST", diff --git a/res/pokemon/roselia/data.json b/res/pokemon/roselia/data.json index a399a6ad6b..1b7e3bf97f 100644 --- a/res/pokemon/roselia/data.json +++ b/res/pokemon/roselia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/roserade/data.json b/res/pokemon/roserade/data.json index 40a864984d..12fcadf378 100644 --- a/res/pokemon/roserade/data.json +++ b/res/pokemon/roserade/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/rotom/data.json b/res/pokemon/rotom/data.json index 172c1534f5..153fad4ec4 100644 --- a/res/pokemon/rotom/data.json +++ b/res/pokemon/rotom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/rotom/forms/fan/data.json b/res/pokemon/rotom/forms/fan/data.json index 6b0a6d5ee7..13292c4b04 100644 --- a/res/pokemon/rotom/forms/fan/data.json +++ b/res/pokemon/rotom/forms/fan/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/rotom/forms/frost/data.json b/res/pokemon/rotom/forms/frost/data.json index 6b0a6d5ee7..13292c4b04 100644 --- a/res/pokemon/rotom/forms/frost/data.json +++ b/res/pokemon/rotom/forms/frost/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/rotom/forms/heat/data.json b/res/pokemon/rotom/forms/heat/data.json index 6b0a6d5ee7..13292c4b04 100644 --- a/res/pokemon/rotom/forms/heat/data.json +++ b/res/pokemon/rotom/forms/heat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/rotom/forms/mow/data.json b/res/pokemon/rotom/forms/mow/data.json index 6b0a6d5ee7..13292c4b04 100644 --- a/res/pokemon/rotom/forms/mow/data.json +++ b/res/pokemon/rotom/forms/mow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/rotom/forms/wash/data.json b/res/pokemon/rotom/forms/wash/data.json index 6b0a6d5ee7..13292c4b04 100644 --- a/res/pokemon/rotom/forms/wash/data.json +++ b/res/pokemon/rotom/forms/wash/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/sableye/data.json b/res/pokemon/sableye/data.json index e8bbfbf7ab..69c3389c13 100644 --- a/res/pokemon/sableye/data.json +++ b/res/pokemon/sableye/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/salamence/data.json b/res/pokemon/salamence/data.json index e2fafd5101..41eac0121e 100644 --- a/res/pokemon/salamence/data.json +++ b/res/pokemon/salamence/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_FANG" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "DRAGON", - "DRAGON" + "EGG_GROUP_DRAGON", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index 53c706170a..cc9911d24f 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/sandslash/data.json b/res/pokemon/sandslash/data.json index 59a06fbce4..148890d24c 100644 --- a/res/pokemon/sandslash/data.json +++ b/res/pokemon/sandslash/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", diff --git a/res/pokemon/sceptile/data.json b/res/pokemon/sceptile/data.json index 9d7cbe5039..39cc8b8cf2 100644 --- a/res/pokemon/sceptile/data.json +++ b/res/pokemon/sceptile/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/scizor/data.json b/res/pokemon/scizor/data.json index 74ec13c444..177a751f75 100644 --- a/res/pokemon/scizor/data.json +++ b/res/pokemon/scizor/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index 94584926ec..936b09eb49 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index 0ef7992854..96e8dceafb 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_SCALE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "DRAGON" + "EGG_GROUP_WATER_1", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_POISON_POINT", diff --git a/res/pokemon/seaking/data.json b/res/pokemon/seaking/data.json index 45f821d37e..c8ed0b7788 100644 --- a/res/pokemon/seaking/data.json +++ b/res/pokemon/seaking/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index 6fc4db9263..921beb31e3 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index b3d82710a7..fa2779c6f8 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "GRASS" + "EGG_GROUP_FIELD", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index 54626e8b64..77e7443780 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index 92ad7cc4af..c043dd979d 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ORAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", diff --git a/res/pokemon/seviper/data.json b/res/pokemon/seviper/data.json index cc96f313e4..2f92d70f57 100644 --- a/res/pokemon/seviper/data.json +++ b/res/pokemon/seviper/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "FIELD", - "DRAGON" + "EGG_GROUP_FIELD", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 98948bee18..3a7fc632f6 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DEEPSEATOOTH" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_ROUGH_SKIN", diff --git a/res/pokemon/shaymin/data.json b/res/pokemon/shaymin/data.json index e07a81f0e3..dfd04a1091 100644 --- a/res/pokemon/shaymin/data.json +++ b/res/pokemon/shaymin/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LUM_BERRY", "rare": "ITEM_LUM_BERRY" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/shaymin/forms/sky/data.json b/res/pokemon/shaymin/forms/sky/data.json index 80406356cc..906af8cd22 100644 --- a/res/pokemon/shaymin/forms/sky/data.json +++ b/res/pokemon/shaymin/forms/sky/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LUM_BERRY", "rare": "ITEM_LUM_BERRY" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 120, "base_friendship": 100, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SERENE_GRACE", diff --git a/res/pokemon/shedinja/data.json b/res/pokemon/shedinja/data.json index bfc69b7cbc..7daaa94a00 100644 --- a/res/pokemon/shedinja/data.json +++ b/res/pokemon/shedinja/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_WONDER_GUARD", diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index 6b81c1c6a2..d3f5b59869 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_DRAGON_FANG" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "DRAGON", - "DRAGON" + "EGG_GROUP_DRAGON", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/shellder/data.json b/res/pokemon/shellder/data.json index a95e02d93f..aa1ec6894c 100644 --- a/res/pokemon/shellder/data.json +++ b/res/pokemon/shellder/data.json @@ -26,13 +26,13 @@ "common": "ITEM_PEARL", "rare": "ITEM_BIG_PEARL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SHELL_ARMOR", diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index 631729063d..90aef44786 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "AMORPHOUS" + "EGG_GROUP_WATER_1", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STICKY_HOLD", diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index a4f48caf32..683f2b1d2a 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/shiftry/data.json b/res/pokemon/shiftry/data.json index f6387dc904..cd77a9feab 100644 --- a/res/pokemon/shiftry/data.json +++ b/res/pokemon/shiftry/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "GRASS" + "EGG_GROUP_FIELD", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index 1974305386..5ae32978ee 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index 7a8ca62a46..1fb3003769 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KEBIA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", diff --git a/res/pokemon/shuckle/data.json b/res/pokemon/shuckle/data.json index ced9f8f765..82aa3bbde7 100644 --- a/res/pokemon/shuckle/data.json +++ b/res/pokemon/shuckle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ORAN_BERRY", "rare": "ITEM_ORAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index 6a27885f41..adbaab0ae2 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SPELL_TAG" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 35, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_INSOMNIA", diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index d37e186807..1573d58a9e 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", diff --git a/res/pokemon/skarmory/data.json b/res/pokemon/skarmory/data.json index 0ef957d709..fe10e86508 100644 --- a/res/pokemon/skarmory/data.json +++ b/res/pokemon/skarmory/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index be6ffc561b..caca8fc114 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FAIRY", - "GRASS" + "EGG_GROUP_FAIRY", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/skitty/data.json b/res/pokemon/skitty/data.json index 4d84c38d08..59b6637bb5 100644 --- a/res/pokemon/skitty/data.json +++ b/res/pokemon/skitty/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LEPPA_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index b212228181..0dbd02776a 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "BUG", - "WATER_3" + "EGG_GROUP_BUG", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", diff --git a/res/pokemon/skuntank/data.json b/res/pokemon/skuntank/data.json index 369862473a..30a3a29af7 100644 --- a/res/pokemon/skuntank/data.json +++ b/res/pokemon/skuntank/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PECHA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STENCH", diff --git a/res/pokemon/slaking/data.json b/res/pokemon/slaking/data.json index a4de448f29..365274b7bd 100644 --- a/res/pokemon/slaking/data.json +++ b/res/pokemon/slaking/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TRUANT", diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index 22cab00917..832bedd3be 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TRUANT", diff --git a/res/pokemon/slowbro/data.json b/res/pokemon/slowbro/data.json index 28d5501bb3..54f9e3f4a8 100644 --- a/res/pokemon/slowbro/data.json +++ b/res/pokemon/slowbro/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/slowking/data.json b/res/pokemon/slowking/data.json index 791dbfff59..72728443a5 100644 --- a/res/pokemon/slowking/data.json +++ b/res/pokemon/slowking/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_KINGS_ROCK" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index c8ef460844..dfa1907658 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_LAGGING_TAIL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index 2bcbebea28..93accabd9f 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_MAGMA_ARMOR", diff --git a/res/pokemon/smeargle/data.json b/res/pokemon/smeargle/data.json index a39a6ac326..8047fe8a84 100644 --- a/res/pokemon/smeargle/data.json +++ b/res/pokemon/smeargle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OWN_TEMPO", diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 94d81b1254..c372aefe51 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -26,13 +26,13 @@ "common": "ITEM_ASPEAR_BERRY", "rare": "ITEM_ASPEAR_BERRY" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index 245d1ea985..31824ec58f 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_GRIP_CLAW", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/snorlax/data.json b/res/pokemon/snorlax/data.json index 42dac4d0b1..de4d9d33f4 100644 --- a/res/pokemon/snorlax/data.json +++ b/res/pokemon/snorlax/data.json @@ -26,13 +26,13 @@ "common": "ITEM_LEFTOVERS", "rare": "ITEM_LEFTOVERS" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_IMMUNITY", diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index abd2851da8..e90525c3d0 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BABIRI_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FAIRY", - "MINERAL" + "EGG_GROUP_FAIRY", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index 51ac635ef6..ac6d9334e1 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NEVERMELTICE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SNOW_WARNING", diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index 6e874e6604..4b9f136830 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FAIRY" + "EGG_GROUP_FIELD", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/solrock/data.json b/res/pokemon/solrock/data.json index 37b0780a9c..9df7342efb 100644 --- a/res/pokemon/solrock/data.json +++ b/res/pokemon/solrock/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SUN_STONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index 0f68e6a880..a9b44f4c90 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index a78d388856..6d41c6c218 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index bfe2c21a95..3b1da24268 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", diff --git a/res/pokemon/spinda/data.json b/res/pokemon/spinda/data.json index 547a4558d2..25a0bf54b4 100644 --- a/res/pokemon/spinda/data.json +++ b/res/pokemon/spinda/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHESTO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "HUMAN_LIKE" + "EGG_GROUP_FIELD", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OWN_TEMPO", diff --git a/res/pokemon/spiritomb/data.json b/res/pokemon/spiritomb/data.json index b20adb7b3c..dc4c232a58 100644 --- a/res/pokemon/spiritomb/data.json +++ b/res/pokemon/spiritomb/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 30, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index ec35c31c8c..414c619c30 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_TANGA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index 3788aa0b44..565de40062 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/stantler/data.json b/res/pokemon/stantler/data.json index 24415ccfac..c9822b189b 100644 --- a/res/pokemon/stantler/data.json +++ b/res/pokemon/stantler/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/staraptor/data.json b/res/pokemon/staraptor/data.json index a8ab874d97..c583b3a915 100644 --- a/res/pokemon/staraptor/data.json +++ b/res/pokemon/staraptor/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_YACHE_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index 7c9850b0e4..880496daf7 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_YACHE_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index b06df0cf84..db95f3724b 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_YACHE_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/starmie/data.json b/res/pokemon/starmie/data.json index af658f7243..4a57b5bb4f 100644 --- a/res/pokemon/starmie/data.json +++ b/res/pokemon/starmie/data.json @@ -26,13 +26,13 @@ "common": "ITEM_STARDUST", "rare": "ITEM_STAR_PIECE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_ILLUMINATE", diff --git a/res/pokemon/staryu/data.json b/res/pokemon/staryu/data.json index f0160c8fdc..438433e7be 100644 --- a/res/pokemon/staryu/data.json +++ b/res/pokemon/staryu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_STARDUST", "rare": "ITEM_STAR_PIECE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_ILLUMINATE", diff --git a/res/pokemon/steelix/data.json b/res/pokemon/steelix/data.json index ed690c53a4..64837e3fdc 100644 --- a/res/pokemon/steelix/data.json +++ b/res/pokemon/steelix/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_METAL_COAT" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index f4fd4ee236..cad3bb8241 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_PECHA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STENCH", diff --git a/res/pokemon/sudowoodo/data.json b/res/pokemon/sudowoodo/data.json index ab29c85b3b..b5dd019847 100644 --- a/res/pokemon/sudowoodo/data.json +++ b/res/pokemon/sudowoodo/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", diff --git a/res/pokemon/suicune/data.json b/res/pokemon/suicune/data.json index 47b89e0223..304d321e72 100644 --- a/res/pokemon/suicune/data.json +++ b/res/pokemon/suicune/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/sunflora/data.json b/res/pokemon/sunflora/data.json index 77432fdcbf..adf3b5bfd7 100644 --- a/res/pokemon/sunflora/data.json +++ b/res/pokemon/sunflora/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/sunkern/data.json b/res/pokemon/sunkern/data.json index a0f375f3a1..6df1d40230 100644 --- a/res/pokemon/sunkern/data.json +++ b/res/pokemon/sunkern/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_COBA_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index fe99d3a908..094f9a30a9 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "BUG" + "EGG_GROUP_WATER_1", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWIFT_SWIM", diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index 161ef02b1f..a13ef0acff 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "FLYING", - "DRAGON" + "EGG_GROUP_FLYING", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_NATURAL_CURE", diff --git a/res/pokemon/swalot/data.json b/res/pokemon/swalot/data.json index c3fc06c19a..bfee8a44a1 100644 --- a/res/pokemon/swalot/data.json +++ b/res/pokemon/swalot/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BIG_PEARL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LIQUID_OOZE", diff --git a/res/pokemon/swampert/data.json b/res/pokemon/swampert/data.json index 95609ef10e..323aa3b76a 100644 --- a/res/pokemon/swampert/data.json +++ b/res/pokemon/swampert/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/swellow/data.json b/res/pokemon/swellow/data.json index fc4ec5dc81..be69a6426b 100644 --- a/res/pokemon/swellow/data.json +++ b/res/pokemon/swellow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHARTI_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index ea2637b141..45605e8dd9 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index e42b4fc472..ba4260c677 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHARTI_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index 10d13443c4..443d7a5791 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/tangrowth/data.json b/res/pokemon/tangrowth/data.json index 27163fc50c..9d2905efa2 100644 --- a/res/pokemon/tangrowth/data.json +++ b/res/pokemon/tangrowth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/tauros/data.json b/res/pokemon/tauros/data.json index 8a0a776246..f392182942 100644 --- a/res/pokemon/tauros/data.json +++ b/res/pokemon/tauros/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index ab205e5c36..3ba6a12ce6 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index 557b80f5b0..92ab28d222 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/tentacruel/data.json b/res/pokemon/tentacruel/data.json index 338178ca7d..4b59dc223f 100644 --- a/res/pokemon/tentacruel/data.json +++ b/res/pokemon/tentacruel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "WATER_3", - "WATER_3" + "EGG_GROUP_WATER_3", + "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_CLEAR_BODY", diff --git a/res/pokemon/togekiss/data.json b/res/pokemon/togekiss/data.json index bfbcec1feb..d0ced1f859 100644 --- a/res/pokemon/togekiss/data.json +++ b/res/pokemon/togekiss/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FLYING", - "FAIRY" + "EGG_GROUP_FLYING", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HUSTLE", diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index 713ab4f454..61b9eb4806 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_HUSTLE", diff --git a/res/pokemon/togetic/data.json b/res/pokemon/togetic/data.json index 9054a811b7..fc5ed77251 100644 --- a/res/pokemon/togetic/data.json +++ b/res/pokemon/togetic/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FLYING", - "FAIRY" + "EGG_GROUP_FLYING", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HUSTLE", diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index d86d806fe8..a63d6b1a3e 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/torkoal/data.json b/res/pokemon/torkoal/data.json index 33c4a2a028..dadc367214 100644 --- a/res/pokemon/torkoal/data.json +++ b/res/pokemon/torkoal/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_WHITE_SMOKE", diff --git a/res/pokemon/torterra/data.json b/res/pokemon/torterra/data.json index 79cdcabc6f..e918089ec6 100644 --- a/res/pokemon/torterra/data.json +++ b/res/pokemon/torterra/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index 2e75a6e50c..346d3edff7 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/toxicroak/data.json b/res/pokemon/toxicroak/data.json index addb9fca22..1275ad75b5 100644 --- a/res/pokemon/toxicroak/data.json +++ b/res/pokemon/toxicroak/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_BLACK_SLUDGE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "HUMAN_LIKE", - "HUMAN_LIKE" + "EGG_GROUP_HUMAN_LIKE", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ANTICIPATION", diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index 75e481c2e9..3e9826ef67 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SOFT_SAND" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index 31fcbcb194..76bad55730 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "DRAGON" + "EGG_GROUP_MONSTER", + "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/tropius/data.json b/res/pokemon/tropius/data.json index 1131376959..fcf448c3b2 100644 --- a/res/pokemon/tropius/data.json +++ b/res/pokemon/tropius/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index f69f12b08d..dd4b2599da 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/typhlosion/data.json b/res/pokemon/typhlosion/data.json index fc7b878268..fdf0bb5221 100644 --- a/res/pokemon/typhlosion/data.json +++ b/res/pokemon/typhlosion/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", diff --git a/res/pokemon/tyranitar/data.json b/res/pokemon/tyranitar/data.json index 4ac43f8244..29edc03c5b 100644 --- a/res/pokemon/tyranitar/data.json +++ b/res/pokemon/tyranitar/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "MONSTER", - "MONSTER" + "EGG_GROUP_MONSTER", + "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_SAND_STREAM", diff --git a/res/pokemon/tyrogue/data.json b/res/pokemon/tyrogue/data.json index c702d6d148..75759c96de 100644 --- a/res/pokemon/tyrogue/data.json +++ b/res/pokemon/tyrogue/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 25, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/umbreon/data.json b/res/pokemon/umbreon/data.json index 89b1ae9cd1..d9e4084b66 100644 --- a/res/pokemon/umbreon/data.json +++ b/res/pokemon/umbreon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 35, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/unown/data.json b/res/pokemon/unown/data.json index c7e1dbb8f7..fc0a72e22e 100644 --- a/res/pokemon/unown/data.json +++ b/res/pokemon/unown/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/ursaring/data.json b/res/pokemon/ursaring/data.json index 1bd0633c8a..1d314cc821 100644 --- a/res/pokemon/ursaring/data.json +++ b/res/pokemon/ursaring/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_GUTS", diff --git a/res/pokemon/uxie/data.json b/res/pokemon/uxie/data.json index efcc44fc77..92b244fccf 100644 --- a/res/pokemon/uxie/data.json +++ b/res/pokemon/uxie/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 140, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/vaporeon/data.json b/res/pokemon/vaporeon/data.json index 44bc66a3cb..e40ab5bc40 100644 --- a/res/pokemon/vaporeon/data.json +++ b/res/pokemon/vaporeon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 35, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_WATER_ABSORB", diff --git a/res/pokemon/venomoth/data.json b/res/pokemon/venomoth/data.json index 84d6ae40ba..0ee42c1204 100644 --- a/res/pokemon/venomoth/data.json +++ b/res/pokemon/venomoth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SHED_SHELL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index c34d1b0078..a632b72af1 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", diff --git a/res/pokemon/venusaur/data.json b/res/pokemon/venusaur/data.json index 3326a6913a..cd5609fb9f 100644 --- a/res/pokemon/venusaur/data.json +++ b/res/pokemon/venusaur/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "GRASS" + "EGG_GROUP_MONSTER", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", diff --git a/res/pokemon/vespiquen/data.json b/res/pokemon/vespiquen/data.json index 504e7a3daa..b24b2b1625 100644 --- a/res/pokemon/vespiquen/data.json +++ b/res/pokemon/vespiquen/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_POISON_BARB" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index 8c7d2cc936..008328ca95 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/victreebel/data.json b/res/pokemon/victreebel/data.json index 7c27cb789e..9c8a58a7d7 100644 --- a/res/pokemon/victreebel/data.json +++ b/res/pokemon/victreebel/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index 0bf6884969..5de5db7f27 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", diff --git a/res/pokemon/vileplume/data.json b/res/pokemon/vileplume/data.json index dbd721b1cd..b9f404b956 100644 --- a/res/pokemon/vileplume/data.json +++ b/res/pokemon/vileplume/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/volbeat/data.json b/res/pokemon/volbeat/data.json index cefa88eff5..b0a2eebbf4 100644 --- a/res/pokemon/volbeat/data.json +++ b/res/pokemon/volbeat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "MALE_ONLY", + "gender_ratio": "GENDER_RATIO_MALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "BUG", - "HUMAN_LIKE" + "EGG_GROUP_BUG", + "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ILLUMINATE", diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index f1af104538..1fef29841a 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "MINERAL", - "MINERAL" + "EGG_GROUP_MINERAL", + "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/vulpix/data.json b/res/pokemon/vulpix/data.json index b170f4824f..8393669471 100644 --- a/res/pokemon/vulpix/data.json +++ b/res/pokemon/vulpix/data.json @@ -26,13 +26,13 @@ "common": "ITEM_RAWST_BERRY", "rare": "ITEM_RAWST_BERRY" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index 4cb0ca40f5..9e11383a0f 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "FIELD", - "WATER_2" + "EGG_GROUP_FIELD", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_WATER_VEIL", diff --git a/res/pokemon/wailord/data.json b/res/pokemon/wailord/data.json index 7c1ffac091..04307e023b 100644 --- a/res/pokemon/wailord/data.json +++ b/res/pokemon/wailord/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 40, "base_friendship": 70, - "exp_rate": "FLUCTUATING", + "exp_rate": "EXP_RATE_FLUCTUATING", "egg_groups": [ - "FIELD", - "WATER_2" + "EGG_GROUP_FIELD", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_WATER_VEIL", diff --git a/res/pokemon/walrein/data.json b/res/pokemon/walrein/data.json index 98b9aba653..7197a1cbed 100644 --- a/res/pokemon/walrein/data.json +++ b/res/pokemon/walrein/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index 2d9b9cea8f..243d36739c 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_12_5", + "gender_ratio": "GENDER_RATIO_FEMALE_12_5", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "WATER_1" + "EGG_GROUP_MONSTER", + "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", diff --git a/res/pokemon/weavile/data.json b/res/pokemon/weavile/data.json index e576e752cf..20cb27c6d9 100644 --- a/res/pokemon/weavile/data.json +++ b/res/pokemon/weavile/data.json @@ -26,13 +26,13 @@ "common": "ITEM_GRIP_CLAW", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 35, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index 984464d797..82325edde9 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", diff --git a/res/pokemon/weepinbell/data.json b/res/pokemon/weepinbell/data.json index 684de0353e..3e31506847 100644 --- a/res/pokemon/weepinbell/data.json +++ b/res/pokemon/weepinbell/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "GRASS", - "GRASS" + "EGG_GROUP_GRASS", + "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", diff --git a/res/pokemon/weezing/data.json b/res/pokemon/weezing/data.json index 803b25d5f6..2816eea5ff 100644 --- a/res/pokemon/weezing/data.json +++ b/res/pokemon/weezing/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SMOKE_BALL" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", diff --git a/res/pokemon/whiscash/data.json b/res/pokemon/whiscash/data.json index 131564a654..a5edda7400 100644 --- a/res/pokemon/whiscash/data.json +++ b/res/pokemon/whiscash/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_2", - "WATER_2" + "EGG_GROUP_WATER_2", + "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_OBLIVIOUS", diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index c4b1aacba7..fd697e985c 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_CHESTO_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_SLOW", + "exp_rate": "EXP_RATE_MEDIUM_SLOW", "egg_groups": [ - "MONSTER", - "FIELD" + "EGG_GROUP_MONSTER", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", diff --git a/res/pokemon/wigglytuff/data.json b/res/pokemon/wigglytuff/data.json index 1c03855b4c..bc75d94c21 100644 --- a/res/pokemon/wigglytuff/data.json +++ b/res/pokemon/wigglytuff/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_75", + "gender_ratio": "GENDER_RATIO_FEMALE_75", "hatch_cycles": 10, "base_friendship": 70, - "exp_rate": "FAST", + "exp_rate": "EXP_RATE_FAST", "egg_groups": [ - "FAIRY", - "FAIRY" + "EGG_GROUP_FAIRY", + "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index 398c20918e..3592e318ba 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FLYING" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", diff --git a/res/pokemon/wobbuffet/data.json b/res/pokemon/wobbuffet/data.json index 9312f9bae3..f6612fc011 100644 --- a/res/pokemon/wobbuffet/data.json +++ b/res/pokemon/wobbuffet/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "AMORPHOUS", - "AMORPHOUS" + "EGG_GROUP_AMORPHOUS", + "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SHADOW_TAG", diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index e41a1dfe5c..bb28cdc6d6 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "WATER_1", - "FIELD" + "EGG_GROUP_WATER_1", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", diff --git a/res/pokemon/wormadam/data.json b/res/pokemon/wormadam/data.json index f8127bedc5..9403fdce52 100644 --- a/res/pokemon/wormadam/data.json +++ b/res/pokemon/wormadam/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", diff --git a/res/pokemon/wormadam/forms/sandy/data.json b/res/pokemon/wormadam/forms/sandy/data.json index 03455926cb..80abde7687 100644 --- a/res/pokemon/wormadam/forms/sandy/data.json +++ b/res/pokemon/wormadam/forms/sandy/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", diff --git a/res/pokemon/wormadam/forms/trash/data.json b/res/pokemon/wormadam/forms/trash/data.json index f6ec1468ff..1a4e976e2c 100644 --- a/res/pokemon/wormadam/forms/trash/data.json +++ b/res/pokemon/wormadam/forms/trash/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_SILVERPOWDER" }, - "gender_ratio": "FEMALE_ONLY", + "gender_ratio": "GENDER_RATIO_FEMALE_ONLY", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", diff --git a/res/pokemon/wurmple/data.json b/res/pokemon/wurmple/data.json index 1accaea49f..3cfcf627f7 100644 --- a/res/pokemon/wurmple/data.json +++ b/res/pokemon/wurmple/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index 6a3066e19f..fe56176a24 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SHADOW_TAG", diff --git a/res/pokemon/xatu/data.json b/res/pokemon/xatu/data.json index d7fa70af69..a7ba744e2d 100644 --- a/res/pokemon/xatu/data.json +++ b/res/pokemon/xatu/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_SYNCHRONIZE", diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index 44d802a621..8d4e9333d8 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_WIDE_LENS" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", diff --git a/res/pokemon/yanmega/data.json b/res/pokemon/yanmega/data.json index d9e29f5d49..204060c181 100644 --- a/res/pokemon/yanmega/data.json +++ b/res/pokemon/yanmega/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_WIDE_LENS" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "BUG", - "BUG" + "EGG_GROUP_BUG", + "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", diff --git a/res/pokemon/zangoose/data.json b/res/pokemon/zangoose/data.json index 2b4b045800..eb17888eec 100644 --- a/res/pokemon/zangoose/data.json +++ b/res/pokemon/zangoose/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_QUICK_CLAW" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 20, "base_friendship": 70, - "exp_rate": "ERRATIC", + "exp_rate": "EXP_RATE_ERRATIC", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_IMMUNITY", diff --git a/res/pokemon/zapdos/data.json b/res/pokemon/zapdos/data.json index c188717cf3..b3dbbd29ad 100644 --- a/res/pokemon/zapdos/data.json +++ b/res/pokemon/zapdos/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "NO_GENDER", + "gender_ratio": "GENDER_RATIO_NO_GENDER", "hatch_cycles": 80, "base_friendship": 35, - "exp_rate": "SLOW", + "exp_rate": "EXP_RATE_SLOW", "egg_groups": [ - "UNDISCOVERED", - "UNDISCOVERED" + "EGG_GROUP_UNDISCOVERED", + "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index 5826040f25..229d28b6a6 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_ORAN_BERRY" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FIELD", - "FIELD" + "EGG_GROUP_FIELD", + "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index ed12a0e48e..bf7e06d8f9 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -26,13 +26,13 @@ "common": "ITEM_NONE", "rare": "ITEM_NONE" }, - "gender_ratio": "FEMALE_50", + "gender_ratio": "GENDER_RATIO_FEMALE_50", "hatch_cycles": 15, "base_friendship": 70, - "exp_rate": "MEDIUM_FAST", + "exp_rate": "EXP_RATE_MEDIUM_FAST", "egg_groups": [ - "FLYING", - "FLYING" + "EGG_GROUP_FLYING", + "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", diff --git a/tools/json2bin/pokemon_personal_data.py b/tools/json2bin/pokemon_personal_data.py index 3d6a2da153..f53872b4d9 100644 --- a/tools/json2bin/pokemon_personal_data.py +++ b/tools/json2bin/pokemon_personal_data.py @@ -3,19 +3,12 @@ import json2bin as j2b -from consts import ( - item, -) - -from consts.pokemon import ( - mon_type, - gender_ratio, - exp_rate, - egg_group, - ability, - color, - tms, - species +from consts.generated.py import ( + abilities, + items, + pokemon, + species, + tm_learnset ) @@ -29,7 +22,7 @@ def parse_ev_yields(ev_yields: dict, size: int, _: None) -> bytes: return packed.to_bytes(size, 'little') def parse_color(sprite: dict, size: int, _: None) -> bytes: - packed = color.PokemonColor[sprite['color']].value + packed = pokemon.PokemonColor[sprite['color']].value packed = packed + ((1 if sprite['flip_sprite'] else 0) << 7) return packed.to_bytes(size, 'little') @@ -41,25 +34,25 @@ def parse_color(sprite: dict, size: int, _: None) -> bytes: .register('base_stats.speed', 1, j2b.parse_int) \ .register('base_stats.special_attack', 1, j2b.parse_int) \ .register('base_stats.special_defense', 1, j2b.parse_int) \ - .register('types.0', 1, j2b.parse_const, mon_type.PokeType) \ - .register('types.1', 1, j2b.parse_const, mon_type.PokeType) \ + .register('types.0', 1, j2b.parse_const, pokemon.PokemonType) \ + .register('types.1', 1, j2b.parse_const, pokemon.PokemonType) \ .register('catch_rate', 1, j2b.parse_int) \ .register('base_exp_reward', 1, j2b.parse_int) \ .register('ev_yields', 2, parse_ev_yields) \ - .register('held_items.common', 2, j2b.parse_const, item.Item) \ - .register('held_items.rare', 2, j2b.parse_const, item.Item) \ - .register('gender_ratio', 1, j2b.parse_const, gender_ratio.PokemonGenderRatio) \ + .register('held_items.common', 2, j2b.parse_const, items.Item) \ + .register('held_items.rare', 2, j2b.parse_const, items.Item) \ + .register('gender_ratio', 1, j2b.parse_const, pokemon.PokemonGenderRatio) \ .register('hatch_cycles', 1, j2b.parse_int) \ .register('base_friendship', 1, j2b.parse_int) \ - .register('exp_rate', 1, j2b.parse_const, exp_rate.PokemonExpRate) \ - .register('egg_groups.0', 1, j2b.parse_const, egg_group.PokemonEggGroup) \ - .register('egg_groups.1', 1, j2b.parse_const, egg_group.PokemonEggGroup) \ - .register('abilities.0', 1, j2b.parse_const, ability.PokemonAbility) \ - .register('abilities.1', 1, j2b.parse_const, ability.PokemonAbility) \ + .register('exp_rate', 1, j2b.parse_const, pokemon.PokemonExpRate) \ + .register('egg_groups.0', 1, j2b.parse_const, pokemon.PokemonEggGroup) \ + .register('egg_groups.1', 1, j2b.parse_const, pokemon.PokemonEggGroup) \ + .register('abilities.0', 1, j2b.parse_const, abilities.Ability) \ + .register('abilities.1', 1, j2b.parse_const, abilities.Ability) \ .register('great_marsh_flee_rate', 1, j2b.parse_int) \ .register('sprite', 1, parse_color) \ .pad(2) \ - .register('learnset.tms', 16, j2b.pack_flags, tms.PokemonLearnsetTMs) + .register('learnset.tms', 16, j2b.pack_flags, tm_learnset.TMLearnsetFlags) FORM_INDICES = { diff --git a/tools/scripts/make_height.py b/tools/scripts/make_height.py index 7957fa91ed..004a1f06f6 100644 --- a/tools/scripts/make_height.py +++ b/tools/scripts/make_height.py @@ -4,6 +4,8 @@ import pathlib import subprocess +from consts.generated.py.pokemon import PokemonGenderRatio + argparser = argparse.ArgumentParser( prog='pl_poke_icon.narc packer', @@ -43,8 +45,11 @@ pkdata = json.load(data_file) gender_ratio = pkdata['gender_ratio'] - female_only = (gender_ratio == 'FEMALE_ONLY') - male_or_genderless = (gender_ratio in ['MALE_ONLY', 'NO_GENDER']) + female_only = (gender_ratio == PokemonGenderRatio.GENDER_RATIO_FEMALE_ONLY.name) + male_or_genderless = (gender_ratio in [ + PokemonGenderRatio.GENDER_RATIO_MALE_ONLY.name, + PokemonGenderRatio.GENDER_RATIO_NO_GENDER.name + ]) j = 0 for face in ['back', 'front']: From 646db45f4aee7643680d99e3ae00356a8c58004a Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 21:46:26 -0800 Subject: [PATCH 07/10] Migrate pokemon_wotbl_data.py to constgen headers --- tools/json2bin/pokemon_wotbl_data.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/json2bin/pokemon_wotbl_data.py b/tools/json2bin/pokemon_wotbl_data.py index c2585a181d..317791c402 100644 --- a/tools/json2bin/pokemon_wotbl_data.py +++ b/tools/json2bin/pokemon_wotbl_data.py @@ -1,13 +1,9 @@ #!/usr/bin/env python3 import pathlib - import json2bin as j2b -from consts import ( - moves -) - -from consts.pokemon import ( +from consts.generated.py import ( + moves, species ) From fc3d1f102b717d3936d825037d5fe3f254b0fba0 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 21:55:26 -0800 Subject: [PATCH 08/10] Migrate trainer_data.py to constgen headers --- tools/json2bin/trainer_data.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/json2bin/trainer_data.py b/tools/json2bin/trainer_data.py index 4db7208119..54aebab64e 100644 --- a/tools/json2bin/trainer_data.py +++ b/tools/json2bin/trainer_data.py @@ -2,14 +2,14 @@ from collections.abc import Mapping, Sequence import pathlib, functools -from consts import ( - item, +from consts.generated.py import ( + items, moves, - trainer + species, + trainer, + trainer_ai ) -from consts.pokemon import species - import json2bin as j2b @@ -18,7 +18,7 @@ def derive_data_flags(party: Sequence[Mapping], *args) -> bytes: defined_items = False for mon in party: defined_moves |= functools.reduce(lambda x, y: x or y, - map(lambda move: move != moves.Move.MOVE_0000.name, + map(lambda move: move != moves.Move.MOVE_NONE.name, mon.get('moves', []) if mon.get('moves', []) else []), False) defined_items |= bool(mon.get('item', None)) @@ -29,10 +29,10 @@ def derive_data_flags(party: Sequence[Mapping], *args) -> bytes: def parse_trainer_items(item_list: Sequence[str], *args) -> bytes: item_bin = bytearray([]) for item_str in item_list: - item_bin.extend(item.Item[item_str].value.to_bytes(2, 'little')) + item_bin.extend(items.Item[item_str].value.to_bytes(2, 'little')) for _ in range(4 - len(item_list)): - item_bin.extend(item.Item.ITEM_NONE.value.to_bytes(2, 'little')) + item_bin.extend(items.Item.ITEM_NONE.value.to_bytes(2, 'little')) return item_bin @@ -42,7 +42,7 @@ def parse_poke_moves(move_list: Sequence[str], *args) -> bytes: move_bin.extend(moves.Move[move_str].value.to_bytes(2, 'little')) for _ in range(4 - len(move_list)): - move_bin.extend(moves.Move.MOVE_0000.value.to_bytes(2, 'little')) + move_bin.extend(moves.Move.MOVE_NONE.value.to_bytes(2, 'little')) return move_bin @@ -55,7 +55,7 @@ def parse_party_mon(mon: dict, has_moves: bool, has_items: bool) -> bytes: binary_mon.extend(j2b.parse_int(species_and_form, 2)) if has_items: - binary_mon.extend(j2b.parse_const(mon['item'], 2, item.Item)) + binary_mon.extend(j2b.parse_const(mon['item'], 2, items.Item)) if has_moves: binary_mon.extend(parse_poke_moves(mon['moves'])) @@ -90,7 +90,7 @@ def parse_party_mons(party_list: Sequence[Mapping], *args) -> bytes: .register('party', 1, lambda party, size, _: j2b.parse_int(len(party), size, _)) \ .register('items', 8, parse_trainer_items) \ - .register('ai_flags', 4, j2b.pack_flags, trainer.AIFlag) \ + .register('ai_flags', 4, j2b.pack_flags, trainer_ai.AIFlag) \ .register('double_battle', 1, lambda val, size, _: j2b.parse_int(2 if val else 0, size, _)) \ .pad(3) From 4dcd0bdd7bfbbf2f9e793b574d2705ead050ea2b Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 22:28:27 -0800 Subject: [PATCH 09/10] Migrate movedata.py to constgen headers --- res/battle/moves/0000/data.json | 2 +- res/battle/moves/0468/data.json | 8 +++---- res/battle/moves/0469/data.json | 8 +++---- res/battle/moves/0470/data.json | 8 +++---- res/battle/moves/absorb/data.json | 6 ++--- res/battle/moves/acid/data.json | 6 ++--- res/battle/moves/acid_armor/data.json | 6 ++--- res/battle/moves/acupressure/data.json | 6 ++--- res/battle/moves/aerial_ace/data.json | 10 ++++----- res/battle/moves/aeroblast/data.json | 10 ++++----- res/battle/moves/agility/data.json | 6 ++--- res/battle/moves/air_cutter/data.json | 8 +++---- res/battle/moves/air_slash/data.json | 8 +++---- res/battle/moves/amnesia/data.json | 4 ++-- res/battle/moves/ancient_power/data.json | 6 ++--- res/battle/moves/aqua_jet/data.json | 10 ++++----- res/battle/moves/aqua_ring/data.json | 2 +- res/battle/moves/aqua_tail/data.json | 10 ++++----- res/battle/moves/arm_thrust/data.json | 12 +++++----- res/battle/moves/aromatherapy/data.json | 4 ++-- res/battle/moves/assist/data.json | 2 +- res/battle/moves/assurance/data.json | 10 ++++----- res/battle/moves/astonish/data.json | 10 ++++----- res/battle/moves/attack_order/data.json | 8 +++---- res/battle/moves/attract/data.json | 8 +++---- res/battle/moves/aura_sphere/data.json | 10 ++++----- res/battle/moves/aurora_beam/data.json | 6 ++--- res/battle/moves/avalanche/data.json | 10 ++++----- res/battle/moves/barrage/data.json | 10 ++++----- res/battle/moves/barrier/data.json | 6 ++--- res/battle/moves/baton_pass/data.json | 2 +- res/battle/moves/beat_up/data.json | 10 ++++----- res/battle/moves/belly_drum/data.json | 6 ++--- res/battle/moves/bide/data.json | 10 ++++----- res/battle/moves/bind/data.json | 12 +++++----- res/battle/moves/bite/data.json | 8 +++---- res/battle/moves/blast_burn/data.json | 8 +++---- res/battle/moves/blaze_kick/data.json | 8 +++---- res/battle/moves/blizzard/data.json | 8 +++---- res/battle/moves/block/data.json | 8 +++---- res/battle/moves/body_slam/data.json | 10 ++++----- res/battle/moves/bone_club/data.json | 8 +++---- res/battle/moves/bone_rush/data.json | 10 ++++----- res/battle/moves/bonemerang/data.json | 10 ++++----- res/battle/moves/bounce/data.json | 10 ++++----- res/battle/moves/brave_bird/data.json | 12 +++++----- res/battle/moves/brick_break/data.json | 10 ++++----- res/battle/moves/brine/data.json | 8 +++---- res/battle/moves/bubble/data.json | 6 ++--- res/battle/moves/bubble_beam/data.json | 6 ++--- res/battle/moves/bug_bite/data.json | 12 +++++----- res/battle/moves/bug_buzz/data.json | 6 ++--- res/battle/moves/bulk_up/data.json | 6 ++--- res/battle/moves/bullet_punch/data.json | 12 +++++----- res/battle/moves/bullet_seed/data.json | 10 ++++----- res/battle/moves/calm_mind/data.json | 4 ++-- res/battle/moves/camouflage/data.json | 6 ++--- res/battle/moves/captivate/data.json | 10 ++++----- res/battle/moves/charge/data.json | 4 ++-- res/battle/moves/charge_beam/data.json | 8 +++---- res/battle/moves/charm/data.json | 10 ++++----- res/battle/moves/chatter/data.json | 6 ++--- res/battle/moves/clamp/data.json | 10 ++++----- res/battle/moves/close_combat/data.json | 12 +++++----- res/battle/moves/comet_punch/data.json | 12 +++++----- res/battle/moves/confuse_ray/data.json | 8 +++---- res/battle/moves/confusion/data.json | 6 ++--- res/battle/moves/constrict/data.json | 8 +++---- res/battle/moves/conversion/data.json | 4 ++-- res/battle/moves/conversion_2/data.json | 2 +- res/battle/moves/copycat/data.json | 2 +- res/battle/moves/cosmic_power/data.json | 6 ++--- res/battle/moves/cotton_spore/data.json | 10 ++++----- res/battle/moves/counter/data.json | 4 ++-- res/battle/moves/covet/data.json | 8 +++---- res/battle/moves/crabhammer/data.json | 12 +++++----- res/battle/moves/cross_chop/data.json | 10 ++++----- res/battle/moves/cross_poison/data.json | 10 ++++----- res/battle/moves/crunch/data.json | 8 +++---- res/battle/moves/crush_claw/data.json | 8 +++---- res/battle/moves/crush_grip/data.json | 10 ++++----- res/battle/moves/curse/data.json | 4 ++-- res/battle/moves/cut/data.json | 12 +++++----- res/battle/moves/dark_pulse/data.json | 8 +++---- res/battle/moves/dark_void/data.json | 10 ++++----- res/battle/moves/defend_order/data.json | 4 ++-- res/battle/moves/defense_curl/data.json | 6 ++--- res/battle/moves/defog/data.json | 6 ++--- res/battle/moves/destiny_bond/data.json | 2 +- res/battle/moves/detect/data.json | 2 +- res/battle/moves/dig/data.json | 10 ++++----- res/battle/moves/disable/data.json | 6 ++--- res/battle/moves/discharge/data.json | 8 +++---- res/battle/moves/dive/data.json | 10 ++++----- res/battle/moves/dizzy_punch/data.json | 8 +++---- res/battle/moves/doom_desire/data.json | 4 ++-- res/battle/moves/double_edge/data.json | 12 +++++----- res/battle/moves/double_hit/data.json | 10 ++++----- res/battle/moves/double_kick/data.json | 12 +++++----- res/battle/moves/double_slap/data.json | 12 +++++----- res/battle/moves/double_team/data.json | 6 ++--- res/battle/moves/draco_meteor/data.json | 8 +++---- res/battle/moves/dragon_breath/data.json | 8 +++---- res/battle/moves/dragon_claw/data.json | 10 ++++----- res/battle/moves/dragon_dance/data.json | 4 ++-- res/battle/moves/dragon_pulse/data.json | 8 +++---- res/battle/moves/dragon_rage/data.json | 8 +++---- res/battle/moves/dragon_rush/data.json | 10 ++++----- res/battle/moves/drain_punch/data.json | 10 ++++----- res/battle/moves/dream_eater/data.json | 6 ++--- res/battle/moves/drill_peck/data.json | 10 ++++----- res/battle/moves/dynamic_punch/data.json | 10 ++++----- res/battle/moves/earth_power/data.json | 8 +++---- res/battle/moves/earthquake/data.json | 8 +++---- res/battle/moves/egg_bomb/data.json | 8 +++---- res/battle/moves/embargo/data.json | 6 ++--- res/battle/moves/ember/data.json | 8 +++---- res/battle/moves/encore/data.json | 6 ++--- res/battle/moves/endeavor/data.json | 12 +++++----- res/battle/moves/endure/data.json | 4 ++-- res/battle/moves/energy_ball/data.json | 6 ++--- res/battle/moves/eruption/data.json | 8 +++---- res/battle/moves/explosion/data.json | 8 +++---- res/battle/moves/extrasensory/data.json | 6 ++--- res/battle/moves/extreme_speed/data.json | 12 +++++----- res/battle/moves/facade/data.json | 10 ++++----- res/battle/moves/faint_attack/data.json | 10 ++++----- res/battle/moves/fake_out/data.json | 8 +++---- res/battle/moves/fake_tears/data.json | 10 ++++----- res/battle/moves/false_swipe/data.json | 12 +++++----- res/battle/moves/feather_dance/data.json | 8 +++---- res/battle/moves/feint/data.json | 2 +- res/battle/moves/fire_blast/data.json | 8 +++---- res/battle/moves/fire_fang/data.json | 10 ++++----- res/battle/moves/fire_punch/data.json | 8 +++---- res/battle/moves/fire_spin/data.json | 8 +++---- res/battle/moves/fissure/data.json | 8 +++---- res/battle/moves/flail/data.json | 12 +++++----- res/battle/moves/flame_wheel/data.json | 8 +++---- res/battle/moves/flamethrower/data.json | 6 ++--- res/battle/moves/flare_blitz/data.json | 10 ++++----- res/battle/moves/flash/data.json | 10 ++++----- res/battle/moves/flash_cannon/data.json | 8 +++---- res/battle/moves/flatter/data.json | 8 +++---- res/battle/moves/fling/data.json | 6 ++--- res/battle/moves/fly/data.json | 12 +++++----- res/battle/moves/focus_blast/data.json | 8 +++---- res/battle/moves/focus_energy/data.json | 6 ++--- res/battle/moves/focus_punch/data.json | 8 +++---- res/battle/moves/follow_me/data.json | 2 +- res/battle/moves/force_palm/data.json | 10 ++++----- res/battle/moves/foresight/data.json | 8 +++---- res/battle/moves/frenzy_plant/data.json | 10 ++++----- res/battle/moves/frustration/data.json | 12 +++++----- res/battle/moves/fury_attack/data.json | 12 +++++----- res/battle/moves/fury_cutter/data.json | 12 +++++----- res/battle/moves/fury_swipes/data.json | 12 +++++----- res/battle/moves/future_sight/data.json | 2 +- res/battle/moves/gastro_acid/data.json | 8 +++---- res/battle/moves/giga_drain/data.json | 6 ++--- res/battle/moves/giga_impact/data.json | 12 +++++----- res/battle/moves/glare/data.json | 8 +++---- res/battle/moves/grass_knot/data.json | 12 +++++----- res/battle/moves/grass_whistle/data.json | 8 +++---- res/battle/moves/gravity/data.json | 2 +- res/battle/moves/growl/data.json | 10 ++++----- res/battle/moves/growth/data.json | 6 ++--- res/battle/moves/grudge/data.json | 2 +- res/battle/moves/guard_swap/data.json | 6 ++--- res/battle/moves/guillotine/data.json | 8 +++---- res/battle/moves/gunk_shot/data.json | 10 ++++----- res/battle/moves/gust/data.json | 8 +++---- res/battle/moves/gyro_ball/data.json | 10 ++++----- res/battle/moves/hail/data.json | 4 ++-- res/battle/moves/hammer_arm/data.json | 10 ++++----- res/battle/moves/harden/data.json | 6 ++--- res/battle/moves/haze/data.json | 2 +- res/battle/moves/head_smash/data.json | 12 +++++----- res/battle/moves/headbutt/data.json | 10 ++++----- res/battle/moves/heal_bell/data.json | 6 ++--- res/battle/moves/heal_block/data.json | 6 ++--- res/battle/moves/heal_order/data.json | 4 ++-- res/battle/moves/healing_wish/data.json | 2 +- res/battle/moves/heart_swap/data.json | 6 ++--- res/battle/moves/heat_wave/data.json | 6 ++--- res/battle/moves/helping_hand/data.json | 2 +- res/battle/moves/hi_jump_kick/data.json | 10 ++++----- res/battle/moves/hidden_power/data.json | 8 +++---- res/battle/moves/horn_attack/data.json | 10 ++++----- res/battle/moves/horn_drill/data.json | 8 +++---- res/battle/moves/howl/data.json | 4 ++-- res/battle/moves/hydro_cannon/data.json | 10 ++++----- res/battle/moves/hydro_pump/data.json | 10 ++++----- res/battle/moves/hyper_beam/data.json | 10 ++++----- res/battle/moves/hyper_fang/data.json | 8 +++---- res/battle/moves/hyper_voice/data.json | 6 ++--- res/battle/moves/hypnosis/data.json | 8 +++---- res/battle/moves/ice_ball/data.json | 10 ++++----- res/battle/moves/ice_beam/data.json | 6 ++--- res/battle/moves/ice_fang/data.json | 10 ++++----- res/battle/moves/ice_punch/data.json | 8 +++---- res/battle/moves/ice_shard/data.json | 8 +++---- res/battle/moves/icicle_spear/data.json | 10 ++++----- res/battle/moves/icy_wind/data.json | 6 ++--- res/battle/moves/imprison/data.json | 2 +- res/battle/moves/ingrain/data.json | 6 ++--- res/battle/moves/iron_defense/data.json | 6 ++--- res/battle/moves/iron_head/data.json | 10 ++++----- res/battle/moves/iron_tail/data.json | 8 +++---- res/battle/moves/judgment/data.json | 8 +++---- res/battle/moves/jump_kick/data.json | 10 ++++----- res/battle/moves/karate_chop/data.json | 12 +++++----- res/battle/moves/kinesis/data.json | 10 ++++----- res/battle/moves/knock_off/data.json | 8 +++---- res/battle/moves/last_resort/data.json | 10 ++++----- res/battle/moves/lava_plume/data.json | 8 +++---- res/battle/moves/leaf_blade/data.json | 10 ++++----- res/battle/moves/leaf_storm/data.json | 10 ++++----- res/battle/moves/leech_life/data.json | 8 +++---- res/battle/moves/leech_seed/data.json | 8 +++---- res/battle/moves/leer/data.json | 8 +++---- res/battle/moves/lick/data.json | 10 ++++----- res/battle/moves/light_screen/data.json | 6 ++--- res/battle/moves/lock_on/data.json | 6 ++--- res/battle/moves/lovely_kiss/data.json | 8 +++---- res/battle/moves/low_kick/data.json | 12 +++++----- res/battle/moves/lucky_chant/data.json | 4 ++-- res/battle/moves/lunar_dance/data.json | 4 ++-- res/battle/moves/luster_purge/data.json | 6 ++--- res/battle/moves/mach_punch/data.json | 12 +++++----- res/battle/moves/magic_coat/data.json | 2 +- res/battle/moves/magical_leaf/data.json | 8 +++---- res/battle/moves/magma_storm/data.json | 10 ++++----- res/battle/moves/magnet_bomb/data.json | 8 +++---- res/battle/moves/magnet_rise/data.json | 2 +- res/battle/moves/magnitude/data.json | 8 +++---- res/battle/moves/me_first/data.json | 4 ++-- res/battle/moves/mean_look/data.json | 8 +++---- res/battle/moves/meditate/data.json | 4 ++-- res/battle/moves/mega_drain/data.json | 6 ++--- res/battle/moves/mega_kick/data.json | 12 +++++----- res/battle/moves/mega_punch/data.json | 10 ++++----- res/battle/moves/megahorn/data.json | 12 +++++----- res/battle/moves/memento/data.json | 6 ++--- res/battle/moves/meson.build | 2 ++ res/battle/moves/metal_burst/data.json | 4 ++-- res/battle/moves/metal_claw/data.json | 8 +++---- res/battle/moves/metal_sound/data.json | 8 +++---- res/battle/moves/meteor_mash/data.json | 10 ++++----- res/battle/moves/metronome/data.json | 4 ++-- res/battle/moves/milk_drink/data.json | 4 ++-- res/battle/moves/mimic/data.json | 4 ++-- res/battle/moves/mind_reader/data.json | 6 ++--- res/battle/moves/minimize/data.json | 4 ++-- res/battle/moves/miracle_eye/data.json | 6 ++--- res/battle/moves/mirror_coat/data.json | 2 +- res/battle/moves/mirror_move/data.json | 2 +- res/battle/moves/mirror_shot/data.json | 8 +++---- res/battle/moves/mist/data.json | 4 ++-- res/battle/moves/mist_ball/data.json | 8 +++---- res/battle/moves/moonlight/data.json | 6 ++--- res/battle/moves/morning_sun/data.json | 4 ++-- res/battle/moves/mud_bomb/data.json | 8 +++---- res/battle/moves/mud_shot/data.json | 8 +++---- res/battle/moves/mud_slap/data.json | 6 ++--- res/battle/moves/mud_sport/data.json | 2 +- res/battle/moves/muddy_water/data.json | 8 +++---- res/battle/moves/nasty_plot/data.json | 6 ++--- res/battle/moves/natural_gift/data.json | 8 +++---- res/battle/moves/nature_power/data.json | 4 ++-- res/battle/moves/needle_arm/data.json | 8 +++---- res/battle/moves/night_shade/data.json | 8 +++---- res/battle/moves/night_slash/data.json | 10 ++++----- res/battle/moves/nightmare/data.json | 6 ++--- res/battle/moves/octazooka/data.json | 6 ++--- res/battle/moves/odor_sleuth/data.json | 8 +++---- res/battle/moves/ominous_wind/data.json | 8 +++---- res/battle/moves/outrage/data.json | 12 +++++----- res/battle/moves/overheat/data.json | 10 ++++----- res/battle/moves/pain_split/data.json | 6 ++--- res/battle/moves/pay_day/data.json | 8 +++---- res/battle/moves/payback/data.json | 10 ++++----- res/battle/moves/peck/data.json | 12 +++++----- res/battle/moves/perish_song/data.json | 4 ++-- res/battle/moves/petal_dance/data.json | 10 ++++----- res/battle/moves/pin_missile/data.json | 10 ++++----- res/battle/moves/pluck/data.json | 12 +++++----- res/battle/moves/poison_fang/data.json | 8 +++---- res/battle/moves/poison_gas/data.json | 8 +++---- res/battle/moves/poison_jab/data.json | 10 ++++----- res/battle/moves/poison_powder/data.json | 10 ++++----- res/battle/moves/poison_sting/data.json | 6 ++--- res/battle/moves/poison_tail/data.json | 10 ++++----- res/battle/moves/pound/data.json | 12 +++++----- res/battle/moves/powder_snow/data.json | 6 ++--- res/battle/moves/power_gem/data.json | 8 +++---- res/battle/moves/power_swap/data.json | 6 ++--- res/battle/moves/power_trick/data.json | 4 ++-- res/battle/moves/power_whip/data.json | 12 +++++----- res/battle/moves/present/data.json | 6 ++--- res/battle/moves/protect/data.json | 2 +- res/battle/moves/psybeam/data.json | 6 ++--- res/battle/moves/psych_up/data.json | 6 ++--- res/battle/moves/psychic/data.json | 6 ++--- res/battle/moves/psycho_boost/data.json | 10 ++++----- res/battle/moves/psycho_cut/data.json | 8 +++---- res/battle/moves/psycho_shift/data.json | 6 ++--- res/battle/moves/psywave/data.json | 8 +++---- res/battle/moves/punishment/data.json | 12 +++++----- res/battle/moves/pursuit/data.json | 10 ++++----- res/battle/moves/quick_attack/data.json | 12 +++++----- res/battle/moves/rage/data.json | 10 ++++----- res/battle/moves/rain_dance/data.json | 2 +- res/battle/moves/rapid_spin/data.json | 10 ++++----- res/battle/moves/razor_leaf/data.json | 8 +++---- res/battle/moves/razor_wind/data.json | 8 +++---- res/battle/moves/recover/data.json | 6 ++--- res/battle/moves/recycle/data.json | 4 ++-- res/battle/moves/reflect/data.json | 6 ++--- res/battle/moves/refresh/data.json | 4 ++-- res/battle/moves/rest/data.json | 6 ++--- res/battle/moves/return/data.json | 12 +++++----- res/battle/moves/revenge/data.json | 10 ++++----- res/battle/moves/reversal/data.json | 12 +++++----- res/battle/moves/roar/data.json | 8 +++---- res/battle/moves/roar_of_time/data.json | 8 +++---- res/battle/moves/rock_blast/data.json | 8 +++---- res/battle/moves/rock_climb/data.json | 10 ++++----- res/battle/moves/rock_polish/data.json | 4 ++-- res/battle/moves/rock_slide/data.json | 6 ++--- res/battle/moves/rock_smash/data.json | 8 +++---- res/battle/moves/rock_throw/data.json | 8 +++---- res/battle/moves/rock_tomb/data.json | 6 ++--- res/battle/moves/rock_wrecker/data.json | 10 ++++----- res/battle/moves/role_play/data.json | 2 +- res/battle/moves/rolling_kick/data.json | 10 ++++----- res/battle/moves/rollout/data.json | 10 ++++----- res/battle/moves/roost/data.json | 6 ++--- res/battle/moves/sacred_fire/data.json | 8 +++---- res/battle/moves/safeguard/data.json | 6 ++--- res/battle/moves/sand_attack/data.json | 8 +++---- res/battle/moves/sand_tomb/data.json | 8 +++---- res/battle/moves/sandstorm/data.json | 2 +- res/battle/moves/scary_face/data.json | 8 +++---- res/battle/moves/scratch/data.json | 12 +++++----- res/battle/moves/screech/data.json | 10 ++++----- res/battle/moves/secret_power/data.json | 6 ++--- res/battle/moves/seed_bomb/data.json | 8 +++---- res/battle/moves/seed_flare/data.json | 10 ++++----- res/battle/moves/seismic_toss/data.json | 12 +++++----- res/battle/moves/selfdestruct/data.json | 8 +++---- res/battle/moves/shadow_ball/data.json | 6 ++--- res/battle/moves/shadow_claw/data.json | 12 +++++----- res/battle/moves/shadow_force/data.json | 8 +++---- res/battle/moves/shadow_punch/data.json | 10 ++++----- res/battle/moves/shadow_sneak/data.json | 10 ++++----- res/battle/moves/sharpen/data.json | 6 ++--- res/battle/moves/sheer_cold/data.json | 6 ++--- res/battle/moves/shock_wave/data.json | 8 +++---- res/battle/moves/signal_beam/data.json | 8 +++---- res/battle/moves/silver_wind/data.json | 8 +++---- res/battle/moves/sing/data.json | 8 +++---- res/battle/moves/sketch/data.json | 2 +- res/battle/moves/skill_swap/data.json | 6 ++--- res/battle/moves/skull_bash/data.json | 10 ++++----- res/battle/moves/sky_attack/data.json | 8 +++---- res/battle/moves/sky_uppercut/data.json | 12 +++++----- res/battle/moves/slack_off/data.json | 6 ++--- res/battle/moves/slam/data.json | 10 ++++----- res/battle/moves/slash/data.json | 12 +++++----- res/battle/moves/sleep_powder/data.json | 10 ++++----- res/battle/moves/sleep_talk/data.json | 2 +- res/battle/moves/sludge/data.json | 6 ++--- res/battle/moves/sludge_bomb/data.json | 6 ++--- res/battle/moves/smelling_salt/data.json | 8 +++---- res/battle/moves/smog/data.json | 6 ++--- res/battle/moves/smoke_screen/data.json | 8 +++---- res/battle/moves/snatch/data.json | 2 +- res/battle/moves/snore/data.json | 8 +++---- res/battle/moves/softboiled/data.json | 6 ++--- res/battle/moves/solar_beam/data.json | 8 +++---- res/battle/moves/sonic_boom/data.json | 10 ++++----- res/battle/moves/spacial_rend/data.json | 10 ++++----- res/battle/moves/spark/data.json | 8 +++---- res/battle/moves/spider_web/data.json | 8 +++---- res/battle/moves/spike_cannon/data.json | 8 +++---- res/battle/moves/spikes/data.json | 2 +- res/battle/moves/spit_up/data.json | 6 ++--- res/battle/moves/spite/data.json | 6 ++--- res/battle/moves/splash/data.json | 4 ++-- res/battle/moves/spore/data.json | 8 +++---- res/battle/moves/stealth_rock/data.json | 2 +- res/battle/moves/steel_wing/data.json | 10 ++++----- res/battle/moves/stockpile/data.json | 6 ++--- res/battle/moves/stomp/data.json | 10 ++++----- res/battle/moves/stone_edge/data.json | 8 +++---- res/battle/moves/strength/data.json | 10 ++++----- res/battle/moves/string_shot/data.json | 8 +++---- res/battle/moves/struggle/data.json | 10 ++++----- res/battle/moves/stun_spore/data.json | 10 ++++----- res/battle/moves/submission/data.json | 10 ++++----- res/battle/moves/substitute/data.json | 6 ++--- res/battle/moves/sucker_punch/data.json | 12 +++++----- res/battle/moves/sunny_day/data.json | 2 +- res/battle/moves/super_fang/data.json | 10 ++++----- res/battle/moves/superpower/data.json | 10 ++++----- res/battle/moves/supersonic/data.json | 8 +++---- res/battle/moves/surf/data.json | 8 +++---- res/battle/moves/swagger/data.json | 10 ++++----- res/battle/moves/swallow/data.json | 6 ++--- res/battle/moves/sweet_kiss/data.json | 8 +++---- res/battle/moves/sweet_scent/data.json | 8 +++---- res/battle/moves/swift/data.json | 8 +++---- res/battle/moves/switcheroo/data.json | 6 ++--- res/battle/moves/swords_dance/data.json | 6 ++--- res/battle/moves/synthesis/data.json | 6 ++--- res/battle/moves/tackle/data.json | 12 +++++----- res/battle/moves/tail_glow/data.json | 4 ++-- res/battle/moves/tail_whip/data.json | 10 ++++----- res/battle/moves/tailwind/data.json | 4 ++-- res/battle/moves/take_down/data.json | 10 ++++----- res/battle/moves/taunt/data.json | 8 +++---- res/battle/moves/teeter_dance/data.json | 6 ++--- res/battle/moves/teleport/data.json | 2 +- res/battle/moves/thief/data.json | 10 ++++----- res/battle/moves/thrash/data.json | 10 ++++----- res/battle/moves/thunder/data.json | 8 +++---- res/battle/moves/thunder_fang/data.json | 10 ++++----- res/battle/moves/thunder_punch/data.json | 8 +++---- res/battle/moves/thunder_shock/data.json | 6 ++--- res/battle/moves/thunder_wave/data.json | 8 +++---- res/battle/moves/thunderbolt/data.json | 6 ++--- res/battle/moves/tickle/data.json | 10 ++++----- res/battle/moves/torment/data.json | 8 +++---- res/battle/moves/toxic/data.json | 8 +++---- res/battle/moves/toxic_spikes/data.json | 4 ++-- res/battle/moves/transform/data.json | 4 ++-- res/battle/moves/tri_attack/data.json | 6 ++--- res/battle/moves/trick/data.json | 6 ++--- res/battle/moves/trick_room/data.json | 4 ++-- res/battle/moves/triple_kick/data.json | 12 +++++----- res/battle/moves/trump_card/data.json | 10 ++++----- res/battle/moves/twineedle/data.json | 8 +++---- res/battle/moves/twister/data.json | 8 +++---- res/battle/moves/u_turn/data.json | 10 ++++----- res/battle/moves/uproar/data.json | 8 +++---- res/battle/moves/vacuum_wave/data.json | 8 +++---- res/battle/moves/vice_grip/data.json | 10 ++++----- res/battle/moves/vine_whip/data.json | 12 +++++----- res/battle/moves/vital_throw/data.json | 10 ++++----- res/battle/moves/volt_tackle/data.json | 12 +++++----- res/battle/moves/wake_up_slap/data.json | 10 ++++----- res/battle/moves/water_gun/data.json | 8 +++---- res/battle/moves/water_pulse/data.json | 10 ++++----- res/battle/moves/water_sport/data.json | 2 +- res/battle/moves/water_spout/data.json | 6 ++--- res/battle/moves/waterfall/data.json | 12 +++++----- res/battle/moves/weather_ball/data.json | 8 +++---- res/battle/moves/whirlpool/data.json | 10 ++++----- res/battle/moves/whirlwind/data.json | 8 +++---- res/battle/moves/will_o_wisp/data.json | 8 +++---- res/battle/moves/wing_attack/data.json | 12 +++++----- res/battle/moves/wish/data.json | 4 ++-- res/battle/moves/withdraw/data.json | 6 ++--- res/battle/moves/wood_hammer/data.json | 10 ++++----- res/battle/moves/worry_seed/data.json | 8 +++---- res/battle/moves/wrap/data.json | 10 ++++----- res/battle/moves/wring_out/data.json | 10 ++++----- res/battle/moves/x_scissor/data.json | 10 ++++----- res/battle/moves/yawn/data.json | 8 +++---- res/battle/moves/zap_cannon/data.json | 8 +++---- res/battle/moves/zen_headbutt/data.json | 10 ++++----- tools/json2bin/movedata.py | 28 ++++++++++++------------ 473 files changed, 1844 insertions(+), 1842 deletions(-) diff --git a/res/battle/moves/0000/data.json b/res/battle/moves/0000/data.json index 87d0f76de4..ccc7be1b06 100644 --- a/res/battle/moves/0000/data.json +++ b/res/battle/moves/0000/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 0, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", diff --git a/res/battle/moves/0468/data.json b/res/battle/moves/0468/data.json index c834a0c226..73a6611ff0 100644 --- a/res/battle/moves/0468/data.json +++ b/res/battle/moves/0468/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 16, diff --git a/res/battle/moves/0469/data.json b/res/battle/moves/0469/data.json index ff972c2028..d4fb50329a 100644 --- a/res/battle/moves/0469/data.json +++ b/res/battle/moves/0469/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/0470/data.json b/res/battle/moves/0470/data.json index dee7e9008e..2fbdd45702 100644 --- a/res/battle/moves/0470/data.json +++ b/res/battle/moves/0470/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/absorb/data.json b/res/battle/moves/absorb/data.json index a00b86209d..85a8450473 100644 --- a/res/battle/moves/absorb/data.json +++ b/res/battle/moves/absorb/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", + "type": "BATTLE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/acid/data.json b/res/battle/moves/acid/data.json index 6d9c2bb422..6dee850c92 100644 --- a/res/battle/moves/acid/data.json +++ b/res/battle/moves/acid/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/acid_armor/data.json b/res/battle/moves/acid_armor/data.json index 79500a440c..94db67750c 100644 --- a/res/battle/moves/acid_armor/data.json +++ b/res/battle/moves/acid_armor/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_DEF_UP_2", + "type": "BATTLE_EFFECT_DEF_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/acupressure/data.json b/res/battle/moves/acupressure/data.json index 0d8805e5d2..dd112a3ac4 100644 --- a/res/battle/moves/acupressure/data.json +++ b/res/battle/moves/acupressure/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_RANDOM_STAT_UP_2", + "type": "BATTLE_EFFECT_RANDOM_STAT_UP_2", "chance": 0 }, "range": "RANGE_USER_OR_ALLY", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/aerial_ace/data.json b/res/battle/moves/aerial_ace/data.json index 8387dad892..65e05d349c 100644 --- a/res/battle/moves/aerial_ace/data.json +++ b/res/battle/moves/aerial_ace/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/aeroblast/data.json b/res/battle/moves/aeroblast/data.json index 1f1ef4750a..20662777aa 100644 --- a/res/battle/moves/aeroblast/data.json +++ b/res/battle/moves/aeroblast/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/agility/data.json b/res/battle/moves/agility/data.json index ae01d75ac0..32a4011201 100644 --- a/res/battle/moves/agility/data.json +++ b/res/battle/moves/agility/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_SPEED_UP_2", + "type": "BATTLE_EFFECT_SPEED_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 1, diff --git a/res/battle/moves/air_cutter/data.json b/res/battle/moves/air_cutter/data.json index 88e098918e..695c99351c 100644 --- a/res/battle/moves/air_cutter/data.json +++ b/res/battle/moves/air_cutter/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/air_slash/data.json b/res/battle/moves/air_slash/data.json index ac34b4833f..4fa27755f5 100644 --- a/res/battle/moves/air_slash/data.json +++ b/res/battle/moves/air_slash/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/amnesia/data.json b/res/battle/moves/amnesia/data.json index 41b8360c0f..5b8091cb4e 100644 --- a/res/battle/moves/amnesia/data.json +++ b/res/battle/moves/amnesia/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_DEF_UP_2", + "type": "BATTLE_EFFECT_SP_DEF_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/ancient_power/data.json b/res/battle/moves/ancient_power/data.json index c83dccad07..7d902ff853 100644 --- a/res/battle/moves/ancient_power/data.json +++ b/res/battle/moves/ancient_power/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RAISE_ALL_STATS_HIT", + "type": "BATTLE_EFFECT_RAISE_ALL_STATS_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/aqua_jet/data.json b/res/battle/moves/aqua_jet/data.json index 4b288c8e82..169282881e 100644 --- a/res/battle/moves/aqua_jet/data.json +++ b/res/battle/moves/aqua_jet/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 1, diff --git a/res/battle/moves/aqua_ring/data.json b/res/battle/moves/aqua_ring/data.json index d8e0c8c341..e30e26a3f3 100644 --- a/res/battle/moves/aqua_ring/data.json +++ b/res/battle/moves/aqua_ring/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_RESTORE_HP_EVERY_TURN", + "type": "BATTLE_EFFECT_RESTORE_HP_EVERY_TURN", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/aqua_tail/data.json b/res/battle/moves/aqua_tail/data.json index f2e71b1bba..f01d223ceb 100644 --- a/res/battle/moves/aqua_tail/data.json +++ b/res/battle/moves/aqua_tail/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/arm_thrust/data.json b/res/battle/moves/arm_thrust/data.json index 7e40421c95..e2ab283ebf 100644 --- a/res/battle/moves/arm_thrust/data.json +++ b/res/battle/moves/arm_thrust/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/aromatherapy/data.json b/res/battle/moves/aromatherapy/data.json index b32af4eb2a..330820b2b7 100644 --- a/res/battle/moves/aromatherapy/data.json +++ b/res/battle/moves/aromatherapy/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_CURE_PARTY_STATUS", + "type": "BATTLE_EFFECT_CURE_PARTY_STATUS", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 8, diff --git a/res/battle/moves/assist/data.json b/res/battle/moves/assist/data.json index 97ee1d71ed..23e7144328 100644 --- a/res/battle/moves/assist/data.json +++ b/res/battle/moves/assist/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_USE_RANDOM_ALLY_MOVE", + "type": "BATTLE_EFFECT_USE_RANDOM_ALLY_MOVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/assurance/data.json b/res/battle/moves/assurance/data.json index e973573e60..cfe082cc8c 100644 --- a/res/battle/moves/assurance/data.json +++ b/res/battle/moves/assurance/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_IF_TARGET_HIT", + "type": "BATTLE_EFFECT_DOUBLE_POWER_IF_TARGET_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 15, diff --git a/res/battle/moves/astonish/data.json b/res/battle/moves/astonish/data.json index 215443af11..4f613c9ac3 100644 --- a/res/battle/moves/astonish/data.json +++ b/res/battle/moves/astonish/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/attack_order/data.json b/res/battle/moves/attack_order/data.json index b7f1d94fb3..cb504fd82a 100644 --- a/res/battle/moves/attack_order/data.json +++ b/res/battle/moves/attack_order/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/attract/data.json b/res/battle/moves/attract/data.json index 2cac2e4189..50451bc96a 100644 --- a/res/battle/moves/attract/data.json +++ b/res/battle/moves/attract/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_INFATUATE", + "type": "BATTLE_EFFECT_INFATUATE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/aura_sphere/data.json b/res/battle/moves/aura_sphere/data.json index c85962eefd..b9a5cb0a13 100644 --- a/res/battle/moves/aura_sphere/data.json +++ b/res/battle/moves/aura_sphere/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/aurora_beam/data.json b/res/battle/moves/aurora_beam/data.json index 783e4a0fae..885f6dabaf 100644 --- a/res/battle/moves/aurora_beam/data.json +++ b/res/battle/moves/aurora_beam/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_LOWER_ATTACK_HIT", + "type": "BATTLE_EFFECT_LOWER_ATTACK_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/avalanche/data.json b/res/battle/moves/avalanche/data.json index 082f8df513..de08a4bde8 100644 --- a/res/battle/moves/avalanche/data.json +++ b/res/battle/moves/avalanche/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_IF_HIT", + "type": "BATTLE_EFFECT_DOUBLE_POWER_IF_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -4, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 15, diff --git a/res/battle/moves/barrage/data.json b/res/battle/moves/barrage/data.json index 4d516464aa..1427eeca10 100644 --- a/res/battle/moves/barrage/data.json +++ b/res/battle/moves/barrage/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/barrier/data.json b/res/battle/moves/barrier/data.json index d925be4a02..28a272e0ea 100644 --- a/res/battle/moves/barrier/data.json +++ b/res/battle/moves/barrier/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_DEF_UP_2", + "type": "BATTLE_EFFECT_DEF_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/baton_pass/data.json b/res/battle/moves/baton_pass/data.json index b855c36f82..769d1fa3e1 100644 --- a/res/battle/moves/baton_pass/data.json +++ b/res/battle/moves/baton_pass/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_PASS_STATS_AND_STATUS", + "type": "BATTLE_EFFECT_PASS_STATS_AND_STATUS", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/beat_up/data.json b/res/battle/moves/beat_up/data.json index c0bfd3dbb1..16f48d92a2 100644 --- a/res/battle/moves/beat_up/data.json +++ b/res/battle/moves/beat_up/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_BEAT_UP", + "type": "BATTLE_EFFECT_BEAT_UP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/belly_drum/data.json b/res/battle/moves/belly_drum/data.json index 7b6986dfa1..0cc3e7d292 100644 --- a/res/battle/moves/belly_drum/data.json +++ b/res/battle/moves/belly_drum/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_MAX_ATK_LOSE_HALF_MAX_HP", + "type": "BATTLE_EFFECT_MAX_ATK_LOSE_HALF_MAX_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/bide/data.json b/res/battle/moves/bide/data.json index b95ff17c61..a937a54385 100644 --- a/res/battle/moves/bide/data.json +++ b/res/battle/moves/bide/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_BIDE", + "type": "BATTLE_EFFECT_BIDE", "chance": 0 }, "range": "RANGE_USER", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 15, diff --git a/res/battle/moves/bind/data.json b/res/battle/moves/bind/data.json index a81b0c9929..e14776887e 100644 --- a/res/battle/moves/bind/data.json +++ b/res/battle/moves/bind/data.json @@ -6,17 +6,17 @@ "accuracy": 75, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 21, diff --git a/res/battle/moves/bite/data.json b/res/battle/moves/bite/data.json index be3fcdbd16..6cc372d38f 100644 --- a/res/battle/moves/bite/data.json +++ b/res/battle/moves/bite/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/blast_burn/data.json b/res/battle/moves/blast_burn/data.json index d93bfa36f0..eba629e002 100644 --- a/res/battle/moves/blast_burn/data.json +++ b/res/battle/moves/blast_burn/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 22, diff --git a/res/battle/moves/blaze_kick/data.json b/res/battle/moves/blaze_kick/data.json index 2b5c76ca43..f7faed740d 100644 --- a/res/battle/moves/blaze_kick/data.json +++ b/res/battle/moves/blaze_kick/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL_BURN_HIT", + "type": "BATTLE_EFFECT_HIGH_CRITICAL_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/blizzard/data.json b/res/battle/moves/blizzard/data.json index 68e194ad27..f1d20ce7ed 100644 --- a/res/battle/moves/blizzard/data.json +++ b/res/battle/moves/blizzard/data.json @@ -6,15 +6,15 @@ "accuracy": 70, "pp": 5, "effect": { - "type": "MOVE_EFFECT_BLIZZARD", + "type": "BATTLE_EFFECT_BLIZZARD", "chance": 10 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/block/data.json b/res/battle/moves/block/data.json index d8d0ba04e2..2d10e5f70b 100644 --- a/res/battle/moves/block/data.json +++ b/res/battle/moves/block/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_PREVENT_ESCAPE", + "type": "BATTLE_EFFECT_PREVENT_ESCAPE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/body_slam/data.json b/res/battle/moves/body_slam/data.json index 2e40f80ebb..e3d0194e9c 100644 --- a/res/battle/moves/body_slam/data.json +++ b/res/battle/moves/body_slam/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/bone_club/data.json b/res/battle/moves/bone_club/data.json index 448b7e3afb..9d3173fc4d 100644 --- a/res/battle/moves/bone_club/data.json +++ b/res/battle/moves/bone_club/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/bone_rush/data.json b/res/battle/moves/bone_rush/data.json index 6c016b54d0..ff0a72101f 100644 --- a/res/battle/moves/bone_rush/data.json +++ b/res/battle/moves/bone_rush/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 10, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/bonemerang/data.json b/res/battle/moves/bonemerang/data.json index d52a10582c..619ec82971 100644 --- a/res/battle/moves/bonemerang/data.json +++ b/res/battle/moves/bonemerang/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT_TWICE", + "type": "BATTLE_EFFECT_HIT_TWICE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/bounce/data.json b/res/battle/moves/bounce/data.json index bb72233e99..c689a0c260 100644 --- a/res/battle/moves/bounce/data.json +++ b/res/battle/moves/bounce/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 5, "effect": { - "type": "MOVE_EFFECT_BOUNCE", + "type": "BATTLE_EFFECT_BOUNCE", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/brave_bird/data.json b/res/battle/moves/brave_bird/data.json index 8d3640628e..ba97c18ed2 100644 --- a/res/battle/moves/brave_bird/data.json +++ b/res/battle/moves/brave_bird/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOIL_THIRD", + "type": "BATTLE_EFFECT_RECOIL_THIRD", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 18, diff --git a/res/battle/moves/brick_break/data.json b/res/battle/moves/brick_break/data.json index 0d761a5191..9d758f8716 100644 --- a/res/battle/moves/brick_break/data.json +++ b/res/battle/moves/brick_break/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_REMOVE_SCREENS", + "type": "BATTLE_EFFECT_REMOVE_SCREENS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/brine/data.json b/res/battle/moves/brine/data.json index 47453aeb46..f3859ac00c 100644 --- a/res/battle/moves/brine/data.json +++ b/res/battle/moves/brine/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_WHEN_BELOW_HALF", + "type": "BATTLE_EFFECT_DOUBLE_POWER_WHEN_BELOW_HALF", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/bubble/data.json b/res/battle/moves/bubble/data.json index 2ea6064497..27ce4cf78a 100644 --- a/res/battle/moves/bubble/data.json +++ b/res/battle/moves/bubble/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 10 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 2, diff --git a/res/battle/moves/bubble_beam/data.json b/res/battle/moves/bubble_beam/data.json index fce708e09c..a79f16cbd8 100644 --- a/res/battle/moves/bubble_beam/data.json +++ b/res/battle/moves/bubble_beam/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 2, diff --git a/res/battle/moves/bug_bite/data.json b/res/battle/moves/bug_bite/data.json index 4912f26c0b..93b3e34bba 100644 --- a/res/battle/moves/bug_bite/data.json +++ b/res/battle/moves/bug_bite/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_EAT_BERRY", + "type": "BATTLE_EFFECT_EAT_BERRY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 12, diff --git a/res/battle/moves/bug_buzz/data.json b/res/battle/moves/bug_buzz/data.json index 4bfb6f8732..147fcf2ae0 100644 --- a/res/battle/moves/bug_buzz/data.json +++ b/res/battle/moves/bug_buzz/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 4, diff --git a/res/battle/moves/bulk_up/data.json b/res/battle/moves/bulk_up/data.json index 3797d04ca9..34e413c6fb 100644 --- a/res/battle/moves/bulk_up/data.json +++ b/res/battle/moves/bulk_up/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ATK_DEF_UP", + "type": "BATTLE_EFFECT_ATK_DEF_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/bullet_punch/data.json b/res/battle/moves/bullet_punch/data.json index 4ec0d96816..3fceec652c 100644 --- a/res/battle/moves/bullet_punch/data.json +++ b/res/battle/moves/bullet_punch/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/bullet_seed/data.json b/res/battle/moves/bullet_seed/data.json index 1f10840085..c6eb5b27d9 100644 --- a/res/battle/moves/bullet_seed/data.json +++ b/res/battle/moves/bullet_seed/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/calm_mind/data.json b/res/battle/moves/calm_mind/data.json index 75ea27ee8f..b56b833e0e 100644 --- a/res/battle/moves/calm_mind/data.json +++ b/res/battle/moves/calm_mind/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_ATK_SP_DEF_UP", + "type": "BATTLE_EFFECT_SP_ATK_SP_DEF_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/camouflage/data.json b/res/battle/moves/camouflage/data.json index 714be09061..ebb12c8c5d 100644 --- a/res/battle/moves/camouflage/data.json +++ b/res/battle/moves/camouflage/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CAMOUFLAGE", + "type": "BATTLE_EFFECT_CAMOUFLAGE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/captivate/data.json b/res/battle/moves/captivate/data.json index 47358afdd7..d5e3bbd0de 100644 --- a/res/battle/moves/captivate/data.json +++ b/res/battle/moves/captivate/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_ATK_DOWN_2_OPPOSITE_GENDER", + "type": "BATTLE_EFFECT_SP_ATK_DOWN_2_OPPOSITE_GENDER", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/charge/data.json b/res/battle/moves/charge/data.json index 4b295588e4..1bac93834a 100644 --- a/res/battle/moves/charge/data.json +++ b/res/battle/moves/charge/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_DEF_UP_DOUBLE_ELECTRIC_POWER", + "type": "BATTLE_EFFECT_SP_DEF_UP_DOUBLE_ELECTRIC_POWER", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/charge_beam/data.json b/res/battle/moves/charge_beam/data.json index 7f64527138..61374aa25d 100644 --- a/res/battle/moves/charge_beam/data.json +++ b/res/battle/moves/charge_beam/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RAISE_SP_ATK_HIT", + "type": "BATTLE_EFFECT_RAISE_SP_ATK_HIT", "chance": 70 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/charm/data.json b/res/battle/moves/charm/data.json index ac41707a9d..44ae48c5df 100644 --- a/res/battle/moves/charm/data.json +++ b/res/battle/moves/charm/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ATK_DOWN_2", + "type": "BATTLE_EFFECT_ATK_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/chatter/data.json b/res/battle/moves/chatter/data.json index 82a8196517..1d380e1b45 100644 --- a/res/battle/moves/chatter/data.json +++ b/res/battle/moves/chatter/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CHATTER", + "type": "BATTLE_EFFECT_CHATTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 23, diff --git a/res/battle/moves/clamp/data.json b/res/battle/moves/clamp/data.json index 1c8dadc90f..7fa4aac9e3 100644 --- a/res/battle/moves/clamp/data.json +++ b/res/battle/moves/clamp/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 10, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/close_combat/data.json b/res/battle/moves/close_combat/data.json index bd6f9a402f..b8f2c4907b 100644 --- a/res/battle/moves/close_combat/data.json +++ b/res/battle/moves/close_combat/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_DEF_SPD_DOWN_HIT", + "type": "BATTLE_EFFECT_DEF_SPD_DOWN_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/comet_punch/data.json b/res/battle/moves/comet_punch/data.json index db9f366d82..8062f99d9f 100644 --- a/res/battle/moves/comet_punch/data.json +++ b/res/battle/moves/comet_punch/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 15, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/confuse_ray/data.json b/res/battle/moves/confuse_ray/data.json index 72990b4fdc..647a3d0687 100644 --- a/res/battle/moves/confuse_ray/data.json +++ b/res/battle/moves/confuse_ray/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_CONFUSE", + "type": "BATTLE_EFFECT_STATUS_CONFUSE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/confusion/data.json b/res/battle/moves/confusion/data.json index 48845955e7..d4499a8e38 100644 --- a/res/battle/moves/confusion/data.json +++ b/res/battle/moves/confusion/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/constrict/data.json b/res/battle/moves/constrict/data.json index e3fa57bc15..c8b413ec1b 100644 --- a/res/battle/moves/constrict/data.json +++ b/res/battle/moves/constrict/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 21, diff --git a/res/battle/moves/conversion/data.json b/res/battle/moves/conversion/data.json index 8444c86e6b..2140b44f7a 100644 --- a/res/battle/moves/conversion/data.json +++ b/res/battle/moves/conversion/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_CONVERSION", + "type": "BATTLE_EFFECT_CONVERSION", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 23, diff --git a/res/battle/moves/conversion_2/data.json b/res/battle/moves/conversion_2/data.json index 3be3ddb6bf..91b074fec1 100644 --- a/res/battle/moves/conversion_2/data.json +++ b/res/battle/moves/conversion_2/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_CONVERSION2", + "type": "BATTLE_EFFECT_CONVERSION2", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/copycat/data.json b/res/battle/moves/copycat/data.json index 00c4d0be5f..0f13195a73 100644 --- a/res/battle/moves/copycat/data.json +++ b/res/battle/moves/copycat/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_USE_LAST_USED_MOVE", + "type": "BATTLE_EFFECT_USE_LAST_USED_MOVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/cosmic_power/data.json b/res/battle/moves/cosmic_power/data.json index 6c29464d6a..6771394900 100644 --- a/res/battle/moves/cosmic_power/data.json +++ b/res/battle/moves/cosmic_power/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DEF_SPD_UP", + "type": "BATTLE_EFFECT_DEF_SPD_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 11, diff --git a/res/battle/moves/cotton_spore/data.json b/res/battle/moves/cotton_spore/data.json index cf044f1a9e..c24eb71cd6 100644 --- a/res/battle/moves/cotton_spore/data.json +++ b/res/battle/moves/cotton_spore/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 40, "effect": { - "type": "MOVE_EFFECT_SPEED_DOWN_2", + "type": "BATTLE_EFFECT_SPEED_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/counter/data.json b/res/battle/moves/counter/data.json index 4d9055737a..6d0c6cc99f 100644 --- a/res/battle/moves/counter/data.json +++ b/res/battle/moves/counter/data.json @@ -6,13 +6,13 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_COUNTER", + "type": "BATTLE_EFFECT_COUNTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", "priority": -5, "flags": [ - "MOVE_FLAG_CONTACT" + "MOVE_FLAG_MAKES_CONTACT" ], "contest": { "effect": 15, diff --git a/res/battle/moves/covet/data.json b/res/battle/moves/covet/data.json index c0d08d0a7f..e00a13b414 100644 --- a/res/battle/moves/covet/data.json +++ b/res/battle/moves/covet/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 40, "effect": { - "type": "MOVE_EFFECT_STEAL_HELD_ITEM", + "type": "BATTLE_EFFECT_STEAL_HELD_ITEM", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 12, diff --git a/res/battle/moves/crabhammer/data.json b/res/battle/moves/crabhammer/data.json index b4583e4ba7..cdd13b8222 100644 --- a/res/battle/moves/crabhammer/data.json +++ b/res/battle/moves/crabhammer/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 18, diff --git a/res/battle/moves/cross_chop/data.json b/res/battle/moves/cross_chop/data.json index 003f9dee7c..9ba3d77d04 100644 --- a/res/battle/moves/cross_chop/data.json +++ b/res/battle/moves/cross_chop/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/cross_poison/data.json b/res/battle/moves/cross_poison/data.json index 6155fd67a7..a2f2034170 100644 --- a/res/battle/moves/cross_poison/data.json +++ b/res/battle/moves/cross_poison/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL_POISON_HIT", + "type": "BATTLE_EFFECT_HIGH_CRITICAL_POISON_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/crunch/data.json b/res/battle/moves/crunch/data.json index b8f495af96..1dc5cb2a3b 100644 --- a/res/battle/moves/crunch/data.json +++ b/res/battle/moves/crunch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_DEFENSE_HIT", + "type": "BATTLE_EFFECT_LOWER_DEFENSE_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/crush_claw/data.json b/res/battle/moves/crush_claw/data.json index c1c7594637..27f3180dcf 100644 --- a/res/battle/moves/crush_claw/data.json +++ b/res/battle/moves/crush_claw/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_DEFENSE_HIT", + "type": "BATTLE_EFFECT_LOWER_DEFENSE_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/crush_grip/data.json b/res/battle/moves/crush_grip/data.json index 172ffa05e9..c170fc424a 100644 --- a/res/battle/moves/crush_grip/data.json +++ b/res/battle/moves/crush_grip/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_MORE_HP", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_MORE_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 15, diff --git a/res/battle/moves/curse/data.json b/res/battle/moves/curse/data.json index 0a54cdcf97..e7679c3d08 100644 --- a/res/battle/moves/curse/data.json +++ b/res/battle/moves/curse/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_CURSE", + "type": "BATTLE_EFFECT_CURSE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 21, diff --git a/res/battle/moves/cut/data.json b/res/battle/moves/cut/data.json index 53a3445d0a..52e5de51b6 100644 --- a/res/battle/moves/cut/data.json +++ b/res/battle/moves/cut/data.json @@ -6,17 +6,17 @@ "accuracy": 95, "pp": 30, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/dark_pulse/data.json b/res/battle/moves/dark_pulse/data.json index 2dd40481c5..fd0e075fe6 100644 --- a/res/battle/moves/dark_pulse/data.json +++ b/res/battle/moves/dark_pulse/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/dark_void/data.json b/res/battle/moves/dark_void/data.json index 3dfa3f2086..1d5d27e5b8 100644 --- a/res/battle/moves/dark_void/data.json +++ b/res/battle/moves/dark_void/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 19, diff --git a/res/battle/moves/defend_order/data.json b/res/battle/moves/defend_order/data.json index 5ca658a1c2..0d7b24c65a 100644 --- a/res/battle/moves/defend_order/data.json +++ b/res/battle/moves/defend_order/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DEF_SPD_UP", + "type": "BATTLE_EFFECT_DEF_SPD_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/defense_curl/data.json b/res/battle/moves/defense_curl/data.json index 22ab94efe6..8e51796512 100644 --- a/res/battle/moves/defense_curl/data.json +++ b/res/battle/moves/defense_curl/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_DEF_UP_DOUBLE_ROLLOUT_POWER", + "type": "BATTLE_EFFECT_DEF_UP_DOUBLE_ROLLOUT_POWER", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/defog/data.json b/res/battle/moves/defog/data.json index 117e99b4ff..62c1a111e8 100644 --- a/res/battle/moves/defog/data.json +++ b/res/battle/moves/defog/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_REMOVE_HAZARDS_SCREENS_EVA_DOWN", + "type": "BATTLE_EFFECT_REMOVE_HAZARDS_SCREENS_EVA_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/destiny_bond/data.json b/res/battle/moves/destiny_bond/data.json index 5de0d6e078..63d6a6af0f 100644 --- a/res/battle/moves/destiny_bond/data.json +++ b/res/battle/moves/destiny_bond/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_KO_MON_THAT_DEFEATED_USER", + "type": "BATTLE_EFFECT_KO_MON_THAT_DEFEATED_USER", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/detect/data.json b/res/battle/moves/detect/data.json index bfd453e719..4edcb08ed7 100644 --- a/res/battle/moves/detect/data.json +++ b/res/battle/moves/detect/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_PROTECT", + "type": "BATTLE_EFFECT_PROTECT", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/dig/data.json b/res/battle/moves/dig/data.json index c911a9f044..3608797d8a 100644 --- a/res/battle/moves/dig/data.json +++ b/res/battle/moves/dig/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DIG", + "type": "BATTLE_EFFECT_DIG", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/disable/data.json b/res/battle/moves/disable/data.json index 3bae6a92a1..37ccedce11 100644 --- a/res/battle/moves/disable/data.json +++ b/res/battle/moves/disable/data.json @@ -6,14 +6,14 @@ "accuracy": 80, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DISABLE", + "type": "BATTLE_EFFECT_DISABLE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/discharge/data.json b/res/battle/moves/discharge/data.json index b79010bf8d..886320851e 100644 --- a/res/battle/moves/discharge/data.json +++ b/res/battle/moves/discharge/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/dive/data.json b/res/battle/moves/dive/data.json index c8f9c53228..65205cf7e7 100644 --- a/res/battle/moves/dive/data.json +++ b/res/battle/moves/dive/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DIVE", + "type": "BATTLE_EFFECT_DIVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/dizzy_punch/data.json b/res/battle/moves/dizzy_punch/data.json index 2bcf07c046..b54e3ce091 100644 --- a/res/battle/moves/dizzy_punch/data.json +++ b/res/battle/moves/dizzy_punch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/doom_desire/data.json b/res/battle/moves/doom_desire/data.json index c9f4a22f1a..131f5c1825 100644 --- a/res/battle/moves/doom_desire/data.json +++ b/res/battle/moves/doom_desire/data.json @@ -6,13 +6,13 @@ "accuracy": 85, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIT_IN_3_TURNS", + "type": "BATTLE_EFFECT_HIT_IN_3_TURNS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/double_edge/data.json b/res/battle/moves/double_edge/data.json index 6ffb844a86..4cb1243f15 100644 --- a/res/battle/moves/double_edge/data.json +++ b/res/battle/moves/double_edge/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOIL_THIRD", + "type": "BATTLE_EFFECT_RECOIL_THIRD", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 9, diff --git a/res/battle/moves/double_hit/data.json b/res/battle/moves/double_hit/data.json index 3653127003..fde796e3ff 100644 --- a/res/battle/moves/double_hit/data.json +++ b/res/battle/moves/double_hit/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT_TWICE", + "type": "BATTLE_EFFECT_HIT_TWICE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/double_kick/data.json b/res/battle/moves/double_kick/data.json index 6c74b94c8b..a01bd0f241 100644 --- a/res/battle/moves/double_kick/data.json +++ b/res/battle/moves/double_kick/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_HIT_TWICE", + "type": "BATTLE_EFFECT_HIT_TWICE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/double_slap/data.json b/res/battle/moves/double_slap/data.json index 2173672160..a0abb04c31 100644 --- a/res/battle/moves/double_slap/data.json +++ b/res/battle/moves/double_slap/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/double_team/data.json b/res/battle/moves/double_team/data.json index a00a9d7d4a..f6ac51fecd 100644 --- a/res/battle/moves/double_team/data.json +++ b/res/battle/moves/double_team/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_EVA_UP", + "type": "BATTLE_EFFECT_EVA_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/draco_meteor/data.json b/res/battle/moves/draco_meteor/data.json index 842124ff29..312a85621c 100644 --- a/res/battle/moves/draco_meteor/data.json +++ b/res/battle/moves/draco_meteor/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_USER_SP_ATK_DOWN_2", + "type": "BATTLE_EFFECT_USER_SP_ATK_DOWN_2", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 22, diff --git a/res/battle/moves/dragon_breath/data.json b/res/battle/moves/dragon_breath/data.json index e4e23787e4..2b190b4f39 100644 --- a/res/battle/moves/dragon_breath/data.json +++ b/res/battle/moves/dragon_breath/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/dragon_claw/data.json b/res/battle/moves/dragon_claw/data.json index 673ecb9dc7..e7d46be71a 100644 --- a/res/battle/moves/dragon_claw/data.json +++ b/res/battle/moves/dragon_claw/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/dragon_dance/data.json b/res/battle/moves/dragon_dance/data.json index 831794df84..12ec45f3c4 100644 --- a/res/battle/moves/dragon_dance/data.json +++ b/res/battle/moves/dragon_dance/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ATK_SPD_UP", + "type": "BATTLE_EFFECT_ATK_SPD_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/dragon_pulse/data.json b/res/battle/moves/dragon_pulse/data.json index 008281287e..401eb786b7 100644 --- a/res/battle/moves/dragon_pulse/data.json +++ b/res/battle/moves/dragon_pulse/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/dragon_rage/data.json b/res/battle/moves/dragon_rage/data.json index 896c8e432f..6e24f1ddca 100644 --- a/res/battle/moves/dragon_rage/data.json +++ b/res/battle/moves/dragon_rage/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_40_DAMAGE_FLAT", + "type": "BATTLE_EFFECT_40_DAMAGE_FLAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/dragon_rush/data.json b/res/battle/moves/dragon_rush/data.json index b4be37e902..c51cd4877f 100644 --- a/res/battle/moves/dragon_rush/data.json +++ b/res/battle/moves/dragon_rush/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/drain_punch/data.json b/res/battle/moves/drain_punch/data.json index 8c20afb0fb..eff78778c0 100644 --- a/res/battle/moves/drain_punch/data.json +++ b/res/battle/moves/drain_punch/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", + "type": "BATTLE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 20, diff --git a/res/battle/moves/dream_eater/data.json b/res/battle/moves/dream_eater/data.json index b2f8bb13ec..fc3e5f4b9b 100644 --- a/res/battle/moves/dream_eater/data.json +++ b/res/battle/moves/dream_eater/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOVER_DAMAGE_SLEEP", + "type": "BATTLE_EFFECT_RECOVER_DAMAGE_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/drill_peck/data.json b/res/battle/moves/drill_peck/data.json index a5df7a62d4..7b9b163b31 100644 --- a/res/battle/moves/drill_peck/data.json +++ b/res/battle/moves/drill_peck/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/dynamic_punch/data.json b/res/battle/moves/dynamic_punch/data.json index 68c8a3075b..b7e24a000d 100644 --- a/res/battle/moves/dynamic_punch/data.json +++ b/res/battle/moves/dynamic_punch/data.json @@ -6,16 +6,16 @@ "accuracy": 50, "pp": 5, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 18, diff --git a/res/battle/moves/earth_power/data.json b/res/battle/moves/earth_power/data.json index fa2dc0451b..8f15d12431 100644 --- a/res/battle/moves/earth_power/data.json +++ b/res/battle/moves/earth_power/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/earthquake/data.json b/res/battle/moves/earthquake/data.json index 3faaec7879..2a6765262b 100644 --- a/res/battle/moves/earthquake/data.json +++ b/res/battle/moves/earthquake/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_DAMAGE_DIG", + "type": "BATTLE_EFFECT_DOUBLE_DAMAGE_DIG", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/egg_bomb/data.json b/res/battle/moves/egg_bomb/data.json index 0f44c5dbd5..9a736188aa 100644 --- a/res/battle/moves/egg_bomb/data.json +++ b/res/battle/moves/egg_bomb/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/embargo/data.json b/res/battle/moves/embargo/data.json index b4cccf865a..53c87dac5a 100644 --- a/res/battle/moves/embargo/data.json +++ b/res/battle/moves/embargo/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PREVENT_ITEM_USE", + "type": "BATTLE_EFFECT_PREVENT_ITEM_USE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/ember/data.json b/res/battle/moves/ember/data.json index 35c98a1cf3..55e354e109 100644 --- a/res/battle/moves/ember/data.json +++ b/res/battle/moves/ember/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/encore/data.json b/res/battle/moves/encore/data.json index 752001f7a9..ca641ba8ca 100644 --- a/res/battle/moves/encore/data.json +++ b/res/battle/moves/encore/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ENCORE", + "type": "BATTLE_EFFECT_ENCORE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/endeavor/data.json b/res/battle/moves/endeavor/data.json index 40de9ff525..cf79b0cd8a 100644 --- a/res/battle/moves/endeavor/data.json +++ b/res/battle/moves/endeavor/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_SET_HP_EQUAL_TO_USER", + "type": "BATTLE_EFFECT_SET_HP_EQUAL_TO_USER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 15, diff --git a/res/battle/moves/endure/data.json b/res/battle/moves/endure/data.json index 133f557b35..b79b582d8c 100644 --- a/res/battle/moves/endure/data.json +++ b/res/battle/moves/endure/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SURVIVE_WITH_1_HP", + "type": "BATTLE_EFFECT_SURVIVE_WITH_1_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 3, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/energy_ball/data.json b/res/battle/moves/energy_ball/data.json index 3ad4549fde..0849fc18ac 100644 --- a/res/battle/moves/energy_ball/data.json +++ b/res/battle/moves/energy_ball/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/eruption/data.json b/res/battle/moves/eruption/data.json index dc629afa2c..0b9515518d 100644 --- a/res/battle/moves/eruption/data.json +++ b/res/battle/moves/eruption/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP", + "type": "BATTLE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/explosion/data.json b/res/battle/moves/explosion/data.json index 23d4e3f50b..a972572f8f 100644 --- a/res/battle/moves/explosion/data.json +++ b/res/battle/moves/explosion/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HALVE_DEFENSE", + "type": "BATTLE_EFFECT_HALVE_DEFENSE", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 9, diff --git a/res/battle/moves/extrasensory/data.json b/res/battle/moves/extrasensory/data.json index 90d4e89ad6..bc67a314cc 100644 --- a/res/battle/moves/extrasensory/data.json +++ b/res/battle/moves/extrasensory/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/extreme_speed/data.json b/res/battle/moves/extreme_speed/data.json index 6d73685ae9..2b025f5dc9 100644 --- a/res/battle/moves/extreme_speed/data.json +++ b/res/battle/moves/extreme_speed/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 1, diff --git a/res/battle/moves/facade/data.json b/res/battle/moves/facade/data.json index e3077c0a50..402b4e9505 100644 --- a/res/battle/moves/facade/data.json +++ b/res/battle/moves/facade/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_WHEN_STATUSED", + "type": "BATTLE_EFFECT_DOUBLE_POWER_WHEN_STATUSED", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 15, diff --git a/res/battle/moves/faint_attack/data.json b/res/battle/moves/faint_attack/data.json index 4294ba2187..ad72e23437 100644 --- a/res/battle/moves/faint_attack/data.json +++ b/res/battle/moves/faint_attack/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/fake_out/data.json b/res/battle/moves/fake_out/data.json index 217955caf9..c9eb74eb3d 100644 --- a/res/battle/moves/fake_out/data.json +++ b/res/battle/moves/fake_out/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_ALWAYS_FLINCH_FIRST_TURN_ONLY", + "type": "BATTLE_EFFECT_ALWAYS_FLINCH_FIRST_TURN_ONLY", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/fake_tears/data.json b/res/battle/moves/fake_tears/data.json index f891f241d9..825cc8bc36 100644 --- a/res/battle/moves/fake_tears/data.json +++ b/res/battle/moves/fake_tears/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_DEF_DOWN_2", + "type": "BATTLE_EFFECT_SP_DEF_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/false_swipe/data.json b/res/battle/moves/false_swipe/data.json index 7927190ef3..815e504752 100644 --- a/res/battle/moves/false_swipe/data.json +++ b/res/battle/moves/false_swipe/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 40, "effect": { - "type": "MOVE_EFFECT_LEAVE_WITH_1_HP", + "type": "BATTLE_EFFECT_LEAVE_WITH_1_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/feather_dance/data.json b/res/battle/moves/feather_dance/data.json index e7bead02cd..ac197b0321 100644 --- a/res/battle/moves/feather_dance/data.json +++ b/res/battle/moves/feather_dance/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_ATK_DOWN_2", + "type": "BATTLE_EFFECT_ATK_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/feint/data.json b/res/battle/moves/feint/data.json index c656bb4a12..776286ddc3 100644 --- a/res/battle/moves/feint/data.json +++ b/res/battle/moves/feint/data.json @@ -6,7 +6,7 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_REMOVE_PROTECT", + "type": "BATTLE_EFFECT_REMOVE_PROTECT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", diff --git a/res/battle/moves/fire_blast/data.json b/res/battle/moves/fire_blast/data.json index 8632d153e2..4687974353 100644 --- a/res/battle/moves/fire_blast/data.json +++ b/res/battle/moves/fire_blast/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 5, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/fire_fang/data.json b/res/battle/moves/fire_fang/data.json index 5a3c38a0ce..9695744405 100644 --- a/res/battle/moves/fire_fang/data.json +++ b/res/battle/moves/fire_fang/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_BURN_HIT", + "type": "BATTLE_EFFECT_FLINCH_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/fire_punch/data.json b/res/battle/moves/fire_punch/data.json index 9707537608..d899b74229 100644 --- a/res/battle/moves/fire_punch/data.json +++ b/res/battle/moves/fire_punch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/fire_spin/data.json b/res/battle/moves/fire_spin/data.json index 709313feec..ea6ce7036f 100644 --- a/res/battle/moves/fire_spin/data.json +++ b/res/battle/moves/fire_spin/data.json @@ -6,15 +6,15 @@ "accuracy": 70, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/fissure/data.json b/res/battle/moves/fissure/data.json index 597a695a68..f6ea4e891a 100644 --- a/res/battle/moves/fissure/data.json +++ b/res/battle/moves/fissure/data.json @@ -6,15 +6,15 @@ "accuracy": 30, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ONE_HIT_KO", + "type": "BATTLE_EFFECT_ONE_HIT_KO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 9, diff --git a/res/battle/moves/flail/data.json b/res/battle/moves/flail/data.json index 59c523aef8..8aff3b774e 100644 --- a/res/battle/moves/flail/data.json +++ b/res/battle/moves/flail/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_LESS_HP", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_LESS_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 15, diff --git a/res/battle/moves/flame_wheel/data.json b/res/battle/moves/flame_wheel/data.json index da85308638..176024e09a 100644 --- a/res/battle/moves/flame_wheel/data.json +++ b/res/battle/moves/flame_wheel/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_THAW_AND_BURN_HIT", + "type": "BATTLE_EFFECT_THAW_AND_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 7, diff --git a/res/battle/moves/flamethrower/data.json b/res/battle/moves/flamethrower/data.json index 95bd81f798..7dee62cc5b 100644 --- a/res/battle/moves/flamethrower/data.json +++ b/res/battle/moves/flamethrower/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/flare_blitz/data.json b/res/battle/moves/flare_blitz/data.json index 0a36b5096a..4cef4a2478 100644 --- a/res/battle/moves/flare_blitz/data.json +++ b/res/battle/moves/flare_blitz/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOIL_BURN_HIT", + "type": "BATTLE_EFFECT_RECOIL_BURN_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/flash/data.json b/res/battle/moves/flash/data.json index 86e5f1b67b..6fc7899b78 100644 --- a/res/battle/moves/flash/data.json +++ b/res/battle/moves/flash/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ACC_DOWN", + "type": "BATTLE_EFFECT_ACC_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 10, diff --git a/res/battle/moves/flash_cannon/data.json b/res/battle/moves/flash_cannon/data.json index 38887037d0..25d5ed4c27 100644 --- a/res/battle/moves/flash_cannon/data.json +++ b/res/battle/moves/flash_cannon/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/flatter/data.json b/res/battle/moves/flatter/data.json index e6dada2408..6b7a2c8b36 100644 --- a/res/battle/moves/flatter/data.json +++ b/res/battle/moves/flatter/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_SP_ATK_UP_CAUSE_CONFUSION", + "type": "BATTLE_EFFECT_SP_ATK_UP_CAUSE_CONFUSION", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/fling/data.json b/res/battle/moves/fling/data.json index 30eaba0d84..c1e61b6569 100644 --- a/res/battle/moves/fling/data.json +++ b/res/battle/moves/fling/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FLING", + "type": "BATTLE_EFFECT_FLING", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 23, diff --git a/res/battle/moves/fly/data.json b/res/battle/moves/fly/data.json index e48a4788fb..7af7bbac6f 100644 --- a/res/battle/moves/fly/data.json +++ b/res/battle/moves/fly/data.json @@ -6,17 +6,17 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLY", + "type": "BATTLE_EFFECT_FLY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 6, diff --git a/res/battle/moves/focus_blast/data.json b/res/battle/moves/focus_blast/data.json index 9caf9a6c8d..8d230e7329 100644 --- a/res/battle/moves/focus_blast/data.json +++ b/res/battle/moves/focus_blast/data.json @@ -6,15 +6,15 @@ "accuracy": 70, "pp": 5, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/focus_energy/data.json b/res/battle/moves/focus_energy/data.json index ce4b131639..b277da987b 100644 --- a/res/battle/moves/focus_energy/data.json +++ b/res/battle/moves/focus_energy/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_CRIT_UP_2", + "type": "BATTLE_EFFECT_CRIT_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/focus_punch/data.json b/res/battle/moves/focus_punch/data.json index f885d8ced8..530469f5bf 100644 --- a/res/battle/moves/focus_punch/data.json +++ b/res/battle/moves/focus_punch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT_LAST_WHIFF_IF_HIT", + "type": "BATTLE_EFFECT_HIT_LAST_WHIFF_IF_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -3, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 6, diff --git a/res/battle/moves/follow_me/data.json b/res/battle/moves/follow_me/data.json index 6beda319f7..b6d80e6b65 100644 --- a/res/battle/moves/follow_me/data.json +++ b/res/battle/moves/follow_me/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MAKE_GLOBAL_TARGET", + "type": "BATTLE_EFFECT_MAKE_GLOBAL_TARGET", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/force_palm/data.json b/res/battle/moves/force_palm/data.json index ef047e9cd0..171e851636 100644 --- a/res/battle/moves/force_palm/data.json +++ b/res/battle/moves/force_palm/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/foresight/data.json b/res/battle/moves/foresight/data.json index 50b408df60..f517f60fbc 100644 --- a/res/battle/moves/foresight/data.json +++ b/res/battle/moves/foresight/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_IGNORE_EVASION_REMOVE_GHOST_IMMUNE", + "type": "BATTLE_EFFECT_IGNORE_EVASION_REMOVE_GHOST_IMMUNE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 20, diff --git a/res/battle/moves/frenzy_plant/data.json b/res/battle/moves/frenzy_plant/data.json index 748b16f302..f5dc51bb5f 100644 --- a/res/battle/moves/frenzy_plant/data.json +++ b/res/battle/moves/frenzy_plant/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/frustration/data.json b/res/battle/moves/frustration/data.json index 28c841ebe2..aaab4cca1d 100644 --- a/res/battle/moves/frustration/data.json +++ b/res/battle/moves/frustration/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POWER_BASED_ON_LOW_FRIENDSHIP", + "type": "BATTLE_EFFECT_POWER_BASED_ON_LOW_FRIENDSHIP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 18, diff --git a/res/battle/moves/fury_attack/data.json b/res/battle/moves/fury_attack/data.json index c3dff3d8b9..38ca304e4e 100644 --- a/res/battle/moves/fury_attack/data.json +++ b/res/battle/moves/fury_attack/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/fury_cutter/data.json b/res/battle/moves/fury_cutter/data.json index b71d6bbb08..858ebf5685 100644 --- a/res/battle/moves/fury_cutter/data.json +++ b/res/battle/moves/fury_cutter/data.json @@ -6,17 +6,17 @@ "accuracy": 95, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_EACH_TURN", + "type": "BATTLE_EFFECT_DOUBLE_POWER_EACH_TURN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/fury_swipes/data.json b/res/battle/moves/fury_swipes/data.json index 3f8972bbc8..bfd2d47e3f 100644 --- a/res/battle/moves/fury_swipes/data.json +++ b/res/battle/moves/fury_swipes/data.json @@ -6,17 +6,17 @@ "accuracy": 80, "pp": 15, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/future_sight/data.json b/res/battle/moves/future_sight/data.json index ea0d61709a..4a6f9861ac 100644 --- a/res/battle/moves/future_sight/data.json +++ b/res/battle/moves/future_sight/data.json @@ -6,7 +6,7 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT_IN_3_TURNS", + "type": "BATTLE_EFFECT_HIT_IN_3_TURNS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", diff --git a/res/battle/moves/gastro_acid/data.json b/res/battle/moves/gastro_acid/data.json index c33aa21dc8..58b451cd0f 100644 --- a/res/battle/moves/gastro_acid/data.json +++ b/res/battle/moves/gastro_acid/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SUPRESS_ABILITY", + "type": "BATTLE_EFFECT_SUPRESS_ABILITY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/giga_drain/data.json b/res/battle/moves/giga_drain/data.json index 9ebb279b83..d1f62d5cf7 100644 --- a/res/battle/moves/giga_drain/data.json +++ b/res/battle/moves/giga_drain/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", + "type": "BATTLE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/giga_impact/data.json b/res/battle/moves/giga_impact/data.json index 93fd5720fe..56afd17e25 100644 --- a/res/battle/moves/giga_impact/data.json +++ b/res/battle/moves/giga_impact/data.json @@ -6,17 +6,17 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/glare/data.json b/res/battle/moves/glare/data.json index 801585f716..68883a1afd 100644 --- a/res/battle/moves/glare/data.json +++ b/res/battle/moves/glare/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 30, "effect": { - "type": "MOVE_EFFECT_STATUS_PARALYZE", + "type": "BATTLE_EFFECT_STATUS_PARALYZE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/grass_knot/data.json b/res/battle/moves/grass_knot/data.json index 7b89861e44..21beaf31fb 100644 --- a/res/battle/moves/grass_knot/data.json +++ b/res/battle/moves/grass_knot/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_WEIGHT", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_WEIGHT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 4, diff --git a/res/battle/moves/grass_whistle/data.json b/res/battle/moves/grass_whistle/data.json index e6ae44467d..1b5a37cf53 100644 --- a/res/battle/moves/grass_whistle/data.json +++ b/res/battle/moves/grass_whistle/data.json @@ -6,15 +6,15 @@ "accuracy": 55, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/gravity/data.json b/res/battle/moves/gravity/data.json index de6d7e5a44..b698e25bf0 100644 --- a/res/battle/moves/gravity/data.json +++ b/res/battle/moves/gravity/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_GRAVITY", + "type": "BATTLE_EFFECT_GRAVITY", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/growl/data.json b/res/battle/moves/growl/data.json index 98c00da0da..8e42550667 100644 --- a/res/battle/moves/growl/data.json +++ b/res/battle/moves/growl/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 40, "effect": { - "type": "MOVE_EFFECT_ATK_DOWN", + "type": "BATTLE_EFFECT_ATK_DOWN", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/growth/data.json b/res/battle/moves/growth/data.json index 681de919af..3dd72658cd 100644 --- a/res/battle/moves/growth/data.json +++ b/res/battle/moves/growth/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_SP_ATK_UP", + "type": "BATTLE_EFFECT_SP_ATK_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/grudge/data.json b/res/battle/moves/grudge/data.json index e1cfbb9373..435e259d3e 100644 --- a/res/battle/moves/grudge/data.json +++ b/res/battle/moves/grudge/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_REMOVE_ALL_PP_ON_DEFEAT", + "type": "BATTLE_EFFECT_REMOVE_ALL_PP_ON_DEFEAT", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/guard_swap/data.json b/res/battle/moves/guard_swap/data.json index 43048e233d..cd43e9a262 100644 --- a/res/battle/moves/guard_swap/data.json +++ b/res/battle/moves/guard_swap/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWAP_DEF_SP_DEF_STAT_CHANGES", + "type": "BATTLE_EFFECT_SWAP_DEF_SP_DEF_STAT_CHANGES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/guillotine/data.json b/res/battle/moves/guillotine/data.json index 6769657eaa..d50f0cdcce 100644 --- a/res/battle/moves/guillotine/data.json +++ b/res/battle/moves/guillotine/data.json @@ -6,15 +6,15 @@ "accuracy": 30, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ONE_HIT_KO", + "type": "BATTLE_EFFECT_ONE_HIT_KO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 9, diff --git a/res/battle/moves/gunk_shot/data.json b/res/battle/moves/gunk_shot/data.json index cd3f92e531..c86485064f 100644 --- a/res/battle/moves/gunk_shot/data.json +++ b/res/battle/moves/gunk_shot/data.json @@ -6,16 +6,16 @@ "accuracy": 70, "pp": 5, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 5, diff --git a/res/battle/moves/gust/data.json b/res/battle/moves/gust/data.json index e1d6076e88..fbb5433824 100644 --- a/res/battle/moves/gust/data.json +++ b/res/battle/moves/gust/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_DOUBLE_DAMAGE_FLY_OR_BOUNCE", + "type": "BATTLE_EFFECT_DOUBLE_DAMAGE_FLY_OR_BOUNCE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/gyro_ball/data.json b/res/battle/moves/gyro_ball/data.json index b78e4c9573..ae88b042d4 100644 --- a/res/battle/moves/gyro_ball/data.json +++ b/res/battle/moves/gyro_ball/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_POWER_BASED_ON_LOW_SPEED", + "type": "BATTLE_EFFECT_POWER_BASED_ON_LOW_SPEED", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 15, diff --git a/res/battle/moves/hail/data.json b/res/battle/moves/hail/data.json index d8c01ada40..595d19cf27 100644 --- a/res/battle/moves/hail/data.json +++ b/res/battle/moves/hail/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_WEATHER_HAIL", + "type": "BATTLE_EFFECT_WEATHER_HAIL", "chance": 0 }, "range": "RANGE_FIELD", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT" + "MOVE_FLAG_CAN_PROTECT" ], "contest": { "effect": 13, diff --git a/res/battle/moves/hammer_arm/data.json b/res/battle/moves/hammer_arm/data.json index a7fb2ec810..601bf44af0 100644 --- a/res/battle/moves/hammer_arm/data.json +++ b/res/battle/moves/hammer_arm/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SPEED_DOWN_HIT", + "type": "BATTLE_EFFECT_SPEED_DOWN_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 2, diff --git a/res/battle/moves/harden/data.json b/res/battle/moves/harden/data.json index 98698c3c45..0238e27c58 100644 --- a/res/battle/moves/harden/data.json +++ b/res/battle/moves/harden/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_DEF_UP", + "type": "BATTLE_EFFECT_DEF_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/haze/data.json b/res/battle/moves/haze/data.json index d982a06ab4..6f826ed3a9 100644 --- a/res/battle/moves/haze/data.json +++ b/res/battle/moves/haze/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_RESET_STAT_CHANGES", + "type": "BATTLE_EFFECT_RESET_STAT_CHANGES", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/head_smash/data.json b/res/battle/moves/head_smash/data.json index dcfc8d64c1..28be975187 100644 --- a/res/battle/moves/head_smash/data.json +++ b/res/battle/moves/head_smash/data.json @@ -6,17 +6,17 @@ "accuracy": 80, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECOIL_HALF", + "type": "BATTLE_EFFECT_RECOIL_HALF", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/headbutt/data.json b/res/battle/moves/headbutt/data.json index cd0ecb1f92..0339bf161d 100644 --- a/res/battle/moves/headbutt/data.json +++ b/res/battle/moves/headbutt/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/heal_bell/data.json b/res/battle/moves/heal_bell/data.json index e1a946c288..3bc96b6e5c 100644 --- a/res/battle/moves/heal_bell/data.json +++ b/res/battle/moves/heal_bell/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_CURE_PARTY_STATUS", + "type": "BATTLE_EFFECT_CURE_PARTY_STATUS", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/heal_block/data.json b/res/battle/moves/heal_block/data.json index b9fd72ed2c..1bab56e348 100644 --- a/res/battle/moves/heal_block/data.json +++ b/res/battle/moves/heal_block/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PREVENT_HEALING", + "type": "BATTLE_EFFECT_PREVENT_HEALING", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/heal_order/data.json b/res/battle/moves/heal_order/data.json index 0a3344f5dd..7dc8af0b4e 100644 --- a/res/battle/moves/heal_order/data.json +++ b/res/battle/moves/heal_order/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RESTORE_HALF_HP", + "type": "BATTLE_EFFECT_RESTORE_HALF_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 8, diff --git a/res/battle/moves/healing_wish/data.json b/res/battle/moves/healing_wish/data.json index 8ee1274c8f..9a8f77705d 100644 --- a/res/battle/moves/healing_wish/data.json +++ b/res/battle/moves/healing_wish/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FAINT_AND_FULL_HEAL_NEXT_MON", + "type": "BATTLE_EFFECT_FAINT_AND_FULL_HEAL_NEXT_MON", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/heart_swap/data.json b/res/battle/moves/heart_swap/data.json index 4bac882a56..90a5e50313 100644 --- a/res/battle/moves/heart_swap/data.json +++ b/res/battle/moves/heart_swap/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWAP_STAT_CHANGES", + "type": "BATTLE_EFFECT_SWAP_STAT_CHANGES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/heat_wave/data.json b/res/battle/moves/heat_wave/data.json index c102cbb01f..d54837227b 100644 --- a/res/battle/moves/heat_wave/data.json +++ b/res/battle/moves/heat_wave/data.json @@ -6,14 +6,14 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 10 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/helping_hand/data.json b/res/battle/moves/helping_hand/data.json index 72a61c2709..ee033d10ca 100644 --- a/res/battle/moves/helping_hand/data.json +++ b/res/battle/moves/helping_hand/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BOOST_ALLY_POWER_BY_50_PERCENT", + "type": "BATTLE_EFFECT_BOOST_ALLY_POWER_BY_50_PERCENT", "chance": 0 }, "range": "RANGE_ALLY", diff --git a/res/battle/moves/hi_jump_kick/data.json b/res/battle/moves/hi_jump_kick/data.json index a31c868a5f..3419eefd86 100644 --- a/res/battle/moves/hi_jump_kick/data.json +++ b/res/battle/moves/hi_jump_kick/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CRASH_ON_MISS", + "type": "BATTLE_EFFECT_CRASH_ON_MISS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/hidden_power/data.json b/res/battle/moves/hidden_power/data.json index 1612b08482..654a3acf14 100644 --- a/res/battle/moves/hidden_power/data.json +++ b/res/battle/moves/hidden_power/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RANDOM_POWER_BASED_ON_IVS", + "type": "BATTLE_EFFECT_RANDOM_POWER_BASED_ON_IVS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 23, diff --git a/res/battle/moves/horn_attack/data.json b/res/battle/moves/horn_attack/data.json index f6558bcfa7..c00e5096dd 100644 --- a/res/battle/moves/horn_attack/data.json +++ b/res/battle/moves/horn_attack/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/horn_drill/data.json b/res/battle/moves/horn_drill/data.json index 7e9c1d144d..6e2c02ba45 100644 --- a/res/battle/moves/horn_drill/data.json +++ b/res/battle/moves/horn_drill/data.json @@ -6,15 +6,15 @@ "accuracy": 30, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ONE_HIT_KO", + "type": "BATTLE_EFFECT_ONE_HIT_KO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 9, diff --git a/res/battle/moves/howl/data.json b/res/battle/moves/howl/data.json index fc8c17317e..7179bbfac9 100644 --- a/res/battle/moves/howl/data.json +++ b/res/battle/moves/howl/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_ATK_UP", + "type": "BATTLE_EFFECT_ATK_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/hydro_cannon/data.json b/res/battle/moves/hydro_cannon/data.json index 797157d763..aa734c04f7 100644 --- a/res/battle/moves/hydro_cannon/data.json +++ b/res/battle/moves/hydro_cannon/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/hydro_pump/data.json b/res/battle/moves/hydro_pump/data.json index abd4d24e4b..b30d7227ff 100644 --- a/res/battle/moves/hydro_pump/data.json +++ b/res/battle/moves/hydro_pump/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/hyper_beam/data.json b/res/battle/moves/hyper_beam/data.json index ca8a5b99bb..f324413ad1 100644 --- a/res/battle/moves/hyper_beam/data.json +++ b/res/battle/moves/hyper_beam/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/hyper_fang/data.json b/res/battle/moves/hyper_fang/data.json index 9623f5f31c..ab4f9dc182 100644 --- a/res/battle/moves/hyper_fang/data.json +++ b/res/battle/moves/hyper_fang/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/hyper_voice/data.json b/res/battle/moves/hyper_voice/data.json index aa67d320a5..ba4b41ae68 100644 --- a/res/battle/moves/hyper_voice/data.json +++ b/res/battle/moves/hyper_voice/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/hypnosis/data.json b/res/battle/moves/hypnosis/data.json index 75f9c530f5..29c81e3603 100644 --- a/res/battle/moves/hypnosis/data.json +++ b/res/battle/moves/hypnosis/data.json @@ -6,15 +6,15 @@ "accuracy": 60, "pp": 20, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/ice_ball/data.json b/res/battle/moves/ice_ball/data.json index 4ae1e3385c..82665b2079 100644 --- a/res/battle/moves/ice_ball/data.json +++ b/res/battle/moves/ice_ball/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_EACH_TURN_LOCK_INTO", + "type": "BATTLE_EFFECT_DOUBLE_POWER_EACH_TURN_LOCK_INTO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/ice_beam/data.json b/res/battle/moves/ice_beam/data.json index 114246d851..1fc4bdd50c 100644 --- a/res/battle/moves/ice_beam/data.json +++ b/res/battle/moves/ice_beam/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FREEZE_HIT", + "type": "BATTLE_EFFECT_FREEZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/ice_fang/data.json b/res/battle/moves/ice_fang/data.json index 0e100dcda7..387b41df57 100644 --- a/res/battle/moves/ice_fang/data.json +++ b/res/battle/moves/ice_fang/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_FREEZE_HIT", + "type": "BATTLE_EFFECT_FLINCH_FREEZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/ice_punch/data.json b/res/battle/moves/ice_punch/data.json index 03b7de0f42..58f29ca53b 100644 --- a/res/battle/moves/ice_punch/data.json +++ b/res/battle/moves/ice_punch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FREEZE_HIT", + "type": "BATTLE_EFFECT_FREEZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/ice_shard/data.json b/res/battle/moves/ice_shard/data.json index a74f44f90b..3c345a4b28 100644 --- a/res/battle/moves/ice_shard/data.json +++ b/res/battle/moves/ice_shard/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 1, diff --git a/res/battle/moves/icicle_spear/data.json b/res/battle/moves/icicle_spear/data.json index 5f81f79610..5ffb6c7b64 100644 --- a/res/battle/moves/icicle_spear/data.json +++ b/res/battle/moves/icicle_spear/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/icy_wind/data.json b/res/battle/moves/icy_wind/data.json index ef75bc31c0..84697fb467 100644 --- a/res/battle/moves/icy_wind/data.json +++ b/res/battle/moves/icy_wind/data.json @@ -6,14 +6,14 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 100 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 2, diff --git a/res/battle/moves/imprison/data.json b/res/battle/moves/imprison/data.json index 13bed2248f..cfb6630a93 100644 --- a/res/battle/moves/imprison/data.json +++ b/res/battle/moves/imprison/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_MAKE_SHARED_MOVES_UNUSEABLE", + "type": "BATTLE_EFFECT_MAKE_SHARED_MOVES_UNUSEABLE", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/ingrain/data.json b/res/battle/moves/ingrain/data.json index 8b86885ba3..828dcdc0db 100644 --- a/res/battle/moves/ingrain/data.json +++ b/res/battle/moves/ingrain/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_GROUND_TRAP_USER_CONTINUOUS_HEAL", + "type": "BATTLE_EFFECT_GROUND_TRAP_USER_CONTINUOUS_HEAL", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 21, diff --git a/res/battle/moves/iron_defense/data.json b/res/battle/moves/iron_defense/data.json index d385ddc726..968096ea45 100644 --- a/res/battle/moves/iron_defense/data.json +++ b/res/battle/moves/iron_defense/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_DEF_UP_2", + "type": "BATTLE_EFFECT_DEF_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/iron_head/data.json b/res/battle/moves/iron_head/data.json index f065a8b379..a81001051f 100644 --- a/res/battle/moves/iron_head/data.json +++ b/res/battle/moves/iron_head/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/iron_tail/data.json b/res/battle/moves/iron_tail/data.json index df3da49c5a..9a71103aca 100644 --- a/res/battle/moves/iron_tail/data.json +++ b/res/battle/moves/iron_tail/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_DEFENSE_HIT", + "type": "BATTLE_EFFECT_LOWER_DEFENSE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/judgment/data.json b/res/battle/moves/judgment/data.json index ef0eba906e..5d0a9dd95c 100644 --- a/res/battle/moves/judgment/data.json +++ b/res/battle/moves/judgment/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_JUDGEMENT", + "type": "BATTLE_EFFECT_JUDGEMENT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 14, diff --git a/res/battle/moves/jump_kick/data.json b/res/battle/moves/jump_kick/data.json index 9d844ed880..c6f07cc154 100644 --- a/res/battle/moves/jump_kick/data.json +++ b/res/battle/moves/jump_kick/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 25, "effect": { - "type": "MOVE_EFFECT_CRASH_ON_MISS", + "type": "BATTLE_EFFECT_CRASH_ON_MISS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/karate_chop/data.json b/res/battle/moves/karate_chop/data.json index a4c3718680..3e8b2bcbbd 100644 --- a/res/battle/moves/karate_chop/data.json +++ b/res/battle/moves/karate_chop/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/kinesis/data.json b/res/battle/moves/kinesis/data.json index 71f18d5d99..da77021aa8 100644 --- a/res/battle/moves/kinesis/data.json +++ b/res/battle/moves/kinesis/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 15, "effect": { - "type": "MOVE_EFFECT_ACC_DOWN", + "type": "BATTLE_EFFECT_ACC_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/knock_off/data.json b/res/battle/moves/knock_off/data.json index 3a89b45785..014eb70dc5 100644 --- a/res/battle/moves/knock_off/data.json +++ b/res/battle/moves/knock_off/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_REMOVE_HELD_ITEM", + "type": "BATTLE_EFFECT_REMOVE_HELD_ITEM", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/last_resort/data.json b/res/battle/moves/last_resort/data.json index 2c05a22df9..b14c738d5b 100644 --- a/res/battle/moves/last_resort/data.json +++ b/res/battle/moves/last_resort/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_FAIL_IF_NOT_USED_ALL_OTHER_MOVES", + "type": "BATTLE_EFFECT_FAIL_IF_NOT_USED_ALL_OTHER_MOVES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/lava_plume/data.json b/res/battle/moves/lava_plume/data.json index e1a76821f5..d485c6f5ab 100644 --- a/res/battle/moves/lava_plume/data.json +++ b/res/battle/moves/lava_plume/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BURN_HIT", + "type": "BATTLE_EFFECT_BURN_HIT", "chance": 30 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/leaf_blade/data.json b/res/battle/moves/leaf_blade/data.json index cd2c42bb48..069f5c54c5 100644 --- a/res/battle/moves/leaf_blade/data.json +++ b/res/battle/moves/leaf_blade/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/leaf_storm/data.json b/res/battle/moves/leaf_storm/data.json index 9e7a221ce0..5370690782 100644 --- a/res/battle/moves/leaf_storm/data.json +++ b/res/battle/moves/leaf_storm/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_USER_SP_ATK_DOWN_2", + "type": "BATTLE_EFFECT_USER_SP_ATK_DOWN_2", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/leech_life/data.json b/res/battle/moves/leech_life/data.json index 8ade57e443..93a634e968 100644 --- a/res/battle/moves/leech_life/data.json +++ b/res/battle/moves/leech_life/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", + "type": "BATTLE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/leech_seed/data.json b/res/battle/moves/leech_seed/data.json index 23d51326ab..045389627b 100644 --- a/res/battle/moves/leech_seed/data.json +++ b/res/battle/moves/leech_seed/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_LEECH_SEED", + "type": "BATTLE_EFFECT_STATUS_LEECH_SEED", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 21, diff --git a/res/battle/moves/leer/data.json b/res/battle/moves/leer/data.json index 4bfe27d0a5..de6e252e57 100644 --- a/res/battle/moves/leer/data.json +++ b/res/battle/moves/leer/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_DEF_DOWN", + "type": "BATTLE_EFFECT_DEF_DOWN", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/lick/data.json b/res/battle/moves/lick/data.json index 8053a24246..fbc5380d41 100644 --- a/res/battle/moves/lick/data.json +++ b/res/battle/moves/lick/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/light_screen/data.json b/res/battle/moves/light_screen/data.json index 6ae42f0a6a..3108e2d124 100644 --- a/res/battle/moves/light_screen/data.json +++ b/res/battle/moves/light_screen/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_SET_LIGHT_SCREEN", + "type": "BATTLE_EFFECT_SET_LIGHT_SCREEN", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/lock_on/data.json b/res/battle/moves/lock_on/data.json index e055af3aa0..f0c502103b 100644 --- a/res/battle/moves/lock_on/data.json +++ b/res/battle/moves/lock_on/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_NEXT_ATTACK_ALWAYS_HITS", + "type": "BATTLE_EFFECT_NEXT_ATTACK_ALWAYS_HITS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/lovely_kiss/data.json b/res/battle/moves/lovely_kiss/data.json index 11b5704273..519fcc4b4a 100644 --- a/res/battle/moves/lovely_kiss/data.json +++ b/res/battle/moves/lovely_kiss/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/low_kick/data.json b/res/battle/moves/low_kick/data.json index 42820ddd28..5c57a5ede1 100644 --- a/res/battle/moves/low_kick/data.json +++ b/res/battle/moves/low_kick/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_WEIGHT", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_WEIGHT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/lucky_chant/data.json b/res/battle/moves/lucky_chant/data.json index 92b239fed6..11d0aeffcb 100644 --- a/res/battle/moves/lucky_chant/data.json +++ b/res/battle/moves/lucky_chant/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PREVENT_CRITS", + "type": "BATTLE_EFFECT_PREVENT_CRITS", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/lunar_dance/data.json b/res/battle/moves/lunar_dance/data.json index 4544894ca5..21be216c71 100644 --- a/res/battle/moves/lunar_dance/data.json +++ b/res/battle/moves/lunar_dance/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FAINT_FULL_RESTORE_NEXT_MON", + "type": "BATTLE_EFFECT_FAINT_FULL_RESTORE_NEXT_MON", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 8, diff --git a/res/battle/moves/luster_purge/data.json b/res/battle/moves/luster_purge/data.json index ae07876931..ef396e7b3c 100644 --- a/res/battle/moves/luster_purge/data.json +++ b/res/battle/moves/luster_purge/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 22, diff --git a/res/battle/moves/mach_punch/data.json b/res/battle/moves/mach_punch/data.json index 5f9fff211f..aba85eb970 100644 --- a/res/battle/moves/mach_punch/data.json +++ b/res/battle/moves/mach_punch/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/magic_coat/data.json b/res/battle/moves/magic_coat/data.json index 02d13e081e..4284a04b24 100644 --- a/res/battle/moves/magic_coat/data.json +++ b/res/battle/moves/magic_coat/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_APPLY_MAGIC_COAT", + "type": "BATTLE_EFFECT_APPLY_MAGIC_COAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/magical_leaf/data.json b/res/battle/moves/magical_leaf/data.json index e6c9db1782..b484433b51 100644 --- a/res/battle/moves/magical_leaf/data.json +++ b/res/battle/moves/magical_leaf/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/magma_storm/data.json b/res/battle/moves/magma_storm/data.json index 131ba4a95a..cf3b420953 100644 --- a/res/battle/moves/magma_storm/data.json +++ b/res/battle/moves/magma_storm/data.json @@ -6,16 +6,16 @@ "accuracy": 70, "pp": 5, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 7, diff --git a/res/battle/moves/magnet_bomb/data.json b/res/battle/moves/magnet_bomb/data.json index cbc90240b6..fd8bfd142d 100644 --- a/res/battle/moves/magnet_bomb/data.json +++ b/res/battle/moves/magnet_bomb/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/magnet_rise/data.json b/res/battle/moves/magnet_rise/data.json index df89801eb0..23b4168f92 100644 --- a/res/battle/moves/magnet_rise/data.json +++ b/res/battle/moves/magnet_rise/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_GIVE_GROUND_IMMUNITY", + "type": "BATTLE_EFFECT_GIVE_GROUND_IMMUNITY", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/magnitude/data.json b/res/battle/moves/magnitude/data.json index d7ab5477b2..c963e44bfe 100644 --- a/res/battle/moves/magnitude/data.json +++ b/res/battle/moves/magnitude/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_RANDOM_POWER_10_CASES", + "type": "BATTLE_EFFECT_RANDOM_POWER_10_CASES", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/me_first/data.json b/res/battle/moves/me_first/data.json index 1677538486..2597072846 100644 --- a/res/battle/moves/me_first/data.json +++ b/res/battle/moves/me_first/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_USE_MOVE_FIRST", + "type": "BATTLE_EFFECT_USE_MOVE_FIRST", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_ME_FIRST", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT" + "MOVE_FLAG_CAN_PROTECT" ], "contest": { "effect": 1, diff --git a/res/battle/moves/mean_look/data.json b/res/battle/moves/mean_look/data.json index 04d2caaf75..72207fab60 100644 --- a/res/battle/moves/mean_look/data.json +++ b/res/battle/moves/mean_look/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_PREVENT_ESCAPE", + "type": "BATTLE_EFFECT_PREVENT_ESCAPE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/meditate/data.json b/res/battle/moves/meditate/data.json index e5df26acc3..272611db30 100644 --- a/res/battle/moves/meditate/data.json +++ b/res/battle/moves/meditate/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_ATK_UP", + "type": "BATTLE_EFFECT_ATK_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/mega_drain/data.json b/res/battle/moves/mega_drain/data.json index 081d5fc635..372d872c5e 100644 --- a/res/battle/moves/mega_drain/data.json +++ b/res/battle/moves/mega_drain/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", + "type": "BATTLE_EFFECT_RECOVER_HALF_DAMAGE_DEALT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/mega_kick/data.json b/res/battle/moves/mega_kick/data.json index 47325558c9..b7bfa6594c 100644 --- a/res/battle/moves/mega_kick/data.json +++ b/res/battle/moves/mega_kick/data.json @@ -6,17 +6,17 @@ "accuracy": 75, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 18, diff --git a/res/battle/moves/mega_punch/data.json b/res/battle/moves/mega_punch/data.json index 7d4bffce67..3613e9bd4e 100644 --- a/res/battle/moves/mega_punch/data.json +++ b/res/battle/moves/mega_punch/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/megahorn/data.json b/res/battle/moves/megahorn/data.json index d38d43ccad..ab549f09e4 100644 --- a/res/battle/moves/megahorn/data.json +++ b/res/battle/moves/megahorn/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 18, diff --git a/res/battle/moves/memento/data.json b/res/battle/moves/memento/data.json index 2146ef1024..512359411e 100644 --- a/res/battle/moves/memento/data.json +++ b/res/battle/moves/memento/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FAINT_AND_ATK_SP_ATK_DOWN_2", + "type": "BATTLE_EFFECT_FAINT_AND_ATK_SP_ATK_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 9, diff --git a/res/battle/moves/meson.build b/res/battle/moves/meson.build index 14bb33c043..6360d8b1e5 100644 --- a/res/battle/moves/meson.build +++ b/res/battle/moves/meson.build @@ -480,6 +480,8 @@ endforeach pl_waza_tbl_narc = custom_target('pl_waza_tbl.narc', output: 'pl_waza_tbl.narc', input: pl_waza_tbl_data_srcs, + env: json2bin_env, + depends: [ generated_consts_py ], command: [ movedata_py, '--knarc', knarc_exe, diff --git a/res/battle/moves/metal_burst/data.json b/res/battle/moves/metal_burst/data.json index 123e9cd416..d6aea992fb 100644 --- a/res/battle/moves/metal_burst/data.json +++ b/res/battle/moves/metal_burst/data.json @@ -6,13 +6,13 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_METAL_BURST", + "type": "BATTLE_EFFECT_METAL_BURST", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", "priority": 0, "flags": [ - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 15, diff --git a/res/battle/moves/metal_claw/data.json b/res/battle/moves/metal_claw/data.json index 13f46f8b25..0a065aa0a8 100644 --- a/res/battle/moves/metal_claw/data.json +++ b/res/battle/moves/metal_claw/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 35, "effect": { - "type": "MOVE_EFFECT_RAISE_ATTACK_HIT", + "type": "BATTLE_EFFECT_RAISE_ATTACK_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/metal_sound/data.json b/res/battle/moves/metal_sound/data.json index 8b6f1b8ddd..723636d74a 100644 --- a/res/battle/moves/metal_sound/data.json +++ b/res/battle/moves/metal_sound/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 40, "effect": { - "type": "MOVE_EFFECT_SP_DEF_DOWN_2", + "type": "BATTLE_EFFECT_SP_DEF_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/meteor_mash/data.json b/res/battle/moves/meteor_mash/data.json index 0ea09e60c5..1e800e155c 100644 --- a/res/battle/moves/meteor_mash/data.json +++ b/res/battle/moves/meteor_mash/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RAISE_ATTACK_HIT", + "type": "BATTLE_EFFECT_RAISE_ATTACK_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/metronome/data.json b/res/battle/moves/metronome/data.json index a7c7fd0b89..bc76464c29 100644 --- a/res/battle/moves/metronome/data.json +++ b/res/battle/moves/metronome/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_CALL_RANDOM_MOVE", + "type": "BATTLE_EFFECT_CALL_RANDOM_MOVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 14, diff --git a/res/battle/moves/milk_drink/data.json b/res/battle/moves/milk_drink/data.json index 82bba7deae..ef9032dbc2 100644 --- a/res/battle/moves/milk_drink/data.json +++ b/res/battle/moves/milk_drink/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RESTORE_HALF_HP", + "type": "BATTLE_EFFECT_RESTORE_HALF_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 8, diff --git a/res/battle/moves/mimic/data.json b/res/battle/moves/mimic/data.json index b32dea4ea8..313b9c6327 100644 --- a/res/battle/moves/mimic/data.json +++ b/res/battle/moves/mimic/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_COPY_MOVE_FOR_BATTLE", + "type": "BATTLE_EFFECT_COPY_MOVE_FOR_BATTLE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT" + "MOVE_FLAG_CAN_PROTECT" ], "contest": { "effect": 12, diff --git a/res/battle/moves/mind_reader/data.json b/res/battle/moves/mind_reader/data.json index 94589fb62d..8249582f82 100644 --- a/res/battle/moves/mind_reader/data.json +++ b/res/battle/moves/mind_reader/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_NEXT_ATTACK_ALWAYS_HITS", + "type": "BATTLE_EFFECT_NEXT_ATTACK_ALWAYS_HITS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/minimize/data.json b/res/battle/moves/minimize/data.json index 26bdb8d5b8..483282d5c0 100644 --- a/res/battle/moves/minimize/data.json +++ b/res/battle/moves/minimize/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_EVA_UP_2_MINIMIZE", + "type": "BATTLE_EFFECT_EVA_UP_2_MINIMIZE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 13, diff --git a/res/battle/moves/miracle_eye/data.json b/res/battle/moves/miracle_eye/data.json index ff82dbc2fe..2fa7479880 100644 --- a/res/battle/moves/miracle_eye/data.json +++ b/res/battle/moves/miracle_eye/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_IGNORE_EVATION_REMOVE_DARK_IMMUNE", + "type": "BATTLE_EFFECT_IGNORE_EVATION_REMOVE_DARK_IMMUNE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 20, diff --git a/res/battle/moves/mirror_coat/data.json b/res/battle/moves/mirror_coat/data.json index 4bfe26d1bc..37465271c3 100644 --- a/res/battle/moves/mirror_coat/data.json +++ b/res/battle/moves/mirror_coat/data.json @@ -6,7 +6,7 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MIRROR_COAT", + "type": "BATTLE_EFFECT_MIRROR_COAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/mirror_move/data.json b/res/battle/moves/mirror_move/data.json index f4a8007c21..c63f0a4dbf 100644 --- a/res/battle/moves/mirror_move/data.json +++ b/res/battle/moves/mirror_move/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_COPY_MOVE", + "type": "BATTLE_EFFECT_COPY_MOVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/mirror_shot/data.json b/res/battle/moves/mirror_shot/data.json index 31b84f4116..653c74de47 100644 --- a/res/battle/moves/mirror_shot/data.json +++ b/res/battle/moves/mirror_shot/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_ACCURACY_HIT", + "type": "BATTLE_EFFECT_LOWER_ACCURACY_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/mist/data.json b/res/battle/moves/mist/data.json index 1265a6fb48..6457ce406c 100644 --- a/res/battle/moves/mist/data.json +++ b/res/battle/moves/mist/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PREVENT_STAT_REDUCTION", + "type": "BATTLE_EFFECT_PREVENT_STAT_REDUCTION", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 13, diff --git a/res/battle/moves/mist_ball/data.json b/res/battle/moves/mist_ball/data.json index a8f362a6e3..0bd785354a 100644 --- a/res/battle/moves/mist_ball/data.json +++ b/res/battle/moves/mist_ball/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_ATK_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_ATK_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/moonlight/data.json b/res/battle/moves/moonlight/data.json index ec08a57dd9..c87970e299 100644 --- a/res/battle/moves/moonlight/data.json +++ b/res/battle/moves/moonlight/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HEAL_HALF_MORE_IN_SUN", + "type": "BATTLE_EFFECT_HEAL_HALF_MORE_IN_SUN", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 8, diff --git a/res/battle/moves/morning_sun/data.json b/res/battle/moves/morning_sun/data.json index 2c3c0b8600..9578be936f 100644 --- a/res/battle/moves/morning_sun/data.json +++ b/res/battle/moves/morning_sun/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HEAL_HALF_MORE_IN_SUN", + "type": "BATTLE_EFFECT_HEAL_HALF_MORE_IN_SUN", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 8, diff --git a/res/battle/moves/mud_bomb/data.json b/res/battle/moves/mud_bomb/data.json index 18f83ebb2e..8117bca82e 100644 --- a/res/battle/moves/mud_bomb/data.json +++ b/res/battle/moves/mud_bomb/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_ACCURACY_HIT", + "type": "BATTLE_EFFECT_LOWER_ACCURACY_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/mud_shot/data.json b/res/battle/moves/mud_shot/data.json index 80b768c2b0..63c985e165 100644 --- a/res/battle/moves/mud_shot/data.json +++ b/res/battle/moves/mud_shot/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 2, diff --git a/res/battle/moves/mud_slap/data.json b/res/battle/moves/mud_slap/data.json index d41936ea7a..493a6689bd 100644 --- a/res/battle/moves/mud_slap/data.json +++ b/res/battle/moves/mud_slap/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_ACCURACY_HIT", + "type": "BATTLE_EFFECT_LOWER_ACCURACY_HIT", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/mud_sport/data.json b/res/battle/moves/mud_sport/data.json index d412e32067..a3fa58ed39 100644 --- a/res/battle/moves/mud_sport/data.json +++ b/res/battle/moves/mud_sport/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HALVE_ELECTRIC_DAMAGE", + "type": "BATTLE_EFFECT_HALVE_ELECTRIC_DAMAGE", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/muddy_water/data.json b/res/battle/moves/muddy_water/data.json index 669f863ba4..257d740553 100644 --- a/res/battle/moves/muddy_water/data.json +++ b/res/battle/moves/muddy_water/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_ACCURACY_HIT", + "type": "BATTLE_EFFECT_LOWER_ACCURACY_HIT", "chance": 30 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/nasty_plot/data.json b/res/battle/moves/nasty_plot/data.json index 86fe58f683..59b0a83244 100644 --- a/res/battle/moves/nasty_plot/data.json +++ b/res/battle/moves/nasty_plot/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_ATK_UP_2", + "type": "BATTLE_EFFECT_SP_ATK_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/natural_gift/data.json b/res/battle/moves/natural_gift/data.json index dfab115e85..5f94254d67 100644 --- a/res/battle/moves/natural_gift/data.json +++ b/res/battle/moves/natural_gift/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_NATURAL_GIFT", + "type": "BATTLE_EFFECT_NATURAL_GIFT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 18, diff --git a/res/battle/moves/nature_power/data.json b/res/battle/moves/nature_power/data.json index f76a8d3d2d..1e587c88d7 100644 --- a/res/battle/moves/nature_power/data.json +++ b/res/battle/moves/nature_power/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_NATURE_POWER", + "type": "BATTLE_EFFECT_NATURE_POWER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 14, diff --git a/res/battle/moves/needle_arm/data.json b/res/battle/moves/needle_arm/data.json index 595a7e0727..5c6c53a157 100644 --- a/res/battle/moves/needle_arm/data.json +++ b/res/battle/moves/needle_arm/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/night_shade/data.json b/res/battle/moves/night_shade/data.json index d27f13b0b7..5e0c2fad63 100644 --- a/res/battle/moves/night_shade/data.json +++ b/res/battle/moves/night_shade/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LEVEL_DAMAGE_FLAT", + "type": "BATTLE_EFFECT_LEVEL_DAMAGE_FLAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/night_slash/data.json b/res/battle/moves/night_slash/data.json index e04641c3c2..b6deaec109 100644 --- a/res/battle/moves/night_slash/data.json +++ b/res/battle/moves/night_slash/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/nightmare/data.json b/res/battle/moves/nightmare/data.json index cc402fabec..2c5a7717e0 100644 --- a/res/battle/moves/nightmare/data.json +++ b/res/battle/moves/nightmare/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_NIGHTMARE", + "type": "BATTLE_EFFECT_STATUS_NIGHTMARE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/octazooka/data.json b/res/battle/moves/octazooka/data.json index e88036c210..0759d19a34 100644 --- a/res/battle/moves/octazooka/data.json +++ b/res/battle/moves/octazooka/data.json @@ -6,14 +6,14 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_ACCURACY_HIT", + "type": "BATTLE_EFFECT_LOWER_ACCURACY_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 4, diff --git a/res/battle/moves/odor_sleuth/data.json b/res/battle/moves/odor_sleuth/data.json index 34ca8c8239..95d763f8bc 100644 --- a/res/battle/moves/odor_sleuth/data.json +++ b/res/battle/moves/odor_sleuth/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_IGNORE_EVASION_REMOVE_GHOST_IMMUNE", + "type": "BATTLE_EFFECT_IGNORE_EVASION_REMOVE_GHOST_IMMUNE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 20, diff --git a/res/battle/moves/ominous_wind/data.json b/res/battle/moves/ominous_wind/data.json index 2dec596f84..bf815dc816 100644 --- a/res/battle/moves/ominous_wind/data.json +++ b/res/battle/moves/ominous_wind/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RAISE_ALL_STATS_HIT", + "type": "BATTLE_EFFECT_RAISE_ALL_STATS_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 11, diff --git a/res/battle/moves/outrage/data.json b/res/battle/moves/outrage/data.json index aedd877620..6c1c62c75b 100644 --- a/res/battle/moves/outrage/data.json +++ b/res/battle/moves/outrage/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_CONTINUE_AND_CONFUSE_SELF", + "type": "BATTLE_EFFECT_CONTINUE_AND_CONFUSE_SELF", "chance": 0 }, "range": "RANGE_RANDOM_OPPONENT", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 7, diff --git a/res/battle/moves/overheat/data.json b/res/battle/moves/overheat/data.json index 88aeb55411..f56b5156c0 100644 --- a/res/battle/moves/overheat/data.json +++ b/res/battle/moves/overheat/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_USER_SP_ATK_DOWN_2", + "type": "BATTLE_EFFECT_USER_SP_ATK_DOWN_2", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/pain_split/data.json b/res/battle/moves/pain_split/data.json index 3d32086520..ae0ac347be 100644 --- a/res/battle/moves/pain_split/data.json +++ b/res/battle/moves/pain_split/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_AVERAGE_HP", + "type": "BATTLE_EFFECT_AVERAGE_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/pay_day/data.json b/res/battle/moves/pay_day/data.json index c4233ba697..e9d4a441ad 100644 --- a/res/battle/moves/pay_day/data.json +++ b/res/battle/moves/pay_day/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_INCREASE_PRIZE_MONEY", + "type": "BATTLE_EFFECT_INCREASE_PRIZE_MONEY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 23, diff --git a/res/battle/moves/payback/data.json b/res/battle/moves/payback/data.json index 40ad46cf11..a45b8baa03 100644 --- a/res/battle/moves/payback/data.json +++ b/res/battle/moves/payback/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_IF_MOVING_SECOND", + "type": "BATTLE_EFFECT_DOUBLE_POWER_IF_MOVING_SECOND", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/peck/data.json b/res/battle/moves/peck/data.json index aaf2255893..84c27bdcdd 100644 --- a/res/battle/moves/peck/data.json +++ b/res/battle/moves/peck/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/perish_song/data.json b/res/battle/moves/perish_song/data.json index 0b25d3fbdc..2100192ebb 100644 --- a/res/battle/moves/perish_song/data.json +++ b/res/battle/moves/perish_song/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ALL_FAINT_3_TURNS", + "type": "BATTLE_EFFECT_ALL_FAINT_3_TURNS", "chance": 0 }, "range": "RANGE_FIELD", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 10, diff --git a/res/battle/moves/petal_dance/data.json b/res/battle/moves/petal_dance/data.json index ed8916dd03..762a81ad96 100644 --- a/res/battle/moves/petal_dance/data.json +++ b/res/battle/moves/petal_dance/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONTINUE_AND_CONFUSE_SELF", + "type": "BATTLE_EFFECT_CONTINUE_AND_CONFUSE_SELF", "chance": 0 }, "range": "RANGE_RANDOM_OPPONENT", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/pin_missile/data.json b/res/battle/moves/pin_missile/data.json index 7f7373f084..84e543ec54 100644 --- a/res/battle/moves/pin_missile/data.json +++ b/res/battle/moves/pin_missile/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/pluck/data.json b/res/battle/moves/pluck/data.json index 3b33db6ce3..0de9eeec9b 100644 --- a/res/battle/moves/pluck/data.json +++ b/res/battle/moves/pluck/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_EAT_BERRY", + "type": "BATTLE_EFFECT_EAT_BERRY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 12, diff --git a/res/battle/moves/poison_fang/data.json b/res/battle/moves/poison_fang/data.json index 0db6c16e4c..8add0a7691 100644 --- a/res/battle/moves/poison_fang/data.json +++ b/res/battle/moves/poison_fang/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BADLY_POISON_HIT", + "type": "BATTLE_EFFECT_BADLY_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 4, diff --git a/res/battle/moves/poison_gas/data.json b/res/battle/moves/poison_gas/data.json index 4a39ba266f..4daeba7c0d 100644 --- a/res/battle/moves/poison_gas/data.json +++ b/res/battle/moves/poison_gas/data.json @@ -6,15 +6,15 @@ "accuracy": 55, "pp": 40, "effect": { - "type": "MOVE_EFFECT_STATUS_POISON", + "type": "BATTLE_EFFECT_STATUS_POISON", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/poison_jab/data.json b/res/battle/moves/poison_jab/data.json index 56e6289974..1f69cae35a 100644 --- a/res/battle/moves/poison_jab/data.json +++ b/res/battle/moves/poison_jab/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/poison_powder/data.json b/res/battle/moves/poison_powder/data.json index 800155534b..e3f55529bc 100644 --- a/res/battle/moves/poison_powder/data.json +++ b/res/battle/moves/poison_powder/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 35, "effect": { - "type": "MOVE_EFFECT_STATUS_POISON", + "type": "BATTLE_EFFECT_STATUS_POISON", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/poison_sting/data.json b/res/battle/moves/poison_sting/data.json index 9d49ba5149..b690d1a819 100644 --- a/res/battle/moves/poison_sting/data.json +++ b/res/battle/moves/poison_sting/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/poison_tail/data.json b/res/battle/moves/poison_tail/data.json index 73c3372bd5..8c68d6e106 100644 --- a/res/battle/moves/poison_tail/data.json +++ b/res/battle/moves/poison_tail/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL_POISON_HIT", + "type": "BATTLE_EFFECT_HIGH_CRITICAL_POISON_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/pound/data.json b/res/battle/moves/pound/data.json index 3afb293e02..0d7bd52f71 100644 --- a/res/battle/moves/pound/data.json +++ b/res/battle/moves/pound/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/powder_snow/data.json b/res/battle/moves/powder_snow/data.json index e2c41da662..89e33fe5c2 100644 --- a/res/battle/moves/powder_snow/data.json +++ b/res/battle/moves/powder_snow/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_FREEZE_HIT", + "type": "BATTLE_EFFECT_FREEZE_HIT", "chance": 10 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/power_gem/data.json b/res/battle/moves/power_gem/data.json index fc9764b79e..9270644291 100644 --- a/res/battle/moves/power_gem/data.json +++ b/res/battle/moves/power_gem/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/power_swap/data.json b/res/battle/moves/power_swap/data.json index 9c3ac76488..de30c8a2f5 100644 --- a/res/battle/moves/power_swap/data.json +++ b/res/battle/moves/power_swap/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWAP_ATK_SP_ATK_STAT_CHANGES", + "type": "BATTLE_EFFECT_SWAP_ATK_SP_ATK_STAT_CHANGES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/power_trick/data.json b/res/battle/moves/power_trick/data.json index 81d38c2fb2..59c613880e 100644 --- a/res/battle/moves/power_trick/data.json +++ b/res/battle/moves/power_trick/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWAP_ATK_DEF", + "type": "BATTLE_EFFECT_SWAP_ATK_DEF", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/power_whip/data.json b/res/battle/moves/power_whip/data.json index 1bf0cb4d45..0576fe111f 100644 --- a/res/battle/moves/power_whip/data.json +++ b/res/battle/moves/power_whip/data.json @@ -6,17 +6,17 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 5, diff --git a/res/battle/moves/present/data.json b/res/battle/moves/present/data.json index 3c5fc9ca0d..6ff0e14866 100644 --- a/res/battle/moves/present/data.json +++ b/res/battle/moves/present/data.json @@ -6,14 +6,14 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RANDOM_POWER_MAYBE_HEAL", + "type": "BATTLE_EFFECT_RANDOM_POWER_MAYBE_HEAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/protect/data.json b/res/battle/moves/protect/data.json index 337e8f4814..ce84f76997 100644 --- a/res/battle/moves/protect/data.json +++ b/res/battle/moves/protect/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_PROTECT", + "type": "BATTLE_EFFECT_PROTECT", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/psybeam/data.json b/res/battle/moves/psybeam/data.json index 41416b1ba9..e54f84cb46 100644 --- a/res/battle/moves/psybeam/data.json +++ b/res/battle/moves/psybeam/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/psych_up/data.json b/res/battle/moves/psych_up/data.json index 8085656f83..245e70a8f1 100644 --- a/res/battle/moves/psych_up/data.json +++ b/res/battle/moves/psych_up/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_COPY_STAT_CHANGES", + "type": "BATTLE_EFFECT_COPY_STAT_CHANGES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/psychic/data.json b/res/battle/moves/psychic/data.json index 3431da038d..6eb33113e7 100644 --- a/res/battle/moves/psychic/data.json +++ b/res/battle/moves/psychic/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/psycho_boost/data.json b/res/battle/moves/psycho_boost/data.json index 33938293c7..aa1c61c99c 100644 --- a/res/battle/moves/psycho_boost/data.json +++ b/res/battle/moves/psycho_boost/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_USER_SP_ATK_DOWN_2", + "type": "BATTLE_EFFECT_USER_SP_ATK_DOWN_2", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/psycho_cut/data.json b/res/battle/moves/psycho_cut/data.json index 4136f7d4cb..8745d61531 100644 --- a/res/battle/moves/psycho_cut/data.json +++ b/res/battle/moves/psycho_cut/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/psycho_shift/data.json b/res/battle/moves/psycho_shift/data.json index 4abce422c2..fc57f4ec1f 100644 --- a/res/battle/moves/psycho_shift/data.json +++ b/res/battle/moves/psycho_shift/data.json @@ -6,14 +6,14 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_TRANSFER_STATUS", + "type": "BATTLE_EFFECT_TRANSFER_STATUS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/psywave/data.json b/res/battle/moves/psywave/data.json index 8f40ec5929..50537390f2 100644 --- a/res/battle/moves/psywave/data.json +++ b/res/battle/moves/psywave/data.json @@ -6,15 +6,15 @@ "accuracy": 80, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RANDOM_DAMAGE_1_TO_150_LEVEL", + "type": "BATTLE_EFFECT_RANDOM_DAMAGE_1_TO_150_LEVEL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/punishment/data.json b/res/battle/moves/punishment/data.json index 813a7b0213..1f0e97887a 100644 --- a/res/battle/moves/punishment/data.json +++ b/res/battle/moves/punishment/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_MORE_STAT_UP", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_MORE_STAT_UP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 23, diff --git a/res/battle/moves/pursuit/data.json b/res/battle/moves/pursuit/data.json index 3608bebca8..c68feb8b2e 100644 --- a/res/battle/moves/pursuit/data.json +++ b/res/battle/moves/pursuit/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT_BEFORE_SWITCH", + "type": "BATTLE_EFFECT_HIT_BEFORE_SWITCH", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 20, diff --git a/res/battle/moves/quick_attack/data.json b/res/battle/moves/quick_attack/data.json index 0f8cb60405..7bbd75d46b 100644 --- a/res/battle/moves/quick_attack/data.json +++ b/res/battle/moves/quick_attack/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/rage/data.json b/res/battle/moves/rage/data.json index 10c1ecb760..a501dbf5be 100644 --- a/res/battle/moves/rage/data.json +++ b/res/battle/moves/rage/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_RAISE_ATK_WHEN_HIT", + "type": "BATTLE_EFFECT_RAISE_ATK_WHEN_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 11, diff --git a/res/battle/moves/rain_dance/data.json b/res/battle/moves/rain_dance/data.json index 9dae7b2275..985a7efa76 100644 --- a/res/battle/moves/rain_dance/data.json +++ b/res/battle/moves/rain_dance/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_WEATHER_RAIN", + "type": "BATTLE_EFFECT_WEATHER_RAIN", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/rapid_spin/data.json b/res/battle/moves/rapid_spin/data.json index ebda0156f4..8b23fcbeef 100644 --- a/res/battle/moves/rapid_spin/data.json +++ b/res/battle/moves/rapid_spin/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 40, "effect": { - "type": "MOVE_EFFECT_REMOVE_HAZARDS_AND_BINDING", + "type": "BATTLE_EFFECT_REMOVE_HAZARDS_AND_BINDING", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/razor_leaf/data.json b/res/battle/moves/razor_leaf/data.json index 898c0c2868..dfe6227d7b 100644 --- a/res/battle/moves/razor_leaf/data.json +++ b/res/battle/moves/razor_leaf/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/razor_wind/data.json b/res/battle/moves/razor_wind/data.json index 5c4eb3ab51..58b4a92526 100644 --- a/res/battle/moves/razor_wind/data.json +++ b/res/battle/moves/razor_wind/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_CHARGE_TURN_HIGH_CRIT", + "type": "BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/recover/data.json b/res/battle/moves/recover/data.json index 4bd3d3dab8..5a46438a31 100644 --- a/res/battle/moves/recover/data.json +++ b/res/battle/moves/recover/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RESTORE_HALF_HP", + "type": "BATTLE_EFFECT_RESTORE_HALF_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/recycle/data.json b/res/battle/moves/recycle/data.json index b14bc73df2..23ba134c76 100644 --- a/res/battle/moves/recycle/data.json +++ b/res/battle/moves/recycle/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RECYCLE", + "type": "BATTLE_EFFECT_RECYCLE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 12, diff --git a/res/battle/moves/reflect/data.json b/res/battle/moves/reflect/data.json index e9ad6cd2b0..26b857b452 100644 --- a/res/battle/moves/reflect/data.json +++ b/res/battle/moves/reflect/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SET_REFLECT", + "type": "BATTLE_EFFECT_SET_REFLECT", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/refresh/data.json b/res/battle/moves/refresh/data.json index dbd7bb8bd5..1a83aaf5d0 100644 --- a/res/battle/moves/refresh/data.json +++ b/res/battle/moves/refresh/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HEAL_STATUS", + "type": "BATTLE_EFFECT_HEAL_STATUS", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 8, diff --git a/res/battle/moves/rest/data.json b/res/battle/moves/rest/data.json index 9e759b5f24..a226072efb 100644 --- a/res/battle/moves/rest/data.json +++ b/res/battle/moves/rest/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_REST", + "type": "BATTLE_EFFECT_REST", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/return/data.json b/res/battle/moves/return/data.json index a8769a3b67..b0998d7c62 100644 --- a/res/battle/moves/return/data.json +++ b/res/battle/moves/return/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POWER_BASED_ON_FRIENDSHIP", + "type": "BATTLE_EFFECT_POWER_BASED_ON_FRIENDSHIP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 17, diff --git a/res/battle/moves/revenge/data.json b/res/battle/moves/revenge/data.json index 4582fae422..b8e2d3f32f 100644 --- a/res/battle/moves/revenge/data.json +++ b/res/battle/moves/revenge/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_IF_HIT", + "type": "BATTLE_EFFECT_DOUBLE_POWER_IF_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -4, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 15, diff --git a/res/battle/moves/reversal/data.json b/res/battle/moves/reversal/data.json index 04956afe7e..a4d6d4de4d 100644 --- a/res/battle/moves/reversal/data.json +++ b/res/battle/moves/reversal/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_LESS_HP", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_LESS_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 15, diff --git a/res/battle/moves/roar/data.json b/res/battle/moves/roar/data.json index 14dc19b578..dd8a73624c 100644 --- a/res/battle/moves/roar/data.json +++ b/res/battle/moves/roar/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FORCE_SWITCH", + "type": "BATTLE_EFFECT_FORCE_SWITCH", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -6, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/roar_of_time/data.json b/res/battle/moves/roar_of_time/data.json index 434f34761a..5e4de62592 100644 --- a/res/battle/moves/roar_of_time/data.json +++ b/res/battle/moves/roar_of_time/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 22, diff --git a/res/battle/moves/rock_blast/data.json b/res/battle/moves/rock_blast/data.json index f578657ff1..a2474f61ca 100644 --- a/res/battle/moves/rock_blast/data.json +++ b/res/battle/moves/rock_blast/data.json @@ -6,15 +6,15 @@ "accuracy": 80, "pp": 10, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/rock_climb/data.json b/res/battle/moves/rock_climb/data.json index 40a0a33181..494f377a21 100644 --- a/res/battle/moves/rock_climb/data.json +++ b/res/battle/moves/rock_climb/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/rock_polish/data.json b/res/battle/moves/rock_polish/data.json index 858978bdaf..1a5b3b8346 100644 --- a/res/battle/moves/rock_polish/data.json +++ b/res/battle/moves/rock_polish/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SPEED_UP_2", + "type": "BATTLE_EFFECT_SPEED_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 1, diff --git a/res/battle/moves/rock_slide/data.json b/res/battle/moves/rock_slide/data.json index 698bec87d3..176b5ed1e1 100644 --- a/res/battle/moves/rock_slide/data.json +++ b/res/battle/moves/rock_slide/data.json @@ -6,14 +6,14 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/rock_smash/data.json b/res/battle/moves/rock_smash/data.json index 543e1c6678..ac16761035 100644 --- a/res/battle/moves/rock_smash/data.json +++ b/res/battle/moves/rock_smash/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_DEFENSE_HIT", + "type": "BATTLE_EFFECT_LOWER_DEFENSE_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/rock_throw/data.json b/res/battle/moves/rock_throw/data.json index 8b8dc0740a..4fe1a121f9 100644 --- a/res/battle/moves/rock_throw/data.json +++ b/res/battle/moves/rock_throw/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/rock_tomb/data.json b/res/battle/moves/rock_tomb/data.json index 3d664e83f5..02a52141e9 100644 --- a/res/battle/moves/rock_tomb/data.json +++ b/res/battle/moves/rock_tomb/data.json @@ -6,14 +6,14 @@ "accuracy": 80, "pp": 10, "effect": { - "type": "MOVE_EFFECT_LOWER_SPEED_HIT", + "type": "BATTLE_EFFECT_LOWER_SPEED_HIT", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 2, diff --git a/res/battle/moves/rock_wrecker/data.json b/res/battle/moves/rock_wrecker/data.json index 5cabfd7e6b..ffa9c5b0df 100644 --- a/res/battle/moves/rock_wrecker/data.json +++ b/res/battle/moves/rock_wrecker/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RECHARGE_AFTER", + "type": "BATTLE_EFFECT_RECHARGE_AFTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/role_play/data.json b/res/battle/moves/role_play/data.json index fe672c4975..1023781bab 100644 --- a/res/battle/moves/role_play/data.json +++ b/res/battle/moves/role_play/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_COPY_ABILITY", + "type": "BATTLE_EFFECT_COPY_ABILITY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", diff --git a/res/battle/moves/rolling_kick/data.json b/res/battle/moves/rolling_kick/data.json index ec19095972..6df9dba315 100644 --- a/res/battle/moves/rolling_kick/data.json +++ b/res/battle/moves/rolling_kick/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/rollout/data.json b/res/battle/moves/rollout/data.json index 9f402d774b..4bed2108f1 100644 --- a/res/battle/moves/rollout/data.json +++ b/res/battle/moves/rollout/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 20, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_EACH_TURN_LOCK_INTO", + "type": "BATTLE_EFFECT_DOUBLE_POWER_EACH_TURN_LOCK_INTO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/roost/data.json b/res/battle/moves/roost/data.json index d3d551b22a..85c988e2db 100644 --- a/res/battle/moves/roost/data.json +++ b/res/battle/moves/roost/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HEAL_HALF_REMOVE_FLYING_TYPE", + "type": "BATTLE_EFFECT_HEAL_HALF_REMOVE_FLYING_TYPE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/sacred_fire/data.json b/res/battle/moves/sacred_fire/data.json index 3f38054c2b..f653feca05 100644 --- a/res/battle/moves/sacred_fire/data.json +++ b/res/battle/moves/sacred_fire/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 5, "effect": { - "type": "MOVE_EFFECT_THAW_AND_BURN_HIT", + "type": "BATTLE_EFFECT_THAW_AND_BURN_HIT", "chance": 50 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/safeguard/data.json b/res/battle/moves/safeguard/data.json index 1b0c58dcb4..4e7acfa1b1 100644 --- a/res/battle/moves/safeguard/data.json +++ b/res/battle/moves/safeguard/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 25, "effect": { - "type": "MOVE_EFFECT_PREVENT_STATUS", + "type": "BATTLE_EFFECT_PREVENT_STATUS", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/sand_attack/data.json b/res/battle/moves/sand_attack/data.json index 9d24187da7..070435178b 100644 --- a/res/battle/moves/sand_attack/data.json +++ b/res/battle/moves/sand_attack/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_ACC_DOWN", + "type": "BATTLE_EFFECT_ACC_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/sand_tomb/data.json b/res/battle/moves/sand_tomb/data.json index b6af375dd3..84564d54b7 100644 --- a/res/battle/moves/sand_tomb/data.json +++ b/res/battle/moves/sand_tomb/data.json @@ -6,15 +6,15 @@ "accuracy": 70, "pp": 15, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/sandstorm/data.json b/res/battle/moves/sandstorm/data.json index aba8f93c25..cf4302f6c2 100644 --- a/res/battle/moves/sandstorm/data.json +++ b/res/battle/moves/sandstorm/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_WEATHER_SANDSTORM", + "type": "BATTLE_EFFECT_WEATHER_SANDSTORM", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/scary_face/data.json b/res/battle/moves/scary_face/data.json index 4f46a07747..98d5ab1a6d 100644 --- a/res/battle/moves/scary_face/data.json +++ b/res/battle/moves/scary_face/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SPEED_DOWN_2", + "type": "BATTLE_EFFECT_SPEED_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 2, diff --git a/res/battle/moves/scratch/data.json b/res/battle/moves/scratch/data.json index b65a020cc5..d3625e48ae 100644 --- a/res/battle/moves/scratch/data.json +++ b/res/battle/moves/scratch/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/screech/data.json b/res/battle/moves/screech/data.json index 7fa6d729a3..1e16d718b1 100644 --- a/res/battle/moves/screech/data.json +++ b/res/battle/moves/screech/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 40, "effect": { - "type": "MOVE_EFFECT_DEF_DOWN_2", + "type": "BATTLE_EFFECT_DEF_DOWN_2", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 10, diff --git a/res/battle/moves/secret_power/data.json b/res/battle/moves/secret_power/data.json index 29694d04db..50790c924b 100644 --- a/res/battle/moves/secret_power/data.json +++ b/res/battle/moves/secret_power/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SECRET_POWER", + "type": "BATTLE_EFFECT_SECRET_POWER", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 14, diff --git a/res/battle/moves/seed_bomb/data.json b/res/battle/moves/seed_bomb/data.json index a84f684158..88ecab58be 100644 --- a/res/battle/moves/seed_bomb/data.json +++ b/res/battle/moves/seed_bomb/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/seed_flare/data.json b/res/battle/moves/seed_flare/data.json index 25ea91ed43..3b3acc4a3c 100644 --- a/res/battle/moves/seed_flare/data.json +++ b/res/battle/moves/seed_flare/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 5, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_2_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_2_HIT", "chance": 40 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/seismic_toss/data.json b/res/battle/moves/seismic_toss/data.json index 9e71c3a8f7..8036873baa 100644 --- a/res/battle/moves/seismic_toss/data.json +++ b/res/battle/moves/seismic_toss/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_LEVEL_DAMAGE_FLAT", + "type": "BATTLE_EFFECT_LEVEL_DAMAGE_FLAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 5, diff --git a/res/battle/moves/selfdestruct/data.json b/res/battle/moves/selfdestruct/data.json index 6384d8da4d..abf2193de5 100644 --- a/res/battle/moves/selfdestruct/data.json +++ b/res/battle/moves/selfdestruct/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HALVE_DEFENSE", + "type": "BATTLE_EFFECT_HALVE_DEFENSE", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 9, diff --git a/res/battle/moves/shadow_ball/data.json b/res/battle/moves/shadow_ball/data.json index 166c06b845..5f733e1814 100644 --- a/res/battle/moves/shadow_ball/data.json +++ b/res/battle/moves/shadow_ball/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_LOWER_SP_DEF_HIT", + "type": "BATTLE_EFFECT_LOWER_SP_DEF_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/shadow_claw/data.json b/res/battle/moves/shadow_claw/data.json index e243be973c..cd86a0198c 100644 --- a/res/battle/moves/shadow_claw/data.json +++ b/res/battle/moves/shadow_claw/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 17, diff --git a/res/battle/moves/shadow_force/data.json b/res/battle/moves/shadow_force/data.json index 6bd62489eb..5fc15df32d 100644 --- a/res/battle/moves/shadow_force/data.json +++ b/res/battle/moves/shadow_force/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_SHADOW_FORCE", + "type": "BATTLE_EFFECT_SHADOW_FORCE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 22, diff --git a/res/battle/moves/shadow_punch/data.json b/res/battle/moves/shadow_punch/data.json index a2b5d64263..d272731da3 100644 --- a/res/battle/moves/shadow_punch/data.json +++ b/res/battle/moves/shadow_punch/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/shadow_sneak/data.json b/res/battle/moves/shadow_sneak/data.json index 59324e5550..2ee66c2aaf 100644 --- a/res/battle/moves/shadow_sneak/data.json +++ b/res/battle/moves/shadow_sneak/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 1, diff --git a/res/battle/moves/sharpen/data.json b/res/battle/moves/sharpen/data.json index 1dae2f8c77..72f8c41fec 100644 --- a/res/battle/moves/sharpen/data.json +++ b/res/battle/moves/sharpen/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_ATK_UP", + "type": "BATTLE_EFFECT_ATK_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/sheer_cold/data.json b/res/battle/moves/sheer_cold/data.json index 9b4132e709..5e8b42c91a 100644 --- a/res/battle/moves/sheer_cold/data.json +++ b/res/battle/moves/sheer_cold/data.json @@ -6,14 +6,14 @@ "accuracy": 30, "pp": 5, "effect": { - "type": "MOVE_EFFECT_ONE_HIT_KO", + "type": "BATTLE_EFFECT_ONE_HIT_KO", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 9, diff --git a/res/battle/moves/shock_wave/data.json b/res/battle/moves/shock_wave/data.json index e382453522..9cdea6ab5a 100644 --- a/res/battle/moves/shock_wave/data.json +++ b/res/battle/moves/shock_wave/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/signal_beam/data.json b/res/battle/moves/signal_beam/data.json index 3033e0622c..5c1fc67dc7 100644 --- a/res/battle/moves/signal_beam/data.json +++ b/res/battle/moves/signal_beam/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/silver_wind/data.json b/res/battle/moves/silver_wind/data.json index fe015fda06..e594a6e48f 100644 --- a/res/battle/moves/silver_wind/data.json +++ b/res/battle/moves/silver_wind/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_RAISE_ALL_STATS_HIT", + "type": "BATTLE_EFFECT_RAISE_ALL_STATS_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/sing/data.json b/res/battle/moves/sing/data.json index cf9444d397..b90c9b2803 100644 --- a/res/battle/moves/sing/data.json +++ b/res/battle/moves/sing/data.json @@ -6,15 +6,15 @@ "accuracy": 55, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/sketch/data.json b/res/battle/moves/sketch/data.json index c0303e700b..9564f39b23 100644 --- a/res/battle/moves/sketch/data.json +++ b/res/battle/moves/sketch/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 1, "effect": { - "type": "MOVE_EFFECT_LEARN_MOVE_PERMANENT", + "type": "BATTLE_EFFECT_LEARN_MOVE_PERMANENT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", diff --git a/res/battle/moves/skill_swap/data.json b/res/battle/moves/skill_swap/data.json index 4c523a3166..eb54413550 100644 --- a/res/battle/moves/skill_swap/data.json +++ b/res/battle/moves/skill_swap/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWITCH_ABILITIES", + "type": "BATTLE_EFFECT_SWITCH_ABILITIES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 12, diff --git a/res/battle/moves/skull_bash/data.json b/res/battle/moves/skull_bash/data.json index 66da0253b5..5866c8a9c7 100644 --- a/res/battle/moves/skull_bash/data.json +++ b/res/battle/moves/skull_bash/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_CHARGE_TURN_DEF_UP", + "type": "BATTLE_EFFECT_CHARGE_TURN_DEF_UP", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/sky_attack/data.json b/res/battle/moves/sky_attack/data.json index 92aed2b4da..76c1377696 100644 --- a/res/battle/moves/sky_attack/data.json +++ b/res/battle/moves/sky_attack/data.json @@ -6,15 +6,15 @@ "accuracy": 90, "pp": 5, "effect": { - "type": "MOVE_EFFECT_CHARGE_TURN_HIGH_CRIT_FLINCH", + "type": "BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT_FLINCH", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/sky_uppercut/data.json b/res/battle/moves/sky_uppercut/data.json index 39f8baf185..4bf2532055 100644 --- a/res/battle/moves/sky_uppercut/data.json +++ b/res/battle/moves/sky_uppercut/data.json @@ -6,17 +6,17 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT_FLY", + "type": "BATTLE_EFFECT_HIT_FLY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/slack_off/data.json b/res/battle/moves/slack_off/data.json index 5d2cfbbd8c..8b72a45bdd 100644 --- a/res/battle/moves/slack_off/data.json +++ b/res/battle/moves/slack_off/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RESTORE_HALF_HP", + "type": "BATTLE_EFFECT_RESTORE_HALF_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/slam/data.json b/res/battle/moves/slam/data.json index e56164db7e..ab30372284 100644 --- a/res/battle/moves/slam/data.json +++ b/res/battle/moves/slam/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/slash/data.json b/res/battle/moves/slash/data.json index f4abb44c6f..0a1ad55a49 100644 --- a/res/battle/moves/slash/data.json +++ b/res/battle/moves/slash/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/sleep_powder/data.json b/res/battle/moves/sleep_powder/data.json index 8012224b59..623ae45e9c 100644 --- a/res/battle/moves/sleep_powder/data.json +++ b/res/battle/moves/sleep_powder/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/sleep_talk/data.json b/res/battle/moves/sleep_talk/data.json index 47b898e376..ef0b926b67 100644 --- a/res/battle/moves/sleep_talk/data.json +++ b/res/battle/moves/sleep_talk/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_USE_RANDOM_LEARNED_MOVE_SLEEP", + "type": "BATTLE_EFFECT_USE_RANDOM_LEARNED_MOVE_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/sludge/data.json b/res/battle/moves/sludge/data.json index 638cfa6a2d..df5a86b388 100644 --- a/res/battle/moves/sludge/data.json +++ b/res/battle/moves/sludge/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/sludge_bomb/data.json b/res/battle/moves/sludge_bomb/data.json index bd4137c081..8a042d123d 100644 --- a/res/battle/moves/sludge_bomb/data.json +++ b/res/battle/moves/sludge_bomb/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 18, diff --git a/res/battle/moves/smelling_salt/data.json b/res/battle/moves/smelling_salt/data.json index 5203c52c49..0b822de691 100644 --- a/res/battle/moves/smelling_salt/data.json +++ b/res/battle/moves/smelling_salt/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_AND_CURE_PARALYSIS", + "type": "BATTLE_EFFECT_DOUBLE_POWER_AND_CURE_PARALYSIS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 16, diff --git a/res/battle/moves/smog/data.json b/res/battle/moves/smog/data.json index 6113427b11..da8d00d2c3 100644 --- a/res/battle/moves/smog/data.json +++ b/res/battle/moves/smog/data.json @@ -6,14 +6,14 @@ "accuracy": 70, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POISON_HIT", + "type": "BATTLE_EFFECT_POISON_HIT", "chance": 40 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/smoke_screen/data.json b/res/battle/moves/smoke_screen/data.json index c206e33f21..2b2b20eab6 100644 --- a/res/battle/moves/smoke_screen/data.json +++ b/res/battle/moves/smoke_screen/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ACC_DOWN", + "type": "BATTLE_EFFECT_ACC_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/snatch/data.json b/res/battle/moves/snatch/data.json index 41376e2985..75ae5da134 100644 --- a/res/battle/moves/snatch/data.json +++ b/res/battle/moves/snatch/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STEAL_STATUS_MOVE", + "type": "BATTLE_EFFECT_STEAL_STATUS_MOVE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET_SPECIAL", diff --git a/res/battle/moves/snore/data.json b/res/battle/moves/snore/data.json index 0d6f43b009..d2f61c45a8 100644 --- a/res/battle/moves/snore/data.json +++ b/res/battle/moves/snore/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_DAMAGE_WHILE_ASLEEP", + "type": "BATTLE_EFFECT_DAMAGE_WHILE_ASLEEP", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/softboiled/data.json b/res/battle/moves/softboiled/data.json index 7f60b47e80..0ed2ff6c81 100644 --- a/res/battle/moves/softboiled/data.json +++ b/res/battle/moves/softboiled/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_RESTORE_HALF_HP", + "type": "BATTLE_EFFECT_RESTORE_HALF_HP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/solar_beam/data.json b/res/battle/moves/solar_beam/data.json index 52c3188cb2..4f0c9cd790 100644 --- a/res/battle/moves/solar_beam/data.json +++ b/res/battle/moves/solar_beam/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SKIP_CHARGE_TURN_IN_SUN", + "type": "BATTLE_EFFECT_SKIP_CHARGE_TURN_IN_SUN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 6, diff --git a/res/battle/moves/sonic_boom/data.json b/res/battle/moves/sonic_boom/data.json index 093231d5f3..400edeebb8 100644 --- a/res/battle/moves/sonic_boom/data.json +++ b/res/battle/moves/sonic_boom/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 20, "effect": { - "type": "MOVE_EFFECT_10_DAMAGE_FLAT", + "type": "BATTLE_EFFECT_10_DAMAGE_FLAT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/spacial_rend/data.json b/res/battle/moves/spacial_rend/data.json index c21597622a..221a27ae56 100644 --- a/res/battle/moves/spacial_rend/data.json +++ b/res/battle/moves/spacial_rend/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 4, diff --git a/res/battle/moves/spark/data.json b/res/battle/moves/spark/data.json index 7ef57b046a..c29415ac06 100644 --- a/res/battle/moves/spark/data.json +++ b/res/battle/moves/spark/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/spider_web/data.json b/res/battle/moves/spider_web/data.json index 74d03c12f2..c83071f717 100644 --- a/res/battle/moves/spider_web/data.json +++ b/res/battle/moves/spider_web/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_PREVENT_ESCAPE", + "type": "BATTLE_EFFECT_PREVENT_ESCAPE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 13, diff --git a/res/battle/moves/spike_cannon/data.json b/res/battle/moves/spike_cannon/data.json index 288f076fe4..858da9eec5 100644 --- a/res/battle/moves/spike_cannon/data.json +++ b/res/battle/moves/spike_cannon/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_MULTI_HIT", + "type": "BATTLE_EFFECT_MULTI_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/spikes/data.json b/res/battle/moves/spikes/data.json index 518ce6fff2..621a5607d9 100644 --- a/res/battle/moves/spikes/data.json +++ b/res/battle/moves/spikes/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SET_SPIKES", + "type": "BATTLE_EFFECT_SET_SPIKES", "chance": 0 }, "range": "RANGE_OPPONENT_SIDE", diff --git a/res/battle/moves/spit_up/data.json b/res/battle/moves/spit_up/data.json index e17410eda5..aea988d0c2 100644 --- a/res/battle/moves/spit_up/data.json +++ b/res/battle/moves/spit_up/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SPIT_UP", + "type": "BATTLE_EFFECT_SPIT_UP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/spite/data.json b/res/battle/moves/spite/data.json index 4b69bdde2b..53fb576817 100644 --- a/res/battle/moves/spite/data.json +++ b/res/battle/moves/spite/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DECREASE_LAST_MOVE_PP", + "type": "BATTLE_EFFECT_DECREASE_LAST_MOVE_PP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/splash/data.json b/res/battle/moves/splash/data.json index 366ad3619d..416cfe14de 100644 --- a/res/battle/moves/splash/data.json +++ b/res/battle/moves/splash/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_DO_NOTHING", + "type": "BATTLE_EFFECT_DO_NOTHING", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/spore/data.json b/res/battle/moves/spore/data.json index 792f0fc8e6..d998c6e47e 100644 --- a/res/battle/moves/spore/data.json +++ b/res/battle/moves/spore/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP", + "type": "BATTLE_EFFECT_STATUS_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 10, diff --git a/res/battle/moves/stealth_rock/data.json b/res/battle/moves/stealth_rock/data.json index 950761d522..6a5de1b9a9 100644 --- a/res/battle/moves/stealth_rock/data.json +++ b/res/battle/moves/stealth_rock/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_STEALTH_ROCK", + "type": "BATTLE_EFFECT_STEALTH_ROCK", "chance": 0 }, "range": "RANGE_OPPONENT_SIDE", diff --git a/res/battle/moves/steel_wing/data.json b/res/battle/moves/steel_wing/data.json index 5b3ec2b5c8..9287ca49ed 100644 --- a/res/battle/moves/steel_wing/data.json +++ b/res/battle/moves/steel_wing/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 25, "effect": { - "type": "MOVE_EFFECT_RAISE_DEF_HIT", + "type": "BATTLE_EFFECT_RAISE_DEF_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/stockpile/data.json b/res/battle/moves/stockpile/data.json index c50a54fa77..404f62ee86 100644 --- a/res/battle/moves/stockpile/data.json +++ b/res/battle/moves/stockpile/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_STOCKPILE", + "type": "BATTLE_EFFECT_STOCKPILE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/stomp/data.json b/res/battle/moves/stomp/data.json index dec5da1dcf..1d0a47fd75 100644 --- a/res/battle/moves/stomp/data.json +++ b/res/battle/moves/stomp/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FLINCH_MINIMIZE_DOUBLE_HIT", + "type": "BATTLE_EFFECT_FLINCH_MINIMIZE_DOUBLE_HIT", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/stone_edge/data.json b/res/battle/moves/stone_edge/data.json index aa266847d9..ab0c289916 100644 --- a/res/battle/moves/stone_edge/data.json +++ b/res/battle/moves/stone_edge/data.json @@ -6,15 +6,15 @@ "accuracy": 80, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIGH_CRITICAL", + "type": "BATTLE_EFFECT_HIGH_CRITICAL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/strength/data.json b/res/battle/moves/strength/data.json index 4fde69f2de..219e7f02d6 100644 --- a/res/battle/moves/strength/data.json +++ b/res/battle/moves/strength/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/string_shot/data.json b/res/battle/moves/string_shot/data.json index f545522017..bc7e30d9d2 100644 --- a/res/battle/moves/string_shot/data.json +++ b/res/battle/moves/string_shot/data.json @@ -6,15 +6,15 @@ "accuracy": 95, "pp": 40, "effect": { - "type": "MOVE_EFFECT_SPEED_DOWN", + "type": "BATTLE_EFFECT_SPEED_DOWN", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/struggle/data.json b/res/battle/moves/struggle/data.json index 9ec6fa44cb..3fdd2568e8 100644 --- a/res/battle/moves/struggle/data.json +++ b/res/battle/moves/struggle/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 1, "effect": { - "type": "MOVE_EFFECT_STRUGGLE", + "type": "BATTLE_EFFECT_STRUGGLE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/stun_spore/data.json b/res/battle/moves/stun_spore/data.json index e830363c17..c7029c7e86 100644 --- a/res/battle/moves/stun_spore/data.json +++ b/res/battle/moves/stun_spore/data.json @@ -6,16 +6,16 @@ "accuracy": 75, "pp": 30, "effect": { - "type": "MOVE_EFFECT_STATUS_PARALYZE", + "type": "BATTLE_EFFECT_STATUS_PARALYZE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/submission/data.json b/res/battle/moves/submission/data.json index 2b9b3469f1..c4eb604e62 100644 --- a/res/battle/moves/submission/data.json +++ b/res/battle/moves/submission/data.json @@ -6,16 +6,16 @@ "accuracy": 80, "pp": 25, "effect": { - "type": "MOVE_EFFECT_RECOIL_QUARTER", + "type": "BATTLE_EFFECT_RECOIL_QUARTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/substitute/data.json b/res/battle/moves/substitute/data.json index 0e2d154245..023420ed1b 100644 --- a/res/battle/moves/substitute/data.json +++ b/res/battle/moves/substitute/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SET_SUBSTITUTE", + "type": "BATTLE_EFFECT_SET_SUBSTITUTE", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 23, diff --git a/res/battle/moves/sucker_punch/data.json b/res/battle/moves/sucker_punch/data.json index d7c782b660..6cabeb948e 100644 --- a/res/battle/moves/sucker_punch/data.json +++ b/res/battle/moves/sucker_punch/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIT_FIRST_IF_TARGET_ATTACKING", + "type": "BATTLE_EFFECT_HIT_FIRST_IF_TARGET_ATTACKING", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 1, diff --git a/res/battle/moves/sunny_day/data.json b/res/battle/moves/sunny_day/data.json index 2966fea762..7769a976b4 100644 --- a/res/battle/moves/sunny_day/data.json +++ b/res/battle/moves/sunny_day/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_WEATHER_SUN", + "type": "BATTLE_EFFECT_WEATHER_SUN", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/super_fang/data.json b/res/battle/moves/super_fang/data.json index f917611e36..0c20c92939 100644 --- a/res/battle/moves/super_fang/data.json +++ b/res/battle/moves/super_fang/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HALVE_HP", + "type": "BATTLE_EFFECT_HALVE_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/superpower/data.json b/res/battle/moves/superpower/data.json index 976b5e78c8..f1333d9230 100644 --- a/res/battle/moves/superpower/data.json +++ b/res/battle/moves/superpower/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_LOWER_OWN_ATK_AND_DEF", + "type": "BATTLE_EFFECT_LOWER_OWN_ATK_AND_DEF", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 18, diff --git a/res/battle/moves/supersonic/data.json b/res/battle/moves/supersonic/data.json index b3d5fb433b..df295cee60 100644 --- a/res/battle/moves/supersonic/data.json +++ b/res/battle/moves/supersonic/data.json @@ -6,15 +6,15 @@ "accuracy": 55, "pp": 20, "effect": { - "type": "MOVE_EFFECT_STATUS_CONFUSE", + "type": "BATTLE_EFFECT_STATUS_CONFUSE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/surf/data.json b/res/battle/moves/surf/data.json index 4c577b9b16..9be690d44c 100644 --- a/res/battle/moves/surf/data.json +++ b/res/battle/moves/surf/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_DOUBLE_DAMAGE_DIVE", + "type": "BATTLE_EFFECT_DOUBLE_DAMAGE_DIVE", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/swagger/data.json b/res/battle/moves/swagger/data.json index a3e315a824..cb0aa936e4 100644 --- a/res/battle/moves/swagger/data.json +++ b/res/battle/moves/swagger/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_ATK_UP_2_STATUS_CONFUSION", + "type": "BATTLE_EFFECT_ATK_UP_2_STATUS_CONFUSION", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/swallow/data.json b/res/battle/moves/swallow/data.json index 4d99e17951..17fb8abf8f 100644 --- a/res/battle/moves/swallow/data.json +++ b/res/battle/moves/swallow/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWALLOW", + "type": "BATTLE_EFFECT_SWALLOW", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/sweet_kiss/data.json b/res/battle/moves/sweet_kiss/data.json index 0df0164349..aee4222490 100644 --- a/res/battle/moves/sweet_kiss/data.json +++ b/res/battle/moves/sweet_kiss/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_CONFUSE", + "type": "BATTLE_EFFECT_STATUS_CONFUSE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/sweet_scent/data.json b/res/battle/moves/sweet_scent/data.json index 6f716ff219..1f9480e919 100644 --- a/res/battle/moves/sweet_scent/data.json +++ b/res/battle/moves/sweet_scent/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_EVA_DOWN", + "type": "BATTLE_EFFECT_EVA_DOWN", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/swift/data.json b/res/battle/moves/swift/data.json index 03fa736dd2..00cc2f6a11 100644 --- a/res/battle/moves/swift/data.json +++ b/res/battle/moves/swift/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/switcheroo/data.json b/res/battle/moves/switcheroo/data.json index b09ad77a34..41049aefc9 100644 --- a/res/battle/moves/switcheroo/data.json +++ b/res/battle/moves/switcheroo/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWITCH_HELD_ITEMS", + "type": "BATTLE_EFFECT_SWITCH_HELD_ITEMS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 12, diff --git a/res/battle/moves/swords_dance/data.json b/res/battle/moves/swords_dance/data.json index bc47e0fb00..02bf561d2d 100644 --- a/res/battle/moves/swords_dance/data.json +++ b/res/battle/moves/swords_dance/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_ATK_UP_2", + "type": "BATTLE_EFFECT_ATK_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 11, diff --git a/res/battle/moves/synthesis/data.json b/res/battle/moves/synthesis/data.json index 74ccea5edd..6ef8ac17ff 100644 --- a/res/battle/moves/synthesis/data.json +++ b/res/battle/moves/synthesis/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HEAL_HALF_MORE_IN_SUN", + "type": "BATTLE_EFFECT_HEAL_HALF_MORE_IN_SUN", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 8, diff --git a/res/battle/moves/tackle/data.json b/res/battle/moves/tackle/data.json index 148493c29b..a754b895c2 100644 --- a/res/battle/moves/tackle/data.json +++ b/res/battle/moves/tackle/data.json @@ -6,17 +6,17 @@ "accuracy": 95, "pp": 35, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/tail_glow/data.json b/res/battle/moves/tail_glow/data.json index 40aec44144..5c58219f9a 100644 --- a/res/battle/moves/tail_glow/data.json +++ b/res/battle/moves/tail_glow/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SP_ATK_UP_2", + "type": "BATTLE_EFFECT_SP_ATK_UP_2", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 11, diff --git a/res/battle/moves/tail_whip/data.json b/res/battle/moves/tail_whip/data.json index 040dc6c919..efd8f25c70 100644 --- a/res/battle/moves/tail_whip/data.json +++ b/res/battle/moves/tail_whip/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_DEF_DOWN", + "type": "BATTLE_EFFECT_DEF_DOWN", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/tailwind/data.json b/res/battle/moves/tailwind/data.json index 8f82d5f298..c7ce018382 100644 --- a/res/battle/moves/tailwind/data.json +++ b/res/battle/moves/tailwind/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 30, "effect": { - "type": "MOVE_EFFECT_DOUBLE_SPEED_3_TURNS", + "type": "BATTLE_EFFECT_DOUBLE_SPEED_3_TURNS", "chance": 0 }, "range": "RANGE_USER_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH" + "MOVE_FLAG_CAN_SNATCH" ], "contest": { "effect": 1, diff --git a/res/battle/moves/take_down/data.json b/res/battle/moves/take_down/data.json index 935e22ce93..cc6949db44 100644 --- a/res/battle/moves/take_down/data.json +++ b/res/battle/moves/take_down/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_RECOIL_QUARTER", + "type": "BATTLE_EFFECT_RECOIL_QUARTER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/taunt/data.json b/res/battle/moves/taunt/data.json index 726860466b..2bbaf76b39 100644 --- a/res/battle/moves/taunt/data.json +++ b/res/battle/moves/taunt/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_TAUNT", + "type": "BATTLE_EFFECT_TAUNT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/teeter_dance/data.json b/res/battle/moves/teeter_dance/data.json index 09c24b0f67..59f04075d6 100644 --- a/res/battle/moves/teeter_dance/data.json +++ b/res/battle/moves/teeter_dance/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONFUSE_ALL", + "type": "BATTLE_EFFECT_CONFUSE_ALL", "chance": 0 }, "range": "RANGE_ALL_ADJACENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 14, diff --git a/res/battle/moves/teleport/data.json b/res/battle/moves/teleport/data.json index d830ff939c..fcb8fab0e4 100644 --- a/res/battle/moves/teleport/data.json +++ b/res/battle/moves/teleport/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FLEE_FROM_WILD_BATTLE", + "type": "BATTLE_EFFECT_FLEE_FROM_WILD_BATTLE", "chance": 0 }, "range": "RANGE_USER", diff --git a/res/battle/moves/thief/data.json b/res/battle/moves/thief/data.json index 95d2902877..44aacc17ca 100644 --- a/res/battle/moves/thief/data.json +++ b/res/battle/moves/thief/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STEAL_HELD_ITEM", + "type": "BATTLE_EFFECT_STEAL_HELD_ITEM", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 12, diff --git a/res/battle/moves/thrash/data.json b/res/battle/moves/thrash/data.json index 1053185871..6a3feaa997 100644 --- a/res/battle/moves/thrash/data.json +++ b/res/battle/moves/thrash/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONTINUE_AND_CONFUSE_SELF", + "type": "BATTLE_EFFECT_CONTINUE_AND_CONFUSE_SELF", "chance": 0 }, "range": "RANGE_RANDOM_OPPONENT", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 7, diff --git a/res/battle/moves/thunder/data.json b/res/battle/moves/thunder/data.json index 6fd540473d..8457db9ef0 100644 --- a/res/battle/moves/thunder/data.json +++ b/res/battle/moves/thunder/data.json @@ -6,15 +6,15 @@ "accuracy": 70, "pp": 10, "effect": { - "type": "MOVE_EFFECT_THUNDER", + "type": "BATTLE_EFFECT_THUNDER", "chance": 30 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/thunder_fang/data.json b/res/battle/moves/thunder_fang/data.json index ef60948068..d140f2df2e 100644 --- a/res/battle/moves/thunder_fang/data.json +++ b/res/battle/moves/thunder_fang/data.json @@ -6,16 +6,16 @@ "accuracy": 95, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_PARALYZE_HIT", + "type": "BATTLE_EFFECT_FLINCH_PARALYZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/thunder_punch/data.json b/res/battle/moves/thunder_punch/data.json index 4612d068fa..837e01f228 100644 --- a/res/battle/moves/thunder_punch/data.json +++ b/res/battle/moves/thunder_punch/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/thunder_shock/data.json b/res/battle/moves/thunder_shock/data.json index 7c3e6b72ef..73782200c4 100644 --- a/res/battle/moves/thunder_shock/data.json +++ b/res/battle/moves/thunder_shock/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/thunder_wave/data.json b/res/battle/moves/thunder_wave/data.json index cceea6d21b..2d34cae3ad 100644 --- a/res/battle/moves/thunder_wave/data.json +++ b/res/battle/moves/thunder_wave/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_STATUS_PARALYZE", + "type": "BATTLE_EFFECT_STATUS_PARALYZE", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/thunderbolt/data.json b/res/battle/moves/thunderbolt/data.json index 558e9f7962..9b5f761282 100644 --- a/res/battle/moves/thunderbolt/data.json +++ b/res/battle/moves/thunderbolt/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/tickle/data.json b/res/battle/moves/tickle/data.json index 683d8fd84c..6022477431 100644 --- a/res/battle/moves/tickle/data.json +++ b/res/battle/moves/tickle/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_ATK_DEF_DOWN", + "type": "BATTLE_EFFECT_ATK_DEF_DOWN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 19, diff --git a/res/battle/moves/torment/data.json b/res/battle/moves/torment/data.json index 7790d781d0..37d78a2f9f 100644 --- a/res/battle/moves/torment/data.json +++ b/res/battle/moves/torment/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_TORMENT", + "type": "BATTLE_EFFECT_TORMENT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 16, diff --git a/res/battle/moves/toxic/data.json b/res/battle/moves/toxic/data.json index fe8c95c5db..ad607e22af 100644 --- a/res/battle/moves/toxic/data.json +++ b/res/battle/moves/toxic/data.json @@ -6,15 +6,15 @@ "accuracy": 85, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_BADLY_POISON", + "type": "BATTLE_EFFECT_STATUS_BADLY_POISON", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/toxic_spikes/data.json b/res/battle/moves/toxic_spikes/data.json index 1eceaa255e..3b145f04c5 100644 --- a/res/battle/moves/toxic_spikes/data.json +++ b/res/battle/moves/toxic_spikes/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 20, "effect": { - "type": "MOVE_EFFECT_TOXIC_SPIKES", + "type": "BATTLE_EFFECT_TOXIC_SPIKES", "chance": 0 }, "range": "RANGE_OPPONENT_SIDE", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/transform/data.json b/res/battle/moves/transform/data.json index 861d97cabe..b2a2b73e93 100644 --- a/res/battle/moves/transform/data.json +++ b/res/battle/moves/transform/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_TRANSFORM", + "type": "BATTLE_EFFECT_TRANSFORM", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 23, diff --git a/res/battle/moves/tri_attack/data.json b/res/battle/moves/tri_attack/data.json index ce3c178649..c0e518c301 100644 --- a/res/battle/moves/tri_attack/data.json +++ b/res/battle/moves/tri_attack/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_TRI_ATTACK", + "type": "BATTLE_EFFECT_TRI_ATTACK", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 5, diff --git a/res/battle/moves/trick/data.json b/res/battle/moves/trick/data.json index d9e2dda573..aaae2263d3 100644 --- a/res/battle/moves/trick/data.json +++ b/res/battle/moves/trick/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SWITCH_HELD_ITEMS", + "type": "BATTLE_EFFECT_SWITCH_HELD_ITEMS", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 12, diff --git a/res/battle/moves/trick_room/data.json b/res/battle/moves/trick_room/data.json index c2aadb5378..12e27193a0 100644 --- a/res/battle/moves/trick_room/data.json +++ b/res/battle/moves/trick_room/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_TRICK_ROOM", + "type": "BATTLE_EFFECT_TRICK_ROOM", "chance": 0 }, "range": "RANGE_FIELD", "priority": -7, "flags": [ - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 14, diff --git a/res/battle/moves/triple_kick/data.json b/res/battle/moves/triple_kick/data.json index 243936d9fa..c4116ba653 100644 --- a/res/battle/moves/triple_kick/data.json +++ b/res/battle/moves/triple_kick/data.json @@ -6,17 +6,17 @@ "accuracy": 90, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HIT_THREE_TIMES", + "type": "BATTLE_EFFECT_HIT_THREE_TIMES", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/trump_card/data.json b/res/battle/moves/trump_card/data.json index a0c4b887d2..2372376828 100644 --- a/res/battle/moves/trump_card/data.json +++ b/res/battle/moves/trump_card/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 5, "effect": { - "type": "MOVE_EFFECT_HIGHER_POWER_WHEN_LOW_PP", + "type": "BATTLE_EFFECT_HIGHER_POWER_WHEN_LOW_PP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/twineedle/data.json b/res/battle/moves/twineedle/data.json index 40e21af874..ffac246607 100644 --- a/res/battle/moves/twineedle/data.json +++ b/res/battle/moves/twineedle/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_POISON_MULTI_HIT", + "type": "BATTLE_EFFECT_POISON_MULTI_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 7, diff --git a/res/battle/moves/twister/data.json b/res/battle/moves/twister/data.json index 59a2068b57..2cd0f86a39 100644 --- a/res/battle/moves/twister/data.json +++ b/res/battle/moves/twister/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FLINCH_DOUBLE_DAMAGE_FLY_OR_BOUNCE", + "type": "BATTLE_EFFECT_FLINCH_DOUBLE_DAMAGE_FLY_OR_BOUNCE", "chance": 20 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/u_turn/data.json b/res/battle/moves/u_turn/data.json index 1155276803..4a1bd001fd 100644 --- a/res/battle/moves/u_turn/data.json +++ b/res/battle/moves/u_turn/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_SWITCH_HIT", + "type": "BATTLE_EFFECT_SWITCH_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 16, diff --git a/res/battle/moves/uproar/data.json b/res/battle/moves/uproar/data.json index ebd7751751..136188f6e6 100644 --- a/res/battle/moves/uproar/data.json +++ b/res/battle/moves/uproar/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_UPROAR", + "type": "BATTLE_EFFECT_UPROAR", "chance": 0 }, "range": "RANGE_RANDOM_OPPONENT", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 10, diff --git a/res/battle/moves/vacuum_wave/data.json b/res/battle/moves/vacuum_wave/data.json index 5b72cca267..274192dbe0 100644 --- a/res/battle/moves/vacuum_wave/data.json +++ b/res/battle/moves/vacuum_wave/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_PRIORITY_1", + "type": "BATTLE_EFFECT_PRIORITY_1", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 1, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 1, diff --git a/res/battle/moves/vice_grip/data.json b/res/battle/moves/vice_grip/data.json index 2737b5312b..3d4ddf0220 100644 --- a/res/battle/moves/vice_grip/data.json +++ b/res/battle/moves/vice_grip/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 30, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/vine_whip/data.json b/res/battle/moves/vine_whip/data.json index 32b7b4745c..b77c081985 100644 --- a/res/battle/moves/vine_whip/data.json +++ b/res/battle/moves/vine_whip/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/vital_throw/data.json b/res/battle/moves/vital_throw/data.json index d71000bd61..92f46c6179 100644 --- a/res/battle/moves/vital_throw/data.json +++ b/res/battle/moves/vital_throw/data.json @@ -6,16 +6,16 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_PRIORITY_NEG_1_BYPASS_ACCURACY", + "type": "BATTLE_EFFECT_PRIORITY_NEG_1_BYPASS_ACCURACY", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -1, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 2, diff --git a/res/battle/moves/volt_tackle/data.json b/res/battle/moves/volt_tackle/data.json index 8873589472..b4f44bf907 100644 --- a/res/battle/moves/volt_tackle/data.json +++ b/res/battle/moves/volt_tackle/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOIL_PARALYZE_HIT", + "type": "BATTLE_EFFECT_RECOIL_PARALYZE_HIT", "chance": 10 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 22, diff --git a/res/battle/moves/wake_up_slap/data.json b/res/battle/moves/wake_up_slap/data.json index c389770226..536ac31b98 100644 --- a/res/battle/moves/wake_up_slap/data.json +++ b/res/battle/moves/wake_up_slap/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_DOUBLE_POWER_HEAL_SLEEP", + "type": "BATTLE_EFFECT_DOUBLE_POWER_HEAL_SLEEP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 16, diff --git a/res/battle/moves/water_gun/data.json b/res/battle/moves/water_gun/data.json index 15f69c4d4b..bef4d31456 100644 --- a/res/battle/moves/water_gun/data.json +++ b/res/battle/moves/water_gun/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 25, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 5, diff --git a/res/battle/moves/water_pulse/data.json b/res/battle/moves/water_pulse/data.json index 4b0189978e..d7021245b3 100644 --- a/res/battle/moves/water_pulse/data.json +++ b/res/battle/moves/water_pulse/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_CONFUSE_HIT", + "type": "BATTLE_EFFECT_CONFUSE_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 17, diff --git a/res/battle/moves/water_sport/data.json b/res/battle/moves/water_sport/data.json index 47949053b2..c70e7837e1 100644 --- a/res/battle/moves/water_sport/data.json +++ b/res/battle/moves/water_sport/data.json @@ -6,7 +6,7 @@ "accuracy": 0, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HALVE_FIRE_DAMAGE", + "type": "BATTLE_EFFECT_HALVE_FIRE_DAMAGE", "chance": 0 }, "range": "RANGE_FIELD", diff --git a/res/battle/moves/water_spout/data.json b/res/battle/moves/water_spout/data.json index 5bfb360ad9..c45259d712 100644 --- a/res/battle/moves/water_spout/data.json +++ b/res/battle/moves/water_spout/data.json @@ -6,14 +6,14 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP", + "type": "BATTLE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP", "chance": 0 }, "range": "RANGE_ADJACENT_OPPONENTS", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 22, diff --git a/res/battle/moves/waterfall/data.json b/res/battle/moves/waterfall/data.json index 26cea4ce25..bb5fbe70fe 100644 --- a/res/battle/moves/waterfall/data.json +++ b/res/battle/moves/waterfall/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 5, diff --git a/res/battle/moves/weather_ball/data.json b/res/battle/moves/weather_ball/data.json index 6da407cb76..025aeab0e3 100644 --- a/res/battle/moves/weather_ball/data.json +++ b/res/battle/moves/weather_ball/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_CHANGE_TYPE_WITH_WEATHER", + "type": "BATTLE_EFFECT_CHANGE_TYPE_WITH_WEATHER", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 4, diff --git a/res/battle/moves/whirlpool/data.json b/res/battle/moves/whirlpool/data.json index 2146c7ef92..f13f4cbe44 100644 --- a/res/battle/moves/whirlpool/data.json +++ b/res/battle/moves/whirlpool/data.json @@ -6,16 +6,16 @@ "accuracy": 70, "pp": 15, "effect": { - "type": "MOVE_EFFECT_WHIRLPOOL", + "type": "BATTLE_EFFECT_WHIRLPOOL", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 21, diff --git a/res/battle/moves/whirlwind/data.json b/res/battle/moves/whirlwind/data.json index f195d21fb0..d2d1a73f6c 100644 --- a/res/battle/moves/whirlwind/data.json +++ b/res/battle/moves/whirlwind/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 20, "effect": { - "type": "MOVE_EFFECT_FORCE_SWITCH", + "type": "BATTLE_EFFECT_FORCE_SWITCH", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": -6, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 9, diff --git a/res/battle/moves/will_o_wisp/data.json b/res/battle/moves/will_o_wisp/data.json index dd85fa2bba..2ba20c810a 100644 --- a/res/battle/moves/will_o_wisp/data.json +++ b/res/battle/moves/will_o_wisp/data.json @@ -6,15 +6,15 @@ "accuracy": 75, "pp": 15, "effect": { - "type": "MOVE_EFFECT_STATUS_BURN", + "type": "BATTLE_EFFECT_STATUS_BURN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 17, diff --git a/res/battle/moves/wing_attack/data.json b/res/battle/moves/wing_attack/data.json index 3cec11a1f0..df6d6156e3 100644 --- a/res/battle/moves/wing_attack/data.json +++ b/res/battle/moves/wing_attack/data.json @@ -6,17 +6,17 @@ "accuracy": 100, "pp": 35, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 5, diff --git a/res/battle/moves/wish/data.json b/res/battle/moves/wish/data.json index ea183c8b26..95c74d3ff3 100644 --- a/res/battle/moves/wish/data.json +++ b/res/battle/moves/wish/data.json @@ -6,13 +6,13 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_HEAL_IN_3_TURNS", + "type": "BATTLE_EFFECT_HEAL_IN_3_TURNS", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 8, diff --git a/res/battle/moves/withdraw/data.json b/res/battle/moves/withdraw/data.json index 018aa6c5f2..50917b796b 100644 --- a/res/battle/moves/withdraw/data.json +++ b/res/battle/moves/withdraw/data.json @@ -6,14 +6,14 @@ "accuracy": 0, "pp": 40, "effect": { - "type": "MOVE_EFFECT_DEF_UP", + "type": "BATTLE_EFFECT_DEF_UP", "chance": 0 }, "range": "RANGE_USER", "priority": 0, "flags": [ - "MOVE_FLAG_SNATCH", - "MOVE_FLAG_HIDE_HP_BARS" + "MOVE_FLAG_CAN_SNATCH", + "MOVE_FLAG_HIDES_HP_GAUGES" ], "contest": { "effect": 13, diff --git a/res/battle/moves/wood_hammer/data.json b/res/battle/moves/wood_hammer/data.json index 70365fc6f8..b3db97e205 100644 --- a/res/battle/moves/wood_hammer/data.json +++ b/res/battle/moves/wood_hammer/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_RECOIL_THIRD", + "type": "BATTLE_EFFECT_RECOIL_THIRD", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/res/battle/moves/worry_seed/data.json b/res/battle/moves/worry_seed/data.json index c6a871846f..bc54cd504d 100644 --- a/res/battle/moves/worry_seed/data.json +++ b/res/battle/moves/worry_seed/data.json @@ -6,15 +6,15 @@ "accuracy": 100, "pp": 10, "effect": { - "type": "MOVE_EFFECT_SET_ABILITY_TO_INSOMNIA", + "type": "BATTLE_EFFECT_SET_ABILITY_TO_INSOMNIA", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/wrap/data.json b/res/battle/moves/wrap/data.json index d6a2a7aae2..6bd8699dc0 100644 --- a/res/battle/moves/wrap/data.json +++ b/res/battle/moves/wrap/data.json @@ -6,16 +6,16 @@ "accuracy": 85, "pp": 20, "effect": { - "type": "MOVE_EFFECT_BIND_HIT", + "type": "BATTLE_EFFECT_BIND_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 21, diff --git a/res/battle/moves/wring_out/data.json b/res/battle/moves/wring_out/data.json index 5d413347a7..d2305d13ed 100644 --- a/res/battle/moves/wring_out/data.json +++ b/res/battle/moves/wring_out/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 5, "effect": { - "type": "MOVE_EFFECT_INCREASE_POWER_WITH_MORE_HP", + "type": "BATTLE_EFFECT_INCREASE_POWER_WITH_MORE_HP", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 22, diff --git a/res/battle/moves/x_scissor/data.json b/res/battle/moves/x_scissor/data.json index 34bb195d5b..34b9845d71 100644 --- a/res/battle/moves/x_scissor/data.json +++ b/res/battle/moves/x_scissor/data.json @@ -6,16 +6,16 @@ "accuracy": 100, "pp": 15, "effect": { - "type": "MOVE_EFFECT_HIT", + "type": "BATTLE_EFFECT_HIT", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 17, diff --git a/res/battle/moves/yawn/data.json b/res/battle/moves/yawn/data.json index d053945d7b..275b2e19ac 100644 --- a/res/battle/moves/yawn/data.json +++ b/res/battle/moves/yawn/data.json @@ -6,15 +6,15 @@ "accuracy": 0, "pp": 10, "effect": { - "type": "MOVE_EFFECT_STATUS_SLEEP_NEXT_TURN", + "type": "BATTLE_EFFECT_STATUS_SLEEP_NEXT_TURN", "chance": 0 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MAGIC_COAT", - "MOVE_FLAG_MIRROR_MOVE" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MAGIC_COAT", + "MOVE_FLAG_CAN_MIRROR_MOVE" ], "contest": { "effect": 19, diff --git a/res/battle/moves/zap_cannon/data.json b/res/battle/moves/zap_cannon/data.json index 0dcefc73c1..945b74858e 100644 --- a/res/battle/moves/zap_cannon/data.json +++ b/res/battle/moves/zap_cannon/data.json @@ -6,15 +6,15 @@ "accuracy": 50, "pp": 5, "effect": { - "type": "MOVE_EFFECT_PARALYZE_HIT", + "type": "BATTLE_EFFECT_PARALYZE_HIT", "chance": 100 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_HIDE_SHADOWS" + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_HIDES_SHADOWS" ], "contest": { "effect": 4, diff --git a/res/battle/moves/zen_headbutt/data.json b/res/battle/moves/zen_headbutt/data.json index 4dac2dd588..50e5490ba5 100644 --- a/res/battle/moves/zen_headbutt/data.json +++ b/res/battle/moves/zen_headbutt/data.json @@ -6,16 +6,16 @@ "accuracy": 90, "pp": 15, "effect": { - "type": "MOVE_EFFECT_FLINCH_HIT", + "type": "BATTLE_EFFECT_FLINCH_HIT", "chance": 20 }, "range": "RANGE_SINGLE_TARGET", "priority": 0, "flags": [ - "MOVE_FLAG_CONTACT", - "MOVE_FLAG_PROTECT", - "MOVE_FLAG_MIRROR_MOVE", - "MOVE_FLAG_KINGS_ROCK" + "MOVE_FLAG_MAKES_CONTACT", + "MOVE_FLAG_CAN_PROTECT", + "MOVE_FLAG_CAN_MIRROR_MOVE", + "MOVE_FLAG_TRIGGERS_KINGS_ROCK" ], "contest": { "effect": 18, diff --git a/tools/json2bin/movedata.py b/tools/json2bin/movedata.py index 0e0d68dddd..550e04cd3c 100644 --- a/tools/json2bin/movedata.py +++ b/tools/json2bin/movedata.py @@ -1,13 +1,10 @@ #!/usr/bin/env python3 import pathlib -from consts import ( - movedata, - moves -) - -from consts.pokemon import ( - mon_type +from consts.generated.py import ( + battle, + moves, + pokemon ) import json2bin as j2b @@ -15,22 +12,25 @@ SCHEMA = j2b.Parser() \ .register_name(lambda s: s) \ - .register('effect.type', 2, j2b.parse_const, movedata.MoveEffect) \ - .register('class', 1, j2b.parse_const, movedata.MoveClass) \ + .register('effect.type', 2, j2b.parse_const, battle.BattleEffect) \ + .register('class', 1, j2b.parse_const, moves.MoveClass) \ .register('power', 1, j2b.parse_int) \ - .register('type', 1, j2b.parse_const, mon_type.PokeType) \ + .register('type', 1, j2b.parse_const, pokemon.PokemonType) \ .register('accuracy', 1, j2b.parse_int) \ .register('pp', 1, j2b.parse_int) \ .register('effect.chance', 1, j2b.parse_int) \ - .register('range', 2, j2b.parse_const, movedata.MoveRange) \ + .register('range', 2, j2b.parse_const, battle.MoveRange) \ .register('priority', 1, j2b.parse_sint) \ - .register('flags', 1, j2b.pack_flags, movedata.MoveFlags) \ + .register('flags', 1, j2b.pack_flags, battle.MoveFlags) \ .register('contest.effect', 1, j2b.parse_int) \ - .register('contest.type', 1, j2b.parse_const, mon_type.ContestType) \ + .register('contest.type', 1, j2b.parse_const, pokemon.PokemonContestType) \ .pad(2) - def indexer(file_path: pathlib.Path) -> int: + stem = file_path.parent.stem.upper() + if stem.isnumeric(): + return int(stem) + return moves.Move[f'MOVE_{file_path.parent.stem.upper()}'].value From 05288e102d585ab77e010ea0c89220e1a2b4de64 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 6 Feb 2024 22:32:25 -0800 Subject: [PATCH 10/10] Delete leftover json2bin consts definitions --- tools/json2bin/consts/item.py | 472 ----------------- tools/json2bin/consts/movedata.py | 313 ----------- tools/json2bin/consts/moves.py | 474 ----------------- tools/json2bin/consts/pokemon/ability.py | 128 ----- tools/json2bin/consts/pokemon/color.py | 15 - tools/json2bin/consts/pokemon/egg_group.py | 20 - tools/json2bin/consts/pokemon/evo_methods.py | 31 -- tools/json2bin/consts/pokemon/exp_rate.py | 10 - tools/json2bin/consts/pokemon/gender_ratio.py | 12 - tools/json2bin/consts/pokemon/mon_type.py | 31 -- tools/json2bin/consts/pokemon/shadow.py | 8 - tools/json2bin/consts/pokemon/species.py | 500 ------------------ tools/json2bin/consts/pokemon/tms.py | 104 ---- tools/json2bin/consts/trainer.py | 124 ----- 14 files changed, 2242 deletions(-) delete mode 100644 tools/json2bin/consts/item.py delete mode 100644 tools/json2bin/consts/movedata.py delete mode 100644 tools/json2bin/consts/moves.py delete mode 100644 tools/json2bin/consts/pokemon/ability.py delete mode 100644 tools/json2bin/consts/pokemon/color.py delete mode 100644 tools/json2bin/consts/pokemon/egg_group.py delete mode 100644 tools/json2bin/consts/pokemon/evo_methods.py delete mode 100644 tools/json2bin/consts/pokemon/exp_rate.py delete mode 100644 tools/json2bin/consts/pokemon/gender_ratio.py delete mode 100644 tools/json2bin/consts/pokemon/mon_type.py delete mode 100644 tools/json2bin/consts/pokemon/shadow.py delete mode 100644 tools/json2bin/consts/pokemon/species.py delete mode 100644 tools/json2bin/consts/pokemon/tms.py delete mode 100644 tools/json2bin/consts/trainer.py diff --git a/tools/json2bin/consts/item.py b/tools/json2bin/consts/item.py deleted file mode 100644 index 61b2f0a0cf..0000000000 --- a/tools/json2bin/consts/item.py +++ /dev/null @@ -1,472 +0,0 @@ -from enum import Enum, auto - - -class Item(Enum): - ITEM_NONE = 0 - ITEM_MASTER_BALL = auto() - ITEM_ULTRA_BALL = auto() - ITEM_GREAT_BALL = auto() - ITEM_POKE_BALL = auto() - ITEM_SAFARI_BALL = auto() - ITEM_NET_BALL = auto() - ITEM_DIVE_BALL = auto() - ITEM_NEST_BALL = auto() - ITEM_REPEAT_BALL = auto() - ITEM_TIMER_BALL = auto() - ITEM_LUXURY_BALL = auto() - ITEM_PREMIER_BALL = auto() - ITEM_DUSK_BALL = auto() - ITEM_HEAL_BALL = auto() - ITEM_QUICK_BALL = auto() - ITEM_CHERISH_BALL = auto() - ITEM_POTION = auto() - ITEM_ANTIDOTE = auto() - ITEM_BURN_HEAL = auto() - ITEM_ICE_HEAL = auto() - ITEM_AWAKENING = auto() - ITEM_PARLYZ_HEAL = auto() - ITEM_FULL_RESTORE = auto() - ITEM_MAX_POTION = auto() - ITEM_HYPER_POTION = auto() - ITEM_SUPER_POTION = auto() - ITEM_FULL_HEAL = auto() - ITEM_REVIVE = auto() - ITEM_MAX_REVIVE = auto() - ITEM_FRESH_WATER = auto() - ITEM_SODA_POP = auto() - ITEM_LEMONADE = auto() - ITEM_MOOMOO_MILK = auto() - ITEM_ENERGYPOWDER = auto() - ITEM_ENERGY_ROOT = auto() - ITEM_HEAL_POWDER = auto() - ITEM_REVIVAL_HERB = auto() - ITEM_ETHER = auto() - ITEM_MAX_ETHER = auto() - ITEM_ELIXIR = auto() - ITEM_MAX_ELIXIR = auto() - ITEM_LAVA_COOKIE = auto() - ITEM_BERRY_JUICE = auto() - ITEM_SACRED_ASH = auto() - ITEM_HP_UP = auto() - ITEM_PROTEIN = auto() - ITEM_IRON = auto() - ITEM_CARBOS = auto() - ITEM_CALCIUM = auto() - ITEM_RARE_CANDY = auto() - ITEM_PP_UP = auto() - ITEM_ZINC = auto() - ITEM_PP_MAX = auto() - ITEM_OLD_GATEAU = auto() - ITEM_GUARD_SPEC_ = auto() - ITEM_DIRE_HIT = auto() - ITEM_X_ATTACK = auto() - ITEM_X_DEFENSE = auto() - ITEM_X_SPEED = auto() - ITEM_X_ACCURACY = auto() - ITEM_X_SPECIAL = auto() - ITEM_X_SP__DEF = auto() - ITEM_POKE_DOLL = auto() - ITEM_FLUFFY_TAIL = auto() - ITEM_BLUE_FLUTE = auto() - ITEM_YELLOW_FLUTE = auto() - ITEM_RED_FLUTE = auto() - ITEM_BLACK_FLUTE = auto() - ITEM_WHITE_FLUTE = auto() - ITEM_SHOAL_SALT = auto() - ITEM_SHOAL_SHELL = auto() - ITEM_RED_SHARD = auto() - ITEM_BLUE_SHARD = auto() - ITEM_YELLOW_SHARD = auto() - ITEM_GREEN_SHARD = auto() - ITEM_SUPER_REPEL = auto() - ITEM_MAX_REPEL = auto() - ITEM_ESCAPE_ROPE = auto() - ITEM_REPEL = auto() - ITEM_SUN_STONE = auto() - ITEM_MOON_STONE = auto() - ITEM_FIRE_STONE = auto() - ITEM_THUNDERSTONE = auto() - ITEM_WATER_STONE = auto() - ITEM_LEAF_STONE = auto() - ITEM_TINYMUSHROOM = auto() - ITEM_BIG_MUSHROOM = auto() - ITEM_PEARL = auto() - ITEM_BIG_PEARL = auto() - ITEM_STARDUST = auto() - ITEM_STAR_PIECE = auto() - ITEM_NUGGET = auto() - ITEM_HEART_SCALE = auto() - ITEM_HONEY = auto() - ITEM_GROWTH_MULCH = auto() - ITEM_DAMP_MULCH = auto() - ITEM_STABLE_MULCH = auto() - ITEM_GOOEY_MULCH = auto() - ITEM_ROOT_FOSSIL = auto() - ITEM_CLAW_FOSSIL = auto() - ITEM_HELIX_FOSSIL = auto() - ITEM_DOME_FOSSIL = auto() - ITEM_OLD_AMBER = auto() - ITEM_ARMOR_FOSSIL = auto() - ITEM_SKULL_FOSSIL = auto() - ITEM_RARE_BONE = auto() - ITEM_SHINY_STONE = auto() - ITEM_DUSK_STONE = auto() - ITEM_DAWN_STONE = auto() - ITEM_OVAL_STONE = auto() - ITEM_ODD_KEYSTONE = auto() - ITEM_GRISEOUS_ORB = auto() - ITEM_UNUSED_113 = auto() - ITEM_UNUSED_114 = auto() - ITEM_UNUSED_115 = auto() - ITEM_UNUSED_116 = auto() - ITEM_UNUSED_117 = auto() - ITEM_UNUSED_118 = auto() - ITEM_UNUSED_119 = auto() - ITEM_UNUSED_120 = auto() - ITEM_UNUSED_121 = auto() - ITEM_UNUSED_122 = auto() - ITEM_UNUSED_123 = auto() - ITEM_UNUSED_124 = auto() - ITEM_UNUSED_125 = auto() - ITEM_UNUSED_126 = auto() - ITEM_UNUSED_127 = auto() - ITEM_UNUSED_128 = auto() - ITEM_UNUSED_129 = auto() - ITEM_UNUSED_130 = auto() - ITEM_UNUSED_131 = auto() - ITEM_UNUSED_132 = auto() - ITEM_UNUSED_133 = auto() - ITEM_UNUSED_134 = auto() - ITEM_ADAMANT_ORB = auto() - ITEM_LUSTROUS_ORB = auto() - ITEM_GRASS_MAIL = auto() - ITEM_FLAME_MAIL = auto() - ITEM_BUBBLE_MAIL = auto() - ITEM_BLOOM_MAIL = auto() - ITEM_TUNNEL_MAIL = auto() - ITEM_STEEL_MAIL = auto() - ITEM_HEART_MAIL = auto() - ITEM_SNOW_MAIL = auto() - ITEM_SPACE_MAIL = auto() - ITEM_AIR_MAIL = auto() - ITEM_MOSAIC_MAIL = auto() - ITEM_BRICK_MAIL = auto() - ITEM_CHERI_BERRY = auto() - ITEM_CHESTO_BERRY = auto() - ITEM_PECHA_BERRY = auto() - ITEM_RAWST_BERRY = auto() - ITEM_ASPEAR_BERRY = auto() - ITEM_LEPPA_BERRY = auto() - ITEM_ORAN_BERRY = auto() - ITEM_PERSIM_BERRY = auto() - ITEM_LUM_BERRY = auto() - ITEM_SITRUS_BERRY = auto() - ITEM_FIGY_BERRY = auto() - ITEM_WIKI_BERRY = auto() - ITEM_MAGO_BERRY = auto() - ITEM_AGUAV_BERRY = auto() - ITEM_IAPAPA_BERRY = auto() - ITEM_RAZZ_BERRY = auto() - ITEM_BLUK_BERRY = auto() - ITEM_NANAB_BERRY = auto() - ITEM_WEPEAR_BERRY = auto() - ITEM_PINAP_BERRY = auto() - ITEM_POMEG_BERRY = auto() - ITEM_KELPSY_BERRY = auto() - ITEM_QUALOT_BERRY = auto() - ITEM_HONDEW_BERRY = auto() - ITEM_GREPA_BERRY = auto() - ITEM_TAMATO_BERRY = auto() - ITEM_CORNN_BERRY = auto() - ITEM_MAGOST_BERRY = auto() - ITEM_RABUTA_BERRY = auto() - ITEM_NOMEL_BERRY = auto() - ITEM_SPELON_BERRY = auto() - ITEM_PAMTRE_BERRY = auto() - ITEM_WATMEL_BERRY = auto() - ITEM_DURIN_BERRY = auto() - ITEM_BELUE_BERRY = auto() - ITEM_OCCA_BERRY = auto() - ITEM_PASSHO_BERRY = auto() - ITEM_WACAN_BERRY = auto() - ITEM_RINDO_BERRY = auto() - ITEM_YACHE_BERRY = auto() - ITEM_CHOPLE_BERRY = auto() - ITEM_KEBIA_BERRY = auto() - ITEM_SHUCA_BERRY = auto() - ITEM_COBA_BERRY = auto() - ITEM_PAYAPA_BERRY = auto() - ITEM_TANGA_BERRY = auto() - ITEM_CHARTI_BERRY = auto() - ITEM_KASIB_BERRY = auto() - ITEM_HABAN_BERRY = auto() - ITEM_COLBUR_BERRY = auto() - ITEM_BABIRI_BERRY = auto() - ITEM_CHILAN_BERRY = auto() - ITEM_LIECHI_BERRY = auto() - ITEM_GANLON_BERRY = auto() - ITEM_SALAC_BERRY = auto() - ITEM_PETAYA_BERRY = auto() - ITEM_APICOT_BERRY = auto() - ITEM_LANSAT_BERRY = auto() - ITEM_STARF_BERRY = auto() - ITEM_ENIGMA_BERRY = auto() - ITEM_MICLE_BERRY = auto() - ITEM_CUSTAP_BERRY = auto() - ITEM_JABOCA_BERRY = auto() - ITEM_ROWAP_BERRY = auto() - ITEM_BRIGHTPOWDER = auto() - ITEM_WHITE_HERB = auto() - ITEM_MACHO_BRACE = auto() - ITEM_EXP_SHARE = auto() - ITEM_QUICK_CLAW = auto() - ITEM_SOOTHE_BELL = auto() - ITEM_MENTAL_HERB = auto() - ITEM_CHOICE_BAND = auto() - ITEM_KINGS_ROCK = auto() - ITEM_SILVERPOWDER = auto() - ITEM_AMULET_COIN = auto() - ITEM_CLEANSE_TAG = auto() - ITEM_SOUL_DEW = auto() - ITEM_DEEPSEATOOTH = auto() - ITEM_DEEPSEASCALE = auto() - ITEM_SMOKE_BALL = auto() - ITEM_EVERSTONE = auto() - ITEM_FOCUS_BAND = auto() - ITEM_LUCKY_EGG = auto() - ITEM_SCOPE_LENS = auto() - ITEM_METAL_COAT = auto() - ITEM_LEFTOVERS = auto() - ITEM_DRAGON_SCALE = auto() - ITEM_LIGHT_BALL = auto() - ITEM_SOFT_SAND = auto() - ITEM_HARD_STONE = auto() - ITEM_MIRACLE_SEED = auto() - ITEM_BLACKGLASSES = auto() - ITEM_BLACK_BELT = auto() - ITEM_MAGNET = auto() - ITEM_MYSTIC_WATER = auto() - ITEM_SHARP_BEAK = auto() - ITEM_POISON_BARB = auto() - ITEM_NEVERMELTICE = auto() - ITEM_SPELL_TAG = auto() - ITEM_TWISTEDSPOON = auto() - ITEM_CHARCOAL = auto() - ITEM_DRAGON_FANG = auto() - ITEM_SILK_SCARF = auto() - ITEM_UPGRADE = auto() - ITEM_SHELL_BELL = auto() - ITEM_SEA_INCENSE = auto() - ITEM_LAX_INCENSE = auto() - ITEM_LUCKY_PUNCH = auto() - ITEM_METAL_POWDER = auto() - ITEM_THICK_CLUB = auto() - ITEM_STICK = auto() - ITEM_RED_SCARF = auto() - ITEM_BLUE_SCARF = auto() - ITEM_PINK_SCARF = auto() - ITEM_GREEN_SCARF = auto() - ITEM_YELLOW_SCARF = auto() - ITEM_WIDE_LENS = auto() - ITEM_MUSCLE_BAND = auto() - ITEM_WISE_GLASSES = auto() - ITEM_EXPERT_BELT = auto() - ITEM_LIGHT_CLAY = auto() - ITEM_LIFE_ORB = auto() - ITEM_POWER_HERB = auto() - ITEM_TOXIC_ORB = auto() - ITEM_FLAME_ORB = auto() - ITEM_QUICK_POWDER = auto() - ITEM_FOCUS_SASH = auto() - ITEM_ZOOM_LENS = auto() - ITEM_METRONOME = auto() - ITEM_IRON_BALL = auto() - ITEM_LAGGING_TAIL = auto() - ITEM_DESTINY_KNOT = auto() - ITEM_BLACK_SLUDGE = auto() - ITEM_ICY_ROCK = auto() - ITEM_SMOOTH_ROCK = auto() - ITEM_HEAT_ROCK = auto() - ITEM_DAMP_ROCK = auto() - ITEM_GRIP_CLAW = auto() - ITEM_CHOICE_SCARF = auto() - ITEM_STICKY_BARB = auto() - ITEM_POWER_BRACER = auto() - ITEM_POWER_BELT = auto() - ITEM_POWER_LENS = auto() - ITEM_POWER_BAND = auto() - ITEM_POWER_ANKLET = auto() - ITEM_POWER_WEIGHT = auto() - ITEM_SHED_SHELL = auto() - ITEM_BIG_ROOT = auto() - ITEM_CHOICE_SPECS = auto() - ITEM_FLAME_PLATE = auto() - ITEM_SPLASH_PLATE = auto() - ITEM_ZAP_PLATE = auto() - ITEM_MEADOW_PLATE = auto() - ITEM_ICICLE_PLATE = auto() - ITEM_FIST_PLATE = auto() - ITEM_TOXIC_PLATE = auto() - ITEM_EARTH_PLATE = auto() - ITEM_SKY_PLATE = auto() - ITEM_MIND_PLATE = auto() - ITEM_INSECT_PLATE = auto() - ITEM_STONE_PLATE = auto() - ITEM_SPOOKY_PLATE = auto() - ITEM_DRACO_PLATE = auto() - ITEM_DREAD_PLATE = auto() - ITEM_IRON_PLATE = auto() - ITEM_ODD_INCENSE = auto() - ITEM_ROCK_INCENSE = auto() - ITEM_FULL_INCENSE = auto() - ITEM_WAVE_INCENSE = auto() - ITEM_ROSE_INCENSE = auto() - ITEM_LUCK_INCENSE = auto() - ITEM_PURE_INCENSE = auto() - ITEM_PROTECTOR = auto() - ITEM_ELECTIRIZER = auto() - ITEM_MAGMARIZER = auto() - ITEM_DUBIOUS_DISC = auto() - ITEM_REAPER_CLOTH = auto() - ITEM_RAZOR_CLAW = auto() - ITEM_RAZOR_FANG = auto() - ITEM_TM01 = auto() - ITEM_TM02 = auto() - ITEM_TM03 = auto() - ITEM_TM04 = auto() - ITEM_TM05 = auto() - ITEM_TM06 = auto() - ITEM_TM07 = auto() - ITEM_TM08 = auto() - ITEM_TM09 = auto() - ITEM_TM10 = auto() - ITEM_TM11 = auto() - ITEM_TM12 = auto() - ITEM_TM13 = auto() - ITEM_TM14 = auto() - ITEM_TM15 = auto() - ITEM_TM16 = auto() - ITEM_TM17 = auto() - ITEM_TM18 = auto() - ITEM_TM19 = auto() - ITEM_TM20 = auto() - ITEM_TM21 = auto() - ITEM_TM22 = auto() - ITEM_TM23 = auto() - ITEM_TM24 = auto() - ITEM_TM25 = auto() - ITEM_TM26 = auto() - ITEM_TM27 = auto() - ITEM_TM28 = auto() - ITEM_TM29 = auto() - ITEM_TM30 = auto() - ITEM_TM31 = auto() - ITEM_TM32 = auto() - ITEM_TM33 = auto() - ITEM_TM34 = auto() - ITEM_TM35 = auto() - ITEM_TM36 = auto() - ITEM_TM37 = auto() - ITEM_TM38 = auto() - ITEM_TM39 = auto() - ITEM_TM40 = auto() - ITEM_TM41 = auto() - ITEM_TM42 = auto() - ITEM_TM43 = auto() - ITEM_TM44 = auto() - ITEM_TM45 = auto() - ITEM_TM46 = auto() - ITEM_TM47 = auto() - ITEM_TM48 = auto() - ITEM_TM49 = auto() - ITEM_TM50 = auto() - ITEM_TM51 = auto() - ITEM_TM52 = auto() - ITEM_TM53 = auto() - ITEM_TM54 = auto() - ITEM_TM55 = auto() - ITEM_TM56 = auto() - ITEM_TM57 = auto() - ITEM_TM58 = auto() - ITEM_TM59 = auto() - ITEM_TM60 = auto() - ITEM_TM61 = auto() - ITEM_TM62 = auto() - ITEM_TM63 = auto() - ITEM_TM64 = auto() - ITEM_TM65 = auto() - ITEM_TM66 = auto() - ITEM_TM67 = auto() - ITEM_TM68 = auto() - ITEM_TM69 = auto() - ITEM_TM70 = auto() - ITEM_TM71 = auto() - ITEM_TM72 = auto() - ITEM_TM73 = auto() - ITEM_TM74 = auto() - ITEM_TM75 = auto() - ITEM_TM76 = auto() - ITEM_TM77 = auto() - ITEM_TM78 = auto() - ITEM_TM79 = auto() - ITEM_TM80 = auto() - ITEM_TM81 = auto() - ITEM_TM82 = auto() - ITEM_TM83 = auto() - ITEM_TM84 = auto() - ITEM_TM85 = auto() - ITEM_TM86 = auto() - ITEM_TM87 = auto() - ITEM_TM88 = auto() - ITEM_TM89 = auto() - ITEM_TM90 = auto() - ITEM_TM91 = auto() - ITEM_TM92 = auto() - ITEM_HM01 = auto() - ITEM_HM02 = auto() - ITEM_HM03 = auto() - ITEM_HM04 = auto() - ITEM_HM05 = auto() - ITEM_HM06 = auto() - ITEM_HM07 = auto() - ITEM_HM08 = auto() - ITEM_EXPLORER_KIT = auto() - ITEM_LOOT_SACK = auto() - ITEM_RULE_BOOK = auto() - ITEM_POKE_RADAR = auto() - ITEM_POINT_CARD = auto() - ITEM_JOURNAL = auto() - ITEM_SEAL_CASE = auto() - ITEM_FASHION_CASE = auto() - ITEM_SEAL_BAG = auto() - ITEM_PAL_PAD = auto() - ITEM_WORKS_KEY = auto() - ITEM_OLD_CHARM = auto() - ITEM_GALACTIC_KEY = auto() - ITEM_RED_CHAIN = auto() - ITEM_TOWN_MAP = auto() - ITEM_VS_SEEKER = auto() - ITEM_COIN_CASE = auto() - ITEM_OLD_ROD = auto() - ITEM_GOOD_ROD = auto() - ITEM_SUPER_ROD = auto() - ITEM_SPRAYDUCK = auto() - ITEM_POFFIN_CASE = auto() - ITEM_BICYCLE = auto() - ITEM_SUITE_KEY = auto() - ITEM_OAKS_LETTER = auto() - ITEM_LUNAR_WING = auto() - ITEM_MEMBER_CARD = auto() - ITEM_AZURE_FLUTE = auto() - ITEM_S_S_TICKET = auto() - ITEM_CONTEST_PASS = auto() - ITEM_MAGMA_STONE = auto() - ITEM_PARCEL = auto() - ITEM_COUPON_1 = auto() - ITEM_COUPON_2 = auto() - ITEM_COUPON_3 = auto() - ITEM_STORAGE_KEY = auto() - ITEM_SECRETPOTION = auto() - ITEM_VS_RECORDER = auto() - ITEM_GRACIDEA = auto() - ITEM_SECRET_KEY = auto() diff --git a/tools/json2bin/consts/movedata.py b/tools/json2bin/consts/movedata.py deleted file mode 100644 index df852750d6..0000000000 --- a/tools/json2bin/consts/movedata.py +++ /dev/null @@ -1,313 +0,0 @@ -from enum import Enum, Flag, auto - - -class MoveFlags(Flag): - MOVE_FLAG_CONTACT = 1 - MOVE_FLAG_PROTECT = auto() - MOVE_FLAG_MAGIC_COAT = auto() - MOVE_FLAG_SNATCH = auto() - MOVE_FLAG_MIRROR_MOVE = auto() - MOVE_FLAG_KINGS_ROCK = auto() - MOVE_FLAG_HIDE_HP_BARS = auto() - MOVE_FLAG_HIDE_SHADOWS = auto() - - -class MoveClass(Enum): - CLASS_PHYSICAL = 0 - CLASS_SPECIAL = auto() - CLASS_STATUS = auto() - - -class MoveRange(Flag): - RANGE_SINGLE_TARGET = 0 - RANGE_SINGLE_TARGET_SPECIAL = 1 - RANGE_RANDOM_OPPONENT = auto() - RANGE_ADJACENT_OPPONENTS = auto() - RANGE_ALL_ADJACENT = auto() - RANGE_USER = auto() - RANGE_USER_SIDE = auto() - RANGE_FIELD = auto() - RANGE_OPPONENT_SIDE = auto() - RANGE_ALLY = auto() - RANGE_USER_OR_ALLY = auto() - RANGE_SINGLE_TARGET_ME_FIRST = auto() - - -class MoveEffect(Enum): - MOVE_EFFECT_HIT = 0 - MOVE_EFFECT_STATUS_SLEEP = auto() - MOVE_EFFECT_POISON_HIT = auto() - MOVE_EFFECT_RECOVER_HALF_DAMAGE_DEALT = auto() - MOVE_EFFECT_BURN_HIT = auto() - MOVE_EFFECT_FREEZE_HIT = auto() - MOVE_EFFECT_PARALYZE_HIT = auto() - MOVE_EFFECT_HALVE_DEFENSE = auto() - MOVE_EFFECT_RECOVER_DAMAGE_SLEEP = auto() - MOVE_EFFECT_COPY_MOVE = auto() - MOVE_EFFECT_ATK_UP = auto() - MOVE_EFFECT_DEF_UP = auto() - MOVE_EFFECT_SPEED_UP = auto() - MOVE_EFFECT_SP_ATK_UP = auto() - MOVE_EFFECT_SP_DEF_UP = auto() - MOVE_EFFECT_ACC_UP = auto() - MOVE_EFFECT_EVA_UP = auto() - MOVE_EFFECT_BYPASS_ACCURACY = auto() - MOVE_EFFECT_ATK_DOWN = auto() - MOVE_EFFECT_DEF_DOWN = auto() - MOVE_EFFECT_SPEED_DOWN = auto() - MOVE_EFFECT_SP_ATK_DOWN = auto() - MOVE_EFFECT_SP_DEF_DOWN = auto() - MOVE_EFFECT_ACC_DOWN = auto() - MOVE_EFFECT_EVA_DOWN = auto() - MOVE_EFFECT_RESET_STAT_CHANGES = auto() - MOVE_EFFECT_BIDE = auto() - MOVE_EFFECT_CONTINUE_AND_CONFUSE_SELF = auto() - MOVE_EFFECT_FORCE_SWITCH = auto() - MOVE_EFFECT_MULTI_HIT = auto() - MOVE_EFFECT_CONVERSION = auto() - MOVE_EFFECT_FLINCH_HIT = auto() - MOVE_EFFECT_RESTORE_HALF_HP = auto() - MOVE_EFFECT_STATUS_BADLY_POISON = auto() - MOVE_EFFECT_INCREASE_PRIZE_MONEY = auto() - MOVE_EFFECT_SET_LIGHT_SCREEN = auto() - MOVE_EFFECT_TRI_ATTACK = auto() - MOVE_EFFECT_REST = auto() - MOVE_EFFECT_ONE_HIT_KO = auto() - MOVE_EFFECT_CHARGE_TURN_HIGH_CRIT = auto() - MOVE_EFFECT_HALVE_HP = auto() - MOVE_EFFECT_40_DAMAGE_FLAT = auto() - MOVE_EFFECT_BIND_HIT = auto() - MOVE_EFFECT_HIGH_CRITICAL = auto() - MOVE_EFFECT_HIT_TWICE = auto() - MOVE_EFFECT_CRASH_ON_MISS = auto() - MOVE_EFFECT_PREVENT_STAT_REDUCTION = auto() - MOVE_EFFECT_CRIT_UP_2 = auto() - MOVE_EFFECT_RECOIL_QUARTER = auto() - MOVE_EFFECT_STATUS_CONFUSE = auto() - MOVE_EFFECT_ATK_UP_2 = auto() - MOVE_EFFECT_DEF_UP_2 = auto() - MOVE_EFFECT_SPEED_UP_2 = auto() - MOVE_EFFECT_SP_ATK_UP_2 = auto() - MOVE_EFFECT_SP_DEF_UP_2 = auto() - MOVE_EFFECT_ACC_UP_2 = auto() - MOVE_EFFECT_EVA_UP_2 = auto() - MOVE_EFFECT_TRANSFORM = auto() - MOVE_EFFECT_ATK_DOWN_2 = auto() - MOVE_EFFECT_DEF_DOWN_2 = auto() - MOVE_EFFECT_SPEED_DOWN_2 = auto() - MOVE_EFFECT_SP_ATK_DOWN_2 = auto() - MOVE_EFFECT_SP_DEF_DOWN_2 = auto() - MOVE_EFFECT_EVA_DOWN_2 = auto() - MOVE_EFFECT_ACC_DOWN_2 = auto() - MOVE_EFFECT_SET_REFLECT = auto() - MOVE_EFFECT_STATUS_POISON = auto() - MOVE_EFFECT_STATUS_PARALYZE = auto() - MOVE_EFFECT_LOWER_ATTACK_HIT = auto() - MOVE_EFFECT_LOWER_DEFENSE_HIT = auto() - MOVE_EFFECT_LOWER_SPEED_HIT = auto() - MOVE_EFFECT_LOWER_SP_ATK_HIT = auto() - MOVE_EFFECT_LOWER_SP_DEF_HIT = auto() - MOVE_EFFECT_LOWER_ACCURACY_HIT = auto() - MOVE_EFFECT_LOWER_EVASION_HIT = auto() - MOVE_EFFECT_CHARGE_TURN_HIGH_CRIT_FLINCH = auto() - MOVE_EFFECT_CONFUSE_HIT = auto() - MOVE_EFFECT_POISON_MULTI_HIT = auto() - MOVE_EFFECT_PRIORITY_NEG_1_BYPASS_ACCURACY = auto() - MOVE_EFFECT_SET_SUBSTITUTE = auto() - MOVE_EFFECT_RECHARGE_AFTER = auto() - MOVE_EFFECT_RAISE_ATK_WHEN_HIT = auto() - MOVE_EFFECT_COPY_MOVE_FOR_BATTLE = auto() - MOVE_EFFECT_CALL_RANDOM_MOVE = auto() - MOVE_EFFECT_STATUS_LEECH_SEED = auto() - MOVE_EFFECT_DO_NOTHING = auto() - MOVE_EFFECT_DISABLE = auto() - MOVE_EFFECT_LEVEL_DAMAGE_FLAT = auto() - MOVE_EFFECT_RANDOM_DAMAGE_1_TO_150_LEVEL = auto() - MOVE_EFFECT_COUNTER = auto() - MOVE_EFFECT_ENCORE = auto() - MOVE_EFFECT_AVERAGE_HP = auto() - MOVE_EFFECT_DAMAGE_WHILE_ASLEEP = auto() - MOVE_EFFECT_CONVERSION2 = auto() - MOVE_EFFECT_NEXT_ATTACK_ALWAYS_HITS = auto() - MOVE_EFFECT_LEARN_MOVE_PERMANENT = auto() - MOVE_EFFECT_UNUSED_96 = auto() - MOVE_EFFECT_USE_RANDOM_LEARNED_MOVE_SLEEP = auto() - MOVE_EFFECT_KO_MON_THAT_DEFEATED_USER = auto() - MOVE_EFFECT_INCREASE_POWER_WITH_LESS_HP = auto() - MOVE_EFFECT_DECREASE_LAST_MOVE_PP = auto() - MOVE_EFFECT_LEAVE_WITH_1_HP = auto() - MOVE_EFFECT_CURE_PARTY_STATUS = auto() - MOVE_EFFECT_PRIORITY_1 = auto() - MOVE_EFFECT_HIT_THREE_TIMES = auto() - MOVE_EFFECT_STEAL_HELD_ITEM = auto() - MOVE_EFFECT_PREVENT_ESCAPE = auto() - MOVE_EFFECT_STATUS_NIGHTMARE = auto() - MOVE_EFFECT_EVA_UP_2_MINIMIZE = auto() - MOVE_EFFECT_CURSE = auto() - MOVE_EFFECT_UNUSED_110 = auto() - MOVE_EFFECT_PROTECT = auto() - MOVE_EFFECT_SET_SPIKES = auto() - MOVE_EFFECT_IGNORE_EVASION_REMOVE_GHOST_IMMUNE = auto() - MOVE_EFFECT_ALL_FAINT_3_TURNS = auto() - MOVE_EFFECT_WEATHER_SANDSTORM = auto() - MOVE_EFFECT_SURVIVE_WITH_1_HP = auto() - MOVE_EFFECT_DOUBLE_POWER_EACH_TURN_LOCK_INTO = auto() - MOVE_EFFECT_ATK_UP_2_STATUS_CONFUSION = auto() - MOVE_EFFECT_DOUBLE_POWER_EACH_TURN = auto() - MOVE_EFFECT_INFATUATE = auto() - MOVE_EFFECT_POWER_BASED_ON_FRIENDSHIP = auto() - MOVE_EFFECT_RANDOM_POWER_MAYBE_HEAL = auto() - MOVE_EFFECT_POWER_BASED_ON_LOW_FRIENDSHIP = auto() - MOVE_EFFECT_PREVENT_STATUS = auto() - MOVE_EFFECT_THAW_AND_BURN_HIT = auto() - MOVE_EFFECT_RANDOM_POWER_10_CASES = auto() - MOVE_EFFECT_PASS_STATS_AND_STATUS = auto() - MOVE_EFFECT_HIT_BEFORE_SWITCH = auto() - MOVE_EFFECT_REMOVE_HAZARDS_AND_BINDING = auto() - MOVE_EFFECT_10_DAMAGE_FLAT = auto() - MOVE_EFFECT_UNUSED_131 = auto() - MOVE_EFFECT_HEAL_HALF_MORE_IN_SUN = auto() - MOVE_EFFECT_UNUSED_133 = auto() - MOVE_EFFECT_UNUSED_134 = auto() - MOVE_EFFECT_RANDOM_POWER_BASED_ON_IVS = auto() - MOVE_EFFECT_WEATHER_RAIN = auto() - MOVE_EFFECT_WEATHER_SUN = auto() - MOVE_EFFECT_RAISE_DEF_HIT = auto() - MOVE_EFFECT_RAISE_ATTACK_HIT = auto() - MOVE_EFFECT_RAISE_ALL_STATS_HIT = auto() - MOVE_EFFECT_UNUSED_141 = auto() - MOVE_EFFECT_MAX_ATK_LOSE_HALF_MAX_HP = auto() - MOVE_EFFECT_COPY_STAT_CHANGES = auto() - MOVE_EFFECT_MIRROR_COAT = auto() - MOVE_EFFECT_CHARGE_TURN_DEF_UP = auto() - MOVE_EFFECT_FLINCH_DOUBLE_DAMAGE_FLY_OR_BOUNCE = auto() - MOVE_EFFECT_DOUBLE_DAMAGE_DIG = auto() - MOVE_EFFECT_HIT_IN_3_TURNS = auto() - MOVE_EFFECT_DOUBLE_DAMAGE_FLY_OR_BOUNCE = auto() - MOVE_EFFECT_FLINCH_MINIMIZE_DOUBLE_HIT = auto() - MOVE_EFFECT_SKIP_CHARGE_TURN_IN_SUN = auto() - MOVE_EFFECT_THUNDER = auto() - MOVE_EFFECT_FLEE_FROM_WILD_BATTLE = auto() - MOVE_EFFECT_BEAT_UP = auto() - MOVE_EFFECT_FLY = auto() - MOVE_EFFECT_DEF_UP_DOUBLE_ROLLOUT_POWER = auto() - MOVE_EFFECT_UNUSED_157 = auto() - MOVE_EFFECT_ALWAYS_FLINCH_FIRST_TURN_ONLY = auto() - MOVE_EFFECT_UPROAR = auto() - MOVE_EFFECT_STOCKPILE = auto() - MOVE_EFFECT_SPIT_UP = auto() - MOVE_EFFECT_SWALLOW = auto() - MOVE_EFFECT_UNUSED_163 = auto() - MOVE_EFFECT_WEATHER_HAIL = auto() - MOVE_EFFECT_TORMENT = auto() - MOVE_EFFECT_SP_ATK_UP_CAUSE_CONFUSION = auto() - MOVE_EFFECT_STATUS_BURN = auto() - MOVE_EFFECT_FAINT_AND_ATK_SP_ATK_DOWN_2 = auto() - MOVE_EFFECT_DOUBLE_POWER_WHEN_STATUSED = auto() - MOVE_EFFECT_HIT_LAST_WHIFF_IF_HIT = auto() - MOVE_EFFECT_DOUBLE_POWER_AND_CURE_PARALYSIS = auto() - MOVE_EFFECT_MAKE_GLOBAL_TARGET = auto() - MOVE_EFFECT_NATURE_POWER = auto() - MOVE_EFFECT_SP_DEF_UP_DOUBLE_ELECTRIC_POWER = auto() - MOVE_EFFECT_TAUNT = auto() - MOVE_EFFECT_BOOST_ALLY_POWER_BY_50_PERCENT = auto() - MOVE_EFFECT_SWITCH_HELD_ITEMS = auto() - MOVE_EFFECT_COPY_ABILITY = auto() - MOVE_EFFECT_HEAL_IN_3_TURNS = auto() - MOVE_EFFECT_USE_RANDOM_ALLY_MOVE = auto() - MOVE_EFFECT_GROUND_TRAP_USER_CONTINUOUS_HEAL = auto() - MOVE_EFFECT_LOWER_OWN_ATK_AND_DEF = auto() - MOVE_EFFECT_APPLY_MAGIC_COAT = auto() - MOVE_EFFECT_RECYCLE = auto() - MOVE_EFFECT_DOUBLE_POWER_IF_HIT = auto() - MOVE_EFFECT_REMOVE_SCREENS = auto() - MOVE_EFFECT_STATUS_SLEEP_NEXT_TURN = auto() - MOVE_EFFECT_REMOVE_HELD_ITEM = auto() - MOVE_EFFECT_SET_HP_EQUAL_TO_USER = auto() - MOVE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP = auto() - MOVE_EFFECT_SWITCH_ABILITIES = auto() - MOVE_EFFECT_MAKE_SHARED_MOVES_UNUSEABLE = auto() - MOVE_EFFECT_HEAL_STATUS = auto() - MOVE_EFFECT_REMOVE_ALL_PP_ON_DEFEAT = auto() - MOVE_EFFECT_STEAL_STATUS_MOVE = auto() - MOVE_EFFECT_INCREASE_POWER_WITH_WEIGHT = auto() - MOVE_EFFECT_SECRET_POWER = auto() - MOVE_EFFECT_RECOIL_THIRD = auto() - MOVE_EFFECT_CONFUSE_ALL = auto() - MOVE_EFFECT_HIGH_CRITICAL_BURN_HIT = auto() - MOVE_EFFECT_HALVE_ELECTRIC_DAMAGE = auto() - MOVE_EFFECT_BADLY_POISON_HIT = auto() - MOVE_EFFECT_CHANGE_TYPE_WITH_WEATHER = auto() - MOVE_EFFECT_USER_SP_ATK_DOWN_2 = auto() - MOVE_EFFECT_ATK_DEF_DOWN = auto() - MOVE_EFFECT_DEF_SPD_UP = auto() - MOVE_EFFECT_HIT_FLY = auto() - MOVE_EFFECT_ATK_DEF_UP = auto() - MOVE_EFFECT_HIGH_CRITICAL_POISON_HIT = auto() - MOVE_EFFECT_HALVE_FIRE_DAMAGE = auto() - MOVE_EFFECT_SP_ATK_SP_DEF_UP = auto() - MOVE_EFFECT_ATK_SPD_UP = auto() - MOVE_EFFECT_CAMOUFLAGE = auto() - MOVE_EFFECT_HEAL_HALF_REMOVE_FLYING_TYPE = auto() - MOVE_EFFECT_GRAVITY = auto() - MOVE_EFFECT_IGNORE_EVATION_REMOVE_DARK_IMMUNE = auto() - MOVE_EFFECT_DOUBLE_POWER_HEAL_SLEEP = auto() - MOVE_EFFECT_SPEED_DOWN_HIT = auto() - MOVE_EFFECT_POWER_BASED_ON_LOW_SPEED = auto() - MOVE_EFFECT_FAINT_AND_FULL_HEAL_NEXT_MON = auto() - MOVE_EFFECT_DOUBLE_POWER_WHEN_BELOW_HALF = auto() - MOVE_EFFECT_NATURAL_GIFT = auto() - MOVE_EFFECT_REMOVE_PROTECT = auto() - MOVE_EFFECT_EAT_BERRY = auto() - MOVE_EFFECT_DOUBLE_SPEED_3_TURNS = auto() - MOVE_EFFECT_RANDOM_STAT_UP_2 = auto() - MOVE_EFFECT_METAL_BURST = auto() - MOVE_EFFECT_SWITCH_HIT = auto() - MOVE_EFFECT_DEF_SPD_DOWN_HIT = auto() - MOVE_EFFECT_DOUBLE_POWER_IF_MOVING_SECOND = auto() - MOVE_EFFECT_DOUBLE_POWER_IF_TARGET_HIT = auto() - MOVE_EFFECT_PREVENT_ITEM_USE = auto() - MOVE_EFFECT_FLING = auto() - MOVE_EFFECT_TRANSFER_STATUS = auto() - MOVE_EFFECT_HIGHER_POWER_WHEN_LOW_PP = auto() - MOVE_EFFECT_PREVENT_HEALING = auto() - MOVE_EFFECT_INCREASE_POWER_WITH_MORE_HP = auto() - MOVE_EFFECT_SWAP_ATK_DEF = auto() - MOVE_EFFECT_SUPRESS_ABILITY = auto() - MOVE_EFFECT_PREVENT_CRITS = auto() - MOVE_EFFECT_USE_MOVE_FIRST = auto() - MOVE_EFFECT_USE_LAST_USED_MOVE = auto() - MOVE_EFFECT_SWAP_ATK_SP_ATK_STAT_CHANGES = auto() - MOVE_EFFECT_SWAP_DEF_SP_DEF_STAT_CHANGES = auto() - MOVE_EFFECT_INCREASE_POWER_WITH_MORE_STAT_UP = auto() - MOVE_EFFECT_FAIL_IF_NOT_USED_ALL_OTHER_MOVES = auto() - MOVE_EFFECT_SET_ABILITY_TO_INSOMNIA = auto() - MOVE_EFFECT_HIT_FIRST_IF_TARGET_ATTACKING = auto() - MOVE_EFFECT_TOXIC_SPIKES = auto() - MOVE_EFFECT_SWAP_STAT_CHANGES = auto() - MOVE_EFFECT_RESTORE_HP_EVERY_TURN = auto() - MOVE_EFFECT_GIVE_GROUND_IMMUNITY = auto() - MOVE_EFFECT_RECOIL_BURN_HIT = auto() - MOVE_EFFECT_STRUGGLE = auto() - MOVE_EFFECT_DIVE = auto() - MOVE_EFFECT_DIG = auto() - MOVE_EFFECT_DOUBLE_DAMAGE_DIVE = auto() - MOVE_EFFECT_REMOVE_HAZARDS_SCREENS_EVA_DOWN = auto() - MOVE_EFFECT_TRICK_ROOM = auto() - MOVE_EFFECT_BLIZZARD = auto() - MOVE_EFFECT_WHIRLPOOL = auto() - MOVE_EFFECT_RECOIL_PARALYZE_HIT = auto() - MOVE_EFFECT_BOUNCE = auto() - MOVE_EFFECT_UNUSED_264 = auto() - MOVE_EFFECT_SP_ATK_DOWN_2_OPPOSITE_GENDER = auto() - MOVE_EFFECT_STEALTH_ROCK = auto() - MOVE_EFFECT_CHATTER = auto() - MOVE_EFFECT_JUDGEMENT = auto() - MOVE_EFFECT_RECOIL_HALF = auto() - MOVE_EFFECT_FAINT_FULL_RESTORE_NEXT_MON = auto() - MOVE_EFFECT_LOWER_SP_DEF_2_HIT = auto() - MOVE_EFFECT_SHADOW_FORCE = auto() - MOVE_EFFECT_FLINCH_BURN_HIT = auto() - MOVE_EFFECT_FLINCH_FREEZE_HIT = auto() - MOVE_EFFECT_FLINCH_PARALYZE_HIT = auto() - MOVE_EFFECT_RAISE_SP_ATK_HIT = auto() diff --git a/tools/json2bin/consts/moves.py b/tools/json2bin/consts/moves.py deleted file mode 100644 index 098f351fb8..0000000000 --- a/tools/json2bin/consts/moves.py +++ /dev/null @@ -1,474 +0,0 @@ -from enum import Enum, auto - -class Move(Enum): - MOVE_0000 = 0 - MOVE_POUND = auto() - MOVE_KARATE_CHOP = auto() - MOVE_DOUBLE_SLAP = auto() - MOVE_COMET_PUNCH = auto() - MOVE_MEGA_PUNCH = auto() - MOVE_PAY_DAY = auto() - MOVE_FIRE_PUNCH = auto() - MOVE_ICE_PUNCH = auto() - MOVE_THUNDER_PUNCH = auto() - MOVE_SCRATCH = auto() - MOVE_VICE_GRIP = auto() - MOVE_GUILLOTINE = auto() - MOVE_RAZOR_WIND = auto() - MOVE_SWORDS_DANCE = auto() - MOVE_CUT = auto() - MOVE_GUST = auto() - MOVE_WING_ATTACK = auto() - MOVE_WHIRLWIND = auto() - MOVE_FLY = auto() - MOVE_BIND = auto() - MOVE_SLAM = auto() - MOVE_VINE_WHIP = auto() - MOVE_STOMP = auto() - MOVE_DOUBLE_KICK = auto() - MOVE_MEGA_KICK = auto() - MOVE_JUMP_KICK = auto() - MOVE_ROLLING_KICK = auto() - MOVE_SAND_ATTACK = auto() - MOVE_HEADBUTT = auto() - MOVE_HORN_ATTACK = auto() - MOVE_FURY_ATTACK = auto() - MOVE_HORN_DRILL = auto() - MOVE_TACKLE = auto() - MOVE_BODY_SLAM = auto() - MOVE_WRAP = auto() - MOVE_TAKE_DOWN = auto() - MOVE_THRASH = auto() - MOVE_DOUBLE_EDGE = auto() - MOVE_TAIL_WHIP = auto() - MOVE_POISON_STING = auto() - MOVE_TWINEEDLE = auto() - MOVE_PIN_MISSILE = auto() - MOVE_LEER = auto() - MOVE_BITE = auto() - MOVE_GROWL = auto() - MOVE_ROAR = auto() - MOVE_SING = auto() - MOVE_SUPERSONIC = auto() - MOVE_SONIC_BOOM = auto() - MOVE_DISABLE = auto() - MOVE_ACID = auto() - MOVE_EMBER = auto() - MOVE_FLAMETHROWER = auto() - MOVE_MIST = auto() - MOVE_WATER_GUN = auto() - MOVE_HYDRO_PUMP = auto() - MOVE_SURF = auto() - MOVE_ICE_BEAM = auto() - MOVE_BLIZZARD = auto() - MOVE_PSYBEAM = auto() - MOVE_BUBBLE_BEAM = auto() - MOVE_AURORA_BEAM = auto() - MOVE_HYPER_BEAM = auto() - MOVE_PECK = auto() - MOVE_DRILL_PECK = auto() - MOVE_SUBMISSION = auto() - MOVE_LOW_KICK = auto() - MOVE_COUNTER = auto() - MOVE_SEISMIC_TOSS = auto() - MOVE_STRENGTH = auto() - MOVE_ABSORB = auto() - MOVE_MEGA_DRAIN = auto() - MOVE_LEECH_SEED = auto() - MOVE_GROWTH = auto() - MOVE_RAZOR_LEAF = auto() - MOVE_SOLAR_BEAM = auto() - MOVE_POISON_POWDER = auto() - MOVE_STUN_SPORE = auto() - MOVE_SLEEP_POWDER = auto() - MOVE_PETAL_DANCE = auto() - MOVE_STRING_SHOT = auto() - MOVE_DRAGON_RAGE = auto() - MOVE_FIRE_SPIN = auto() - MOVE_THUNDER_SHOCK = auto() - MOVE_THUNDERBOLT = auto() - MOVE_THUNDER_WAVE = auto() - MOVE_THUNDER = auto() - MOVE_ROCK_THROW = auto() - MOVE_EARTHQUAKE = auto() - MOVE_FISSURE = auto() - MOVE_DIG = auto() - MOVE_TOXIC = auto() - MOVE_CONFUSION = auto() - MOVE_PSYCHIC = auto() - MOVE_HYPNOSIS = auto() - MOVE_MEDITATE = auto() - MOVE_AGILITY = auto() - MOVE_QUICK_ATTACK = auto() - MOVE_RAGE = auto() - MOVE_TELEPORT = auto() - MOVE_NIGHT_SHADE = auto() - MOVE_MIMIC = auto() - MOVE_SCREECH = auto() - MOVE_DOUBLE_TEAM = auto() - MOVE_RECOVER = auto() - MOVE_HARDEN = auto() - MOVE_MINIMIZE = auto() - MOVE_SMOKE_SCREEN = auto() - MOVE_CONFUSE_RAY = auto() - MOVE_WITHDRAW = auto() - MOVE_DEFENSE_CURL = auto() - MOVE_BARRIER = auto() - MOVE_LIGHT_SCREEN = auto() - MOVE_HAZE = auto() - MOVE_REFLECT = auto() - MOVE_FOCUS_ENERGY = auto() - MOVE_BIDE = auto() - MOVE_METRONOME = auto() - MOVE_MIRROR_MOVE = auto() - MOVE_SELFDESTRUCT = auto() - MOVE_EGG_BOMB = auto() - MOVE_LICK = auto() - MOVE_SMOG = auto() - MOVE_SLUDGE = auto() - MOVE_BONE_CLUB = auto() - MOVE_FIRE_BLAST = auto() - MOVE_WATERFALL = auto() - MOVE_CLAMP = auto() - MOVE_SWIFT = auto() - MOVE_SKULL_BASH = auto() - MOVE_SPIKE_CANNON = auto() - MOVE_CONSTRICT = auto() - MOVE_AMNESIA = auto() - MOVE_KINESIS = auto() - MOVE_SOFTBOILED = auto() - MOVE_HI_JUMP_KICK = auto() - MOVE_GLARE = auto() - MOVE_DREAM_EATER = auto() - MOVE_POISON_GAS = auto() - MOVE_BARRAGE = auto() - MOVE_LEECH_LIFE = auto() - MOVE_LOVELY_KISS = auto() - MOVE_SKY_ATTACK = auto() - MOVE_TRANSFORM = auto() - MOVE_BUBBLE = auto() - MOVE_DIZZY_PUNCH = auto() - MOVE_SPORE = auto() - MOVE_FLASH = auto() - MOVE_PSYWAVE = auto() - MOVE_SPLASH = auto() - MOVE_ACID_ARMOR = auto() - MOVE_CRABHAMMER = auto() - MOVE_EXPLOSION = auto() - MOVE_FURY_SWIPES = auto() - MOVE_BONEMERANG = auto() - MOVE_REST = auto() - MOVE_ROCK_SLIDE = auto() - MOVE_HYPER_FANG = auto() - MOVE_SHARPEN = auto() - MOVE_CONVERSION = auto() - MOVE_TRI_ATTACK = auto() - MOVE_SUPER_FANG = auto() - MOVE_SLASH = auto() - MOVE_SUBSTITUTE = auto() - MOVE_STRUGGLE = auto() - MOVE_SKETCH = auto() - MOVE_TRIPLE_KICK = auto() - MOVE_THIEF = auto() - MOVE_SPIDER_WEB = auto() - MOVE_MIND_READER = auto() - MOVE_NIGHTMARE = auto() - MOVE_FLAME_WHEEL = auto() - MOVE_SNORE = auto() - MOVE_CURSE = auto() - MOVE_FLAIL = auto() - MOVE_CONVERSION_2 = auto() - MOVE_AEROBLAST = auto() - MOVE_COTTON_SPORE = auto() - MOVE_REVERSAL = auto() - MOVE_SPITE = auto() - MOVE_POWDER_SNOW = auto() - MOVE_PROTECT = auto() - MOVE_MACH_PUNCH = auto() - MOVE_SCARY_FACE = auto() - MOVE_FAINT_ATTACK = auto() - MOVE_SWEET_KISS = auto() - MOVE_BELLY_DRUM = auto() - MOVE_SLUDGE_BOMB = auto() - MOVE_MUD_SLAP = auto() - MOVE_OCTAZOOKA = auto() - MOVE_SPIKES = auto() - MOVE_ZAP_CANNON = auto() - MOVE_FORESIGHT = auto() - MOVE_DESTINY_BOND = auto() - MOVE_PERISH_SONG = auto() - MOVE_ICY_WIND = auto() - MOVE_DETECT = auto() - MOVE_BONE_RUSH = auto() - MOVE_LOCK_ON = auto() - MOVE_OUTRAGE = auto() - MOVE_SANDSTORM = auto() - MOVE_GIGA_DRAIN = auto() - MOVE_ENDURE = auto() - MOVE_CHARM = auto() - MOVE_ROLLOUT = auto() - MOVE_FALSE_SWIPE = auto() - MOVE_SWAGGER = auto() - MOVE_MILK_DRINK = auto() - MOVE_SPARK = auto() - MOVE_FURY_CUTTER = auto() - MOVE_STEEL_WING = auto() - MOVE_MEAN_LOOK = auto() - MOVE_ATTRACT = auto() - MOVE_SLEEP_TALK = auto() - MOVE_HEAL_BELL = auto() - MOVE_RETURN = auto() - MOVE_PRESENT = auto() - MOVE_FRUSTRATION = auto() - MOVE_SAFEGUARD = auto() - MOVE_PAIN_SPLIT = auto() - MOVE_SACRED_FIRE = auto() - MOVE_MAGNITUDE = auto() - MOVE_DYNAMIC_PUNCH = auto() - MOVE_MEGAHORN = auto() - MOVE_DRAGON_BREATH = auto() - MOVE_BATON_PASS = auto() - MOVE_ENCORE = auto() - MOVE_PURSUIT = auto() - MOVE_RAPID_SPIN = auto() - MOVE_SWEET_SCENT = auto() - MOVE_IRON_TAIL = auto() - MOVE_METAL_CLAW = auto() - MOVE_VITAL_THROW = auto() - MOVE_MORNING_SUN = auto() - MOVE_SYNTHESIS = auto() - MOVE_MOONLIGHT = auto() - MOVE_HIDDEN_POWER = auto() - MOVE_CROSS_CHOP = auto() - MOVE_TWISTER = auto() - MOVE_RAIN_DANCE = auto() - MOVE_SUNNY_DAY = auto() - MOVE_CRUNCH = auto() - MOVE_MIRROR_COAT = auto() - MOVE_PSYCH_UP = auto() - MOVE_EXTREME_SPEED = auto() - MOVE_ANCIENT_POWER = auto() - MOVE_SHADOW_BALL = auto() - MOVE_FUTURE_SIGHT = auto() - MOVE_ROCK_SMASH = auto() - MOVE_WHIRLPOOL = auto() - MOVE_BEAT_UP = auto() - MOVE_FAKE_OUT = auto() - MOVE_UPROAR = auto() - MOVE_STOCKPILE = auto() - MOVE_SPIT_UP = auto() - MOVE_SWALLOW = auto() - MOVE_HEAT_WAVE = auto() - MOVE_HAIL = auto() - MOVE_TORMENT = auto() - MOVE_FLATTER = auto() - MOVE_WILL_O_WISP = auto() - MOVE_MEMENTO = auto() - MOVE_FACADE = auto() - MOVE_FOCUS_PUNCH = auto() - MOVE_SMELLING_SALT = auto() - MOVE_FOLLOW_ME = auto() - MOVE_NATURE_POWER = auto() - MOVE_CHARGE = auto() - MOVE_TAUNT = auto() - MOVE_HELPING_HAND = auto() - MOVE_TRICK = auto() - MOVE_ROLE_PLAY = auto() - MOVE_WISH = auto() - MOVE_ASSIST = auto() - MOVE_INGRAIN = auto() - MOVE_SUPERPOWER = auto() - MOVE_MAGIC_COAT = auto() - MOVE_RECYCLE = auto() - MOVE_REVENGE = auto() - MOVE_BRICK_BREAK = auto() - MOVE_YAWN = auto() - MOVE_KNOCK_OFF = auto() - MOVE_ENDEAVOR = auto() - MOVE_ERUPTION = auto() - MOVE_SKILL_SWAP = auto() - MOVE_IMPRISON = auto() - MOVE_REFRESH = auto() - MOVE_GRUDGE = auto() - MOVE_SNATCH = auto() - MOVE_SECRET_POWER = auto() - MOVE_DIVE = auto() - MOVE_ARM_THRUST = auto() - MOVE_CAMOUFLAGE = auto() - MOVE_TAIL_GLOW = auto() - MOVE_LUSTER_PURGE = auto() - MOVE_MIST_BALL = auto() - MOVE_FEATHER_DANCE = auto() - MOVE_TEETER_DANCE = auto() - MOVE_BLAZE_KICK = auto() - MOVE_MUD_SPORT = auto() - MOVE_ICE_BALL = auto() - MOVE_NEEDLE_ARM = auto() - MOVE_SLACK_OFF = auto() - MOVE_HYPER_VOICE = auto() - MOVE_POISON_FANG = auto() - MOVE_CRUSH_CLAW = auto() - MOVE_BLAST_BURN = auto() - MOVE_HYDRO_CANNON = auto() - MOVE_METEOR_MASH = auto() - MOVE_ASTONISH = auto() - MOVE_WEATHER_BALL = auto() - MOVE_AROMATHERAPY = auto() - MOVE_FAKE_TEARS = auto() - MOVE_AIR_CUTTER = auto() - MOVE_OVERHEAT = auto() - MOVE_ODOR_SLEUTH = auto() - MOVE_ROCK_TOMB = auto() - MOVE_SILVER_WIND = auto() - MOVE_METAL_SOUND = auto() - MOVE_GRASS_WHISTLE = auto() - MOVE_TICKLE = auto() - MOVE_COSMIC_POWER = auto() - MOVE_WATER_SPOUT = auto() - MOVE_SIGNAL_BEAM = auto() - MOVE_SHADOW_PUNCH = auto() - MOVE_EXTRASENSORY = auto() - MOVE_SKY_UPPERCUT = auto() - MOVE_SAND_TOMB = auto() - MOVE_SHEER_COLD = auto() - MOVE_MUDDY_WATER = auto() - MOVE_BULLET_SEED = auto() - MOVE_AERIAL_ACE = auto() - MOVE_ICICLE_SPEAR = auto() - MOVE_IRON_DEFENSE = auto() - MOVE_BLOCK = auto() - MOVE_HOWL = auto() - MOVE_DRAGON_CLAW = auto() - MOVE_FRENZY_PLANT = auto() - MOVE_BULK_UP = auto() - MOVE_BOUNCE = auto() - MOVE_MUD_SHOT = auto() - MOVE_POISON_TAIL = auto() - MOVE_COVET = auto() - MOVE_VOLT_TACKLE = auto() - MOVE_MAGICAL_LEAF = auto() - MOVE_WATER_SPORT = auto() - MOVE_CALM_MIND = auto() - MOVE_LEAF_BLADE = auto() - MOVE_DRAGON_DANCE = auto() - MOVE_ROCK_BLAST = auto() - MOVE_SHOCK_WAVE = auto() - MOVE_WATER_PULSE = auto() - MOVE_DOOM_DESIRE = auto() - MOVE_PSYCHO_BOOST = auto() - MOVE_ROOST = auto() - MOVE_GRAVITY = auto() - MOVE_MIRACLE_EYE = auto() - MOVE_WAKE_UP_SLAP = auto() - MOVE_HAMMER_ARM = auto() - MOVE_GYRO_BALL = auto() - MOVE_HEALING_WISH = auto() - MOVE_BRINE = auto() - MOVE_NATURAL_GIFT = auto() - MOVE_FEINT = auto() - MOVE_PLUCK = auto() - MOVE_TAILWIND = auto() - MOVE_ACUPRESSURE = auto() - MOVE_METAL_BURST = auto() - MOVE_U_TURN = auto() - MOVE_CLOSE_COMBAT = auto() - MOVE_PAYBACK = auto() - MOVE_ASSURANCE = auto() - MOVE_EMBARGO = auto() - MOVE_FLING = auto() - MOVE_PSYCHO_SHIFT = auto() - MOVE_TRUMP_CARD = auto() - MOVE_HEAL_BLOCK = auto() - MOVE_WRING_OUT = auto() - MOVE_POWER_TRICK = auto() - MOVE_GASTRO_ACID = auto() - MOVE_LUCKY_CHANT = auto() - MOVE_ME_FIRST = auto() - MOVE_COPYCAT = auto() - MOVE_POWER_SWAP = auto() - MOVE_GUARD_SWAP = auto() - MOVE_PUNISHMENT = auto() - MOVE_LAST_RESORT = auto() - MOVE_WORRY_SEED = auto() - MOVE_SUCKER_PUNCH = auto() - MOVE_TOXIC_SPIKES = auto() - MOVE_HEART_SWAP = auto() - MOVE_AQUA_RING = auto() - MOVE_MAGNET_RISE = auto() - MOVE_FLARE_BLITZ = auto() - MOVE_FORCE_PALM = auto() - MOVE_AURA_SPHERE = auto() - MOVE_ROCK_POLISH = auto() - MOVE_POISON_JAB = auto() - MOVE_DARK_PULSE = auto() - MOVE_NIGHT_SLASH = auto() - MOVE_AQUA_TAIL = auto() - MOVE_SEED_BOMB = auto() - MOVE_AIR_SLASH = auto() - MOVE_X_SCISSOR = auto() - MOVE_BUG_BUZZ = auto() - MOVE_DRAGON_PULSE = auto() - MOVE_DRAGON_RUSH = auto() - MOVE_POWER_GEM = auto() - MOVE_DRAIN_PUNCH = auto() - MOVE_VACUUM_WAVE = auto() - MOVE_FOCUS_BLAST = auto() - MOVE_ENERGY_BALL = auto() - MOVE_BRAVE_BIRD = auto() - MOVE_EARTH_POWER = auto() - MOVE_SWITCHEROO = auto() - MOVE_GIGA_IMPACT = auto() - MOVE_NASTY_PLOT = auto() - MOVE_BULLET_PUNCH = auto() - MOVE_AVALANCHE = auto() - MOVE_ICE_SHARD = auto() - MOVE_SHADOW_CLAW = auto() - MOVE_THUNDER_FANG = auto() - MOVE_ICE_FANG = auto() - MOVE_FIRE_FANG = auto() - MOVE_SHADOW_SNEAK = auto() - MOVE_MUD_BOMB = auto() - MOVE_PSYCHO_CUT = auto() - MOVE_ZEN_HEADBUTT = auto() - MOVE_MIRROR_SHOT = auto() - MOVE_FLASH_CANNON = auto() - MOVE_ROCK_CLIMB = auto() - MOVE_DEFOG = auto() - MOVE_TRICK_ROOM = auto() - MOVE_DRACO_METEOR = auto() - MOVE_DISCHARGE = auto() - MOVE_LAVA_PLUME = auto() - MOVE_LEAF_STORM = auto() - MOVE_POWER_WHIP = auto() - MOVE_ROCK_WRECKER = auto() - MOVE_CROSS_POISON = auto() - MOVE_GUNK_SHOT = auto() - MOVE_IRON_HEAD = auto() - MOVE_MAGNET_BOMB = auto() - MOVE_STONE_EDGE = auto() - MOVE_CAPTIVATE = auto() - MOVE_STEALTH_ROCK = auto() - MOVE_GRASS_KNOT = auto() - MOVE_CHATTER = auto() - MOVE_JUDGMENT = auto() - MOVE_BUG_BITE = auto() - MOVE_CHARGE_BEAM = auto() - MOVE_WOOD_HAMMER = auto() - MOVE_AQUA_JET = auto() - MOVE_ATTACK_ORDER = auto() - MOVE_DEFEND_ORDER = auto() - MOVE_HEAL_ORDER = auto() - MOVE_HEAD_SMASH = auto() - MOVE_DOUBLE_HIT = auto() - MOVE_ROAR_OF_TIME = auto() - MOVE_SPACIAL_REND = auto() - MOVE_LUNAR_DANCE = auto() - MOVE_CRUSH_GRIP = auto() - MOVE_MAGMA_STORM = auto() - MOVE_DARK_VOID = auto() - MOVE_SEED_FLARE = auto() - MOVE_OMINOUS_WIND = auto() - MOVE_SHADOW_FORCE = auto() - MOVE_0468 = auto() - MOVE_0469 = auto() - MOVE_0470 = auto() \ No newline at end of file diff --git a/tools/json2bin/consts/pokemon/ability.py b/tools/json2bin/consts/pokemon/ability.py deleted file mode 100644 index 8ff70b19f3..0000000000 --- a/tools/json2bin/consts/pokemon/ability.py +++ /dev/null @@ -1,128 +0,0 @@ -from enum import Enum, auto - - -class PokemonAbility(Enum): - ABILITY_NONE = 0 - ABILITY_STENCH = auto() - ABILITY_DRIZZLE = auto() - ABILITY_SPEED_BOOST = auto() - ABILITY_BATTLE_ARMOR = auto() - ABILITY_STURDY = auto() - ABILITY_DAMP = auto() - ABILITY_LIMBER = auto() - ABILITY_SAND_VEIL = auto() - ABILITY_STATIC = auto() - ABILITY_VOLT_ABSORB = auto() - ABILITY_WATER_ABSORB = auto() - ABILITY_OBLIVIOUS = auto() - ABILITY_CLOUD_NINE = auto() - ABILITY_COMPOUND_EYES = auto() - ABILITY_INSOMNIA = auto() - ABILITY_COLOR_CHANGE = auto() - ABILITY_IMMUNITY = auto() - ABILITY_FLASH_FIRE = auto() - ABILITY_SHIELD_DUST = auto() - ABILITY_OWN_TEMPO = auto() - ABILITY_SUCTION_CUPS = auto() - ABILITY_INTIMIDATE = auto() - ABILITY_SHADOW_TAG = auto() - ABILITY_ROUGH_SKIN = auto() - ABILITY_WONDER_GUARD = auto() - ABILITY_LEVITATE = auto() - ABILITY_EFFECT_SPORE = auto() - ABILITY_SYNCHRONIZE = auto() - ABILITY_CLEAR_BODY = auto() - ABILITY_NATURAL_CURE = auto() - ABILITY_LIGHTNING_ROD = auto() - ABILITY_SERENE_GRACE = auto() - ABILITY_SWIFT_SWIM = auto() - ABILITY_CHLOROPHYLL = auto() - ABILITY_ILLUMINATE = auto() - ABILITY_TRACE = auto() - ABILITY_HUGE_POWER = auto() - ABILITY_POISON_POINT = auto() - ABILITY_INNER_FOCUS = auto() - ABILITY_MAGMA_ARMOR = auto() - ABILITY_WATER_VEIL = auto() - ABILITY_MAGNET_PULL = auto() - ABILITY_SOUNDPROOF = auto() - ABILITY_RAIN_DISH = auto() - ABILITY_SAND_STREAM = auto() - ABILITY_PRESSURE = auto() - ABILITY_THICK_FAT = auto() - ABILITY_EARLY_BIRD = auto() - ABILITY_FLAME_BODY = auto() - ABILITY_RUN_AWAY = auto() - ABILITY_KEEN_EYE = auto() - ABILITY_HYPER_CUTTER = auto() - ABILITY_PICKUP = auto() - ABILITY_TRUANT = auto() - ABILITY_HUSTLE = auto() - ABILITY_CUTE_CHARM = auto() - ABILITY_PLUS = auto() - ABILITY_MINUS = auto() - ABILITY_FORECAST = auto() - ABILITY_STICKY_HOLD = auto() - ABILITY_SHED_SKIN = auto() - ABILITY_GUTS = auto() - ABILITY_MARVEL_SCALE = auto() - ABILITY_LIQUID_OOZE = auto() - ABILITY_OVERGROW = auto() - ABILITY_BLAZE = auto() - ABILITY_TORRENT = auto() - ABILITY_SWARM = auto() - ABILITY_ROCK_HEAD = auto() - ABILITY_DROUGHT = auto() - ABILITY_ARENA_TRAP = auto() - ABILITY_VITAL_SPIRIT = auto() - ABILITY_WHITE_SMOKE = auto() - ABILITY_PURE_POWER = auto() - ABILITY_SHELL_ARMOR = auto() - ABILITY_AIR_LOCK = auto() - ABILITY_TANGLED_FEET = auto() - ABILITY_MOTOR_DRIVE = auto() - ABILITY_RIVALRY = auto() - ABILITY_STEADFAST = auto() - ABILITY_SNOW_CLOAK = auto() - ABILITY_GLUTTONY = auto() - ABILITY_ANGER_POINT = auto() - ABILITY_UNBURDEN = auto() - ABILITY_HEATPROOF = auto() - ABILITY_SIMPLE = auto() - ABILITY_DRY_SKIN = auto() - ABILITY_DOWNLOAD = auto() - ABILITY_IRON_FIST = auto() - ABILITY_POISON_HEAL = auto() - ABILITY_ADAPTABILITY = auto() - ABILITY_SKILL_LINK = auto() - ABILITY_HYDRATION = auto() - ABILITY_SOLAR_POWER = auto() - ABILITY_QUICK_FEET = auto() - ABILITY_NORMALIZE = auto() - ABILITY_SNIPER = auto() - ABILITY_MAGIC_GUARD = auto() - ABILITY_NO_GUARD = auto() - ABILITY_STALL = auto() - ABILITY_TECHNICIAN = auto() - ABILITY_LEAF_GUARD = auto() - ABILITY_KLUTZ = auto() - ABILITY_MOLD_BREAKER = auto() - ABILITY_SUPER_LUCK = auto() - ABILITY_AFTERMATH = auto() - ABILITY_ANTICIPATION = auto() - ABILITY_FOREWARN = auto() - ABILITY_UNAWARE = auto() - ABILITY_TINTED_LENS = auto() - ABILITY_FILTER = auto() - ABILITY_SLOW_START = auto() - ABILITY_SCRAPPY = auto() - ABILITY_STORM_DRAIN = auto() - ABILITY_ICE_BODY = auto() - ABILITY_SOLID_ROCK = auto() - ABILITY_SNOW_WARNING = auto() - ABILITY_HONEY_GATHER = auto() - ABILITY_FRISK = auto() - ABILITY_RECKLESS = auto() - ABILITY_MULTITYPE = auto() - ABILITY_FLOWER_GIFT = auto() - ABILITY_BAD_DREAMS = auto() diff --git a/tools/json2bin/consts/pokemon/color.py b/tools/json2bin/consts/pokemon/color.py deleted file mode 100644 index a0ae4cc2bb..0000000000 --- a/tools/json2bin/consts/pokemon/color.py +++ /dev/null @@ -1,15 +0,0 @@ -from enum import Enum, auto - - -class PokemonColor(Enum): - MON_COLOR_RED = 0 - MON_COLOR_BLUE = auto() - MON_COLOR_YELLOW = auto() - MON_COLOR_GREEN = auto() - MON_COLOR_BLACK = auto() - MON_COLOR_BROWN = auto() - MON_COLOR_PURPLE = auto() - MON_COLOR_GRAY = auto() - MON_COLOR_WHITE = auto() - MON_COLOR_PINK = auto() - MON_COLOR_EGG = auto() diff --git a/tools/json2bin/consts/pokemon/egg_group.py b/tools/json2bin/consts/pokemon/egg_group.py deleted file mode 100644 index 71a888d73f..0000000000 --- a/tools/json2bin/consts/pokemon/egg_group.py +++ /dev/null @@ -1,20 +0,0 @@ -from enum import Enum, auto - - -class PokemonEggGroup(Enum): - NONE = 0 - MONSTER = auto() - WATER_1 = auto() - BUG = auto() - FLYING = auto() - FIELD = auto() - FAIRY = auto() - GRASS = auto() - HUMAN_LIKE = auto() - WATER_3 = auto() - MINERAL = auto() - AMORPHOUS = auto() - WATER_2 = auto() - DITTO = auto() - DRAGON = auto() - UNDISCOVERED = auto() diff --git a/tools/json2bin/consts/pokemon/evo_methods.py b/tools/json2bin/consts/pokemon/evo_methods.py deleted file mode 100644 index 80e3491152..0000000000 --- a/tools/json2bin/consts/pokemon/evo_methods.py +++ /dev/null @@ -1,31 +0,0 @@ -from enum import Enum, auto - - -class EvoMethod(Enum): - EVO_NONE = 0 - EVO_HAPPINESS = auto() - EVO_HAPPINESS_DAY = auto() - EVO_HAPPINESS_NIGHT = auto() - EVO_LEVEL_UP = auto() - EVO_TRADE = auto() - EVO_TRADE_WITH_ITEM = auto() - EVO_USE_ITEM = auto() - EVO_LEVEL_ATK_GT_DEF = auto() - EVO_LEVEL_ATK_EQ_DEF = auto() - EVO_LEVEL_ATK_LT_DEF = auto() - EVO_LEVEL_PID_LOW = auto() - EVO_LEVEL_PID_HIGH = auto() - EVO_LEVEL_NINJASK = auto() - EVO_LEVEL_SHEDINJA = auto() - EVO_BEAUTY = auto() - EVO_USE_ITEM_MALE = auto() - EVO_USE_ITEM_FEMALE = auto() - EVO_USE_ITEM_DAY = auto() - EVO_USE_ITEM_NIGHT = auto() - EVO_KNOW_MOVE = auto() - EVO_MON_IN_PARTY = auto() - EVO_LEVEL_MALE = auto() - EVO_LEVEL_FEMALE = auto() - EVO_ELECTRIC_FIELD = auto() - EVO_MOSSY_STONE = auto() - EVO_ICY_STONE = auto() diff --git a/tools/json2bin/consts/pokemon/exp_rate.py b/tools/json2bin/consts/pokemon/exp_rate.py deleted file mode 100644 index ca168be920..0000000000 --- a/tools/json2bin/consts/pokemon/exp_rate.py +++ /dev/null @@ -1,10 +0,0 @@ -from enum import Enum, auto - - -class PokemonExpRate(Enum): - MEDIUM_FAST = 0 - ERRATIC = auto() - FLUCTUATING = auto() - MEDIUM_SLOW = auto() - FAST = auto() - SLOW = auto() diff --git a/tools/json2bin/consts/pokemon/gender_ratio.py b/tools/json2bin/consts/pokemon/gender_ratio.py deleted file mode 100644 index adbd1ab525..0000000000 --- a/tools/json2bin/consts/pokemon/gender_ratio.py +++ /dev/null @@ -1,12 +0,0 @@ -from enum import Enum, auto - - -class PokemonGenderRatio(Enum): - MALE_ONLY = 0 - FEMALE_12_5 = 31 - FEMALE_25 = 63 - FEMALE_50 = 127 - FEMALE_75 = 191 - FEMALE_87_5 = 223 - FEMALE_ONLY = 254 - NO_GENDER = 255 diff --git a/tools/json2bin/consts/pokemon/mon_type.py b/tools/json2bin/consts/pokemon/mon_type.py deleted file mode 100644 index dc5e190d9b..0000000000 --- a/tools/json2bin/consts/pokemon/mon_type.py +++ /dev/null @@ -1,31 +0,0 @@ -from enum import Enum, auto - - -class PokeType(Enum): - TYPE_NORMAL = 0 - TYPE_FIGHTING = auto() - TYPE_FLYING = auto() - TYPE_POISON = auto() - TYPE_GROUND = auto() - TYPE_ROCK = auto() - TYPE_BUG = auto() - TYPE_GHOST = auto() - TYPE_STEEL = auto() - TYPE_MYSTERY = auto() - TYPE_FIRE = auto() - TYPE_WATER = auto() - TYPE_GRASS = auto() - TYPE_ELECTRIC = auto() - TYPE_PSYCHIC = auto() - TYPE_ICE = auto() - TYPE_DRAGON = auto() - TYPE_DARK = auto() - TYPE_NONE = 0xFF - - -class ContestType(Enum): - CONTEST_TYPE_COOL = 0 - CONTEST_TYPE_CUTE = auto() - CONTEST_TYPE_BEAUTY = auto() - CONTEST_TYPE_SMART = auto() - CONTEST_TYPE_TOUGH = auto() diff --git a/tools/json2bin/consts/pokemon/shadow.py b/tools/json2bin/consts/pokemon/shadow.py deleted file mode 100644 index 66c66d02ea..0000000000 --- a/tools/json2bin/consts/pokemon/shadow.py +++ /dev/null @@ -1,8 +0,0 @@ -from enum import Enum, auto - - -class ShadowSize(Enum): - SHADOW_SIZE_NONE = 0 - SHADOW_SIZE_SMALL = auto() - SHADOW_SIZE_MEDIUM = auto() - SHADOW_SIZE_LARGE = auto() diff --git a/tools/json2bin/consts/pokemon/species.py b/tools/json2bin/consts/pokemon/species.py deleted file mode 100644 index d1162504ce..0000000000 --- a/tools/json2bin/consts/pokemon/species.py +++ /dev/null @@ -1,500 +0,0 @@ -from enum import Enum, auto - - -class PokemonSpecies(Enum): - SPECIES_NONE = 0 - SPECIES_BULBASAUR = auto() - SPECIES_IVYSAUR = auto() - SPECIES_VENUSAUR = auto() - SPECIES_CHARMANDER = auto() - SPECIES_CHARMELEON = auto() - SPECIES_CHARIZARD = auto() - SPECIES_SQUIRTLE = auto() - SPECIES_WARTORTLE = auto() - SPECIES_BLASTOISE = auto() - SPECIES_CATERPIE = auto() - SPECIES_METAPOD = auto() - SPECIES_BUTTERFREE = auto() - SPECIES_WEEDLE = auto() - SPECIES_KAKUNA = auto() - SPECIES_BEEDRILL = auto() - SPECIES_PIDGEY = auto() - SPECIES_PIDGEOTTO = auto() - SPECIES_PIDGEOT = auto() - SPECIES_RATTATA = auto() - SPECIES_RATICATE = auto() - SPECIES_SPEAROW = auto() - SPECIES_FEAROW = auto() - SPECIES_EKANS = auto() - SPECIES_ARBOK = auto() - SPECIES_PIKACHU = auto() - SPECIES_RAICHU = auto() - SPECIES_SANDSHREW = auto() - SPECIES_SANDSLASH = auto() - SPECIES_NIDORAN_F = auto() - SPECIES_NIDORINA = auto() - SPECIES_NIDOQUEEN = auto() - SPECIES_NIDORAN_M = auto() - SPECIES_NIDORINO = auto() - SPECIES_NIDOKING = auto() - SPECIES_CLEFAIRY = auto() - SPECIES_CLEFABLE = auto() - SPECIES_VULPIX = auto() - SPECIES_NINETALES = auto() - SPECIES_JIGGLYPUFF = auto() - SPECIES_WIGGLYTUFF = auto() - SPECIES_ZUBAT = auto() - SPECIES_GOLBAT = auto() - SPECIES_ODDISH = auto() - SPECIES_GLOOM = auto() - SPECIES_VILEPLUME = auto() - SPECIES_PARAS = auto() - SPECIES_PARASECT = auto() - SPECIES_VENONAT = auto() - SPECIES_VENOMOTH = auto() - SPECIES_DIGLETT = auto() - SPECIES_DUGTRIO = auto() - SPECIES_MEOWTH = auto() - SPECIES_PERSIAN = auto() - SPECIES_PSYDUCK = auto() - SPECIES_GOLDUCK = auto() - SPECIES_MANKEY = auto() - SPECIES_PRIMEAPE = auto() - SPECIES_GROWLITHE = auto() - SPECIES_ARCANINE = auto() - SPECIES_POLIWAG = auto() - SPECIES_POLIWHIRL = auto() - SPECIES_POLIWRATH = auto() - SPECIES_ABRA = auto() - SPECIES_KADABRA = auto() - SPECIES_ALAKAZAM = auto() - SPECIES_MACHOP = auto() - SPECIES_MACHOKE = auto() - SPECIES_MACHAMP = auto() - SPECIES_BELLSPROUT = auto() - SPECIES_WEEPINBELL = auto() - SPECIES_VICTREEBEL = auto() - SPECIES_TENTACOOL = auto() - SPECIES_TENTACRUEL = auto() - SPECIES_GEODUDE = auto() - SPECIES_GRAVELER = auto() - SPECIES_GOLEM = auto() - SPECIES_PONYTA = auto() - SPECIES_RAPIDASH = auto() - SPECIES_SLOWPOKE = auto() - SPECIES_SLOWBRO = auto() - SPECIES_MAGNEMITE = auto() - SPECIES_MAGNETON = auto() - SPECIES_FARFETCHD = auto() - SPECIES_DODUO = auto() - SPECIES_DODRIO = auto() - SPECIES_SEEL = auto() - SPECIES_DEWGONG = auto() - SPECIES_GRIMER = auto() - SPECIES_MUK = auto() - SPECIES_SHELLDER = auto() - SPECIES_CLOYSTER = auto() - SPECIES_GASTLY = auto() - SPECIES_HAUNTER = auto() - SPECIES_GENGAR = auto() - SPECIES_ONIX = auto() - SPECIES_DROWZEE = auto() - SPECIES_HYPNO = auto() - SPECIES_KRABBY = auto() - SPECIES_KINGLER = auto() - SPECIES_VOLTORB = auto() - SPECIES_ELECTRODE = auto() - SPECIES_EXEGGCUTE = auto() - SPECIES_EXEGGUTOR = auto() - SPECIES_CUBONE = auto() - SPECIES_MAROWAK = auto() - SPECIES_HITMONLEE = auto() - SPECIES_HITMONCHAN = auto() - SPECIES_LICKITUNG = auto() - SPECIES_KOFFING = auto() - SPECIES_WEEZING = auto() - SPECIES_RHYHORN = auto() - SPECIES_RHYDON = auto() - SPECIES_CHANSEY = auto() - SPECIES_TANGELA = auto() - SPECIES_KANGASKHAN = auto() - SPECIES_HORSEA = auto() - SPECIES_SEADRA = auto() - SPECIES_GOLDEEN = auto() - SPECIES_SEAKING = auto() - SPECIES_STARYU = auto() - SPECIES_STARMIE = auto() - SPECIES_MR_MIME = auto() - SPECIES_SCYTHER = auto() - SPECIES_JYNX = auto() - SPECIES_ELECTABUZZ = auto() - SPECIES_MAGMAR = auto() - SPECIES_PINSIR = auto() - SPECIES_TAUROS = auto() - SPECIES_MAGIKARP = auto() - SPECIES_GYARADOS = auto() - SPECIES_LAPRAS = auto() - SPECIES_DITTO = auto() - SPECIES_EEVEE = auto() - SPECIES_VAPOREON = auto() - SPECIES_JOLTEON = auto() - SPECIES_FLAREON = auto() - SPECIES_PORYGON = auto() - SPECIES_OMANYTE = auto() - SPECIES_OMASTAR = auto() - SPECIES_KABUTO = auto() - SPECIES_KABUTOPS = auto() - SPECIES_AERODACTYL = auto() - SPECIES_SNORLAX = auto() - SPECIES_ARTICUNO = auto() - SPECIES_ZAPDOS = auto() - SPECIES_MOLTRES = auto() - SPECIES_DRATINI = auto() - SPECIES_DRAGONAIR = auto() - SPECIES_DRAGONITE = auto() - SPECIES_MEWTWO = auto() - SPECIES_MEW = auto() - SPECIES_CHIKORITA = auto() - SPECIES_BAYLEEF = auto() - SPECIES_MEGANIUM = auto() - SPECIES_CYNDAQUIL = auto() - SPECIES_QUILAVA = auto() - SPECIES_TYPHLOSION = auto() - SPECIES_TOTODILE = auto() - SPECIES_CROCONAW = auto() - SPECIES_FERALIGATR = auto() - SPECIES_SENTRET = auto() - SPECIES_FURRET = auto() - SPECIES_HOOTHOOT = auto() - SPECIES_NOCTOWL = auto() - SPECIES_LEDYBA = auto() - SPECIES_LEDIAN = auto() - SPECIES_SPINARAK = auto() - SPECIES_ARIADOS = auto() - SPECIES_CROBAT = auto() - SPECIES_CHINCHOU = auto() - SPECIES_LANTURN = auto() - SPECIES_PICHU = auto() - SPECIES_CLEFFA = auto() - SPECIES_IGGLYBUFF = auto() - SPECIES_TOGEPI = auto() - SPECIES_TOGETIC = auto() - SPECIES_NATU = auto() - SPECIES_XATU = auto() - SPECIES_MAREEP = auto() - SPECIES_FLAAFFY = auto() - SPECIES_AMPHAROS = auto() - SPECIES_BELLOSSOM = auto() - SPECIES_MARILL = auto() - SPECIES_AZUMARILL = auto() - SPECIES_SUDOWOODO = auto() - SPECIES_POLITOED = auto() - SPECIES_HOPPIP = auto() - SPECIES_SKIPLOOM = auto() - SPECIES_JUMPLUFF = auto() - SPECIES_AIPOM = auto() - SPECIES_SUNKERN = auto() - SPECIES_SUNFLORA = auto() - SPECIES_YANMA = auto() - SPECIES_WOOPER = auto() - SPECIES_QUAGSIRE = auto() - SPECIES_ESPEON = auto() - SPECIES_UMBREON = auto() - SPECIES_MURKROW = auto() - SPECIES_SLOWKING = auto() - SPECIES_MISDREAVUS = auto() - SPECIES_UNOWN = auto() - SPECIES_WOBBUFFET = auto() - SPECIES_GIRAFARIG = auto() - SPECIES_PINECO = auto() - SPECIES_FORRETRESS = auto() - SPECIES_DUNSPARCE = auto() - SPECIES_GLIGAR = auto() - SPECIES_STEELIX = auto() - SPECIES_SNUBBULL = auto() - SPECIES_GRANBULL = auto() - SPECIES_QWILFISH = auto() - SPECIES_SCIZOR = auto() - SPECIES_SHUCKLE = auto() - SPECIES_HERACROSS = auto() - SPECIES_SNEASEL = auto() - SPECIES_TEDDIURSA = auto() - SPECIES_URSARING = auto() - SPECIES_SLUGMA = auto() - SPECIES_MAGCARGO = auto() - SPECIES_SWINUB = auto() - SPECIES_PILOSWINE = auto() - SPECIES_CORSOLA = auto() - SPECIES_REMORAID = auto() - SPECIES_OCTILLERY = auto() - SPECIES_DELIBIRD = auto() - SPECIES_MANTINE = auto() - SPECIES_SKARMORY = auto() - SPECIES_HOUNDOUR = auto() - SPECIES_HOUNDOOM = auto() - SPECIES_KINGDRA = auto() - SPECIES_PHANPY = auto() - SPECIES_DONPHAN = auto() - SPECIES_PORYGON2 = auto() - SPECIES_STANTLER = auto() - SPECIES_SMEARGLE = auto() - SPECIES_TYROGUE = auto() - SPECIES_HITMONTOP = auto() - SPECIES_SMOOCHUM = auto() - SPECIES_ELEKID = auto() - SPECIES_MAGBY = auto() - SPECIES_MILTANK = auto() - SPECIES_BLISSEY = auto() - SPECIES_RAIKOU = auto() - SPECIES_ENTEI = auto() - SPECIES_SUICUNE = auto() - SPECIES_LARVITAR = auto() - SPECIES_PUPITAR = auto() - SPECIES_TYRANITAR = auto() - SPECIES_LUGIA = auto() - SPECIES_HO_OH = auto() - SPECIES_CELEBI = auto() - SPECIES_TREECKO = auto() - SPECIES_GROVYLE = auto() - SPECIES_SCEPTILE = auto() - SPECIES_TORCHIC = auto() - SPECIES_COMBUSKEN = auto() - SPECIES_BLAZIKEN = auto() - SPECIES_MUDKIP = auto() - SPECIES_MARSHTOMP = auto() - SPECIES_SWAMPERT = auto() - SPECIES_POOCHYENA = auto() - SPECIES_MIGHTYENA = auto() - SPECIES_ZIGZAGOON = auto() - SPECIES_LINOONE = auto() - SPECIES_WURMPLE = auto() - SPECIES_SILCOON = auto() - SPECIES_BEAUTIFLY = auto() - SPECIES_CASCOON = auto() - SPECIES_DUSTOX = auto() - SPECIES_LOTAD = auto() - SPECIES_LOMBRE = auto() - SPECIES_LUDICOLO = auto() - SPECIES_SEEDOT = auto() - SPECIES_NUZLEAF = auto() - SPECIES_SHIFTRY = auto() - SPECIES_TAILLOW = auto() - SPECIES_SWELLOW = auto() - SPECIES_WINGULL = auto() - SPECIES_PELIPPER = auto() - SPECIES_RALTS = auto() - SPECIES_KIRLIA = auto() - SPECIES_GARDEVOIR = auto() - SPECIES_SURSKIT = auto() - SPECIES_MASQUERAIN = auto() - SPECIES_SHROOMISH = auto() - SPECIES_BRELOOM = auto() - SPECIES_SLAKOTH = auto() - SPECIES_VIGOROTH = auto() - SPECIES_SLAKING = auto() - SPECIES_NINCADA = auto() - SPECIES_NINJASK = auto() - SPECIES_SHEDINJA = auto() - SPECIES_WHISMUR = auto() - SPECIES_LOUDRED = auto() - SPECIES_EXPLOUD = auto() - SPECIES_MAKUHITA = auto() - SPECIES_HARIYAMA = auto() - SPECIES_AZURILL = auto() - SPECIES_NOSEPASS = auto() - SPECIES_SKITTY = auto() - SPECIES_DELCATTY = auto() - SPECIES_SABLEYE = auto() - SPECIES_MAWILE = auto() - SPECIES_ARON = auto() - SPECIES_LAIRON = auto() - SPECIES_AGGRON = auto() - SPECIES_MEDITITE = auto() - SPECIES_MEDICHAM = auto() - SPECIES_ELECTRIKE = auto() - SPECIES_MANECTRIC = auto() - SPECIES_PLUSLE = auto() - SPECIES_MINUN = auto() - SPECIES_VOLBEAT = auto() - SPECIES_ILLUMISE = auto() - SPECIES_ROSELIA = auto() - SPECIES_GULPIN = auto() - SPECIES_SWALOT = auto() - SPECIES_CARVANHA = auto() - SPECIES_SHARPEDO = auto() - SPECIES_WAILMER = auto() - SPECIES_WAILORD = auto() - SPECIES_NUMEL = auto() - SPECIES_CAMERUPT = auto() - SPECIES_TORKOAL = auto() - SPECIES_SPOINK = auto() - SPECIES_GRUMPIG = auto() - SPECIES_SPINDA = auto() - SPECIES_TRAPINCH = auto() - SPECIES_VIBRAVA = auto() - SPECIES_FLYGON = auto() - SPECIES_CACNEA = auto() - SPECIES_CACTURNE = auto() - SPECIES_SWABLU = auto() - SPECIES_ALTARIA = auto() - SPECIES_ZANGOOSE = auto() - SPECIES_SEVIPER = auto() - SPECIES_LUNATONE = auto() - SPECIES_SOLROCK = auto() - SPECIES_BARBOACH = auto() - SPECIES_WHISCASH = auto() - SPECIES_CORPHISH = auto() - SPECIES_CRAWDAUNT = auto() - SPECIES_BALTOY = auto() - SPECIES_CLAYDOL = auto() - SPECIES_LILEEP = auto() - SPECIES_CRADILY = auto() - SPECIES_ANORITH = auto() - SPECIES_ARMALDO = auto() - SPECIES_FEEBAS = auto() - SPECIES_MILOTIC = auto() - SPECIES_CASTFORM = auto() - SPECIES_KECLEON = auto() - SPECIES_SHUPPET = auto() - SPECIES_BANETTE = auto() - SPECIES_DUSKULL = auto() - SPECIES_DUSCLOPS = auto() - SPECIES_TROPIUS = auto() - SPECIES_CHIMECHO = auto() - SPECIES_ABSOL = auto() - SPECIES_WYNAUT = auto() - SPECIES_SNORUNT = auto() - SPECIES_GLALIE = auto() - SPECIES_SPHEAL = auto() - SPECIES_SEALEO = auto() - SPECIES_WALREIN = auto() - SPECIES_CLAMPERL = auto() - SPECIES_HUNTAIL = auto() - SPECIES_GOREBYSS = auto() - SPECIES_RELICANTH = auto() - SPECIES_LUVDISC = auto() - SPECIES_BAGON = auto() - SPECIES_SHELGON = auto() - SPECIES_SALAMENCE = auto() - SPECIES_BELDUM = auto() - SPECIES_METANG = auto() - SPECIES_METAGROSS = auto() - SPECIES_REGIROCK = auto() - SPECIES_REGICE = auto() - SPECIES_REGISTEEL = auto() - SPECIES_LATIAS = auto() - SPECIES_LATIOS = auto() - SPECIES_KYOGRE = auto() - SPECIES_GROUDON = auto() - SPECIES_RAYQUAZA = auto() - SPECIES_JIRACHI = auto() - SPECIES_DEOXYS = auto() - SPECIES_TURTWIG = auto() - SPECIES_GROTLE = auto() - SPECIES_TORTERRA = auto() - SPECIES_CHIMCHAR = auto() - SPECIES_MONFERNO = auto() - SPECIES_INFERNAPE = auto() - SPECIES_PIPLUP = auto() - SPECIES_PRINPLUP = auto() - SPECIES_EMPOLEON = auto() - SPECIES_STARLY = auto() - SPECIES_STARAVIA = auto() - SPECIES_STARAPTOR = auto() - SPECIES_BIDOOF = auto() - SPECIES_BIBAREL = auto() - SPECIES_KRICKETOT = auto() - SPECIES_KRICKETUNE = auto() - SPECIES_SHINX = auto() - SPECIES_LUXIO = auto() - SPECIES_LUXRAY = auto() - SPECIES_BUDEW = auto() - SPECIES_ROSERADE = auto() - SPECIES_CRANIDOS = auto() - SPECIES_RAMPARDOS = auto() - SPECIES_SHIELDON = auto() - SPECIES_BASTIODON = auto() - SPECIES_BURMY = auto() - SPECIES_WORMADAM = auto() - SPECIES_MOTHIM = auto() - SPECIES_COMBEE = auto() - SPECIES_VESPIQUEN = auto() - SPECIES_PACHIRISU = auto() - SPECIES_BUIZEL = auto() - SPECIES_FLOATZEL = auto() - SPECIES_CHERUBI = auto() - SPECIES_CHERRIM = auto() - SPECIES_SHELLOS = auto() - SPECIES_GASTRODON = auto() - SPECIES_AMBIPOM = auto() - SPECIES_DRIFLOON = auto() - SPECIES_DRIFBLIM = auto() - SPECIES_BUNEARY = auto() - SPECIES_LOPUNNY = auto() - SPECIES_MISMAGIUS = auto() - SPECIES_HONCHKROW = auto() - SPECIES_GLAMEOW = auto() - SPECIES_PURUGLY = auto() - SPECIES_CHINGLING = auto() - SPECIES_STUNKY = auto() - SPECIES_SKUNTANK = auto() - SPECIES_BRONZOR = auto() - SPECIES_BRONZONG = auto() - SPECIES_BONSLY = auto() - SPECIES_MIME_JR = auto() - SPECIES_HAPPINY = auto() - SPECIES_CHATOT = auto() - SPECIES_SPIRITOMB = auto() - SPECIES_GIBLE = auto() - SPECIES_GABITE = auto() - SPECIES_GARCHOMP = auto() - SPECIES_MUNCHLAX = auto() - SPECIES_RIOLU = auto() - SPECIES_LUCARIO = auto() - SPECIES_HIPPOPOTAS = auto() - SPECIES_HIPPOWDON = auto() - SPECIES_SKORUPI = auto() - SPECIES_DRAPION = auto() - SPECIES_CROAGUNK = auto() - SPECIES_TOXICROAK = auto() - SPECIES_CARNIVINE = auto() - SPECIES_FINNEON = auto() - SPECIES_LUMINEON = auto() - SPECIES_MANTYKE = auto() - SPECIES_SNOVER = auto() - SPECIES_ABOMASNOW = auto() - SPECIES_WEAVILE = auto() - SPECIES_MAGNEZONE = auto() - SPECIES_LICKILICKY = auto() - SPECIES_RHYPERIOR = auto() - SPECIES_TANGROWTH = auto() - SPECIES_ELECTIVIRE = auto() - SPECIES_MAGMORTAR = auto() - SPECIES_TOGEKISS = auto() - SPECIES_YANMEGA = auto() - SPECIES_LEAFEON = auto() - SPECIES_GLACEON = auto() - SPECIES_GLISCOR = auto() - SPECIES_MAMOSWINE = auto() - SPECIES_PORYGON_Z = auto() - SPECIES_GALLADE = auto() - SPECIES_PROBOPASS = auto() - SPECIES_DUSKNOIR = auto() - SPECIES_FROSLASS = auto() - SPECIES_ROTOM = auto() - SPECIES_UXIE = auto() - SPECIES_MESPRIT = auto() - SPECIES_AZELF = auto() - SPECIES_DIALGA = auto() - SPECIES_PALKIA = auto() - SPECIES_HEATRAN = auto() - SPECIES_REGIGIGAS = auto() - SPECIES_GIRATINA = auto() - SPECIES_CRESSELIA = auto() - SPECIES_PHIONE = auto() - SPECIES_MANAPHY = auto() - SPECIES_DARKRAI = auto() - SPECIES_SHAYMIN = auto() - SPECIES_ARCEUS = auto() - SPECIES_EGG = auto() - SPECIES_BAD_EGG = auto() diff --git a/tools/json2bin/consts/pokemon/tms.py b/tools/json2bin/consts/pokemon/tms.py deleted file mode 100644 index 6ff4a17dde..0000000000 --- a/tools/json2bin/consts/pokemon/tms.py +++ /dev/null @@ -1,104 +0,0 @@ -from enum import Enum, Flag, auto - - -class PokemonLearnsetTMs(Flag): - TM01 = 1 - TM02 = auto() - TM03 = auto() - TM04 = auto() - TM05 = auto() - TM06 = auto() - TM07 = auto() - TM08 = auto() - TM09 = auto() - TM10 = auto() - TM11 = auto() - TM12 = auto() - TM13 = auto() - TM14 = auto() - TM15 = auto() - TM16 = auto() - TM17 = auto() - TM18 = auto() - TM19 = auto() - TM20 = auto() - TM21 = auto() - TM22 = auto() - TM23 = auto() - TM24 = auto() - TM25 = auto() - TM26 = auto() - TM27 = auto() - TM28 = auto() - TM29 = auto() - TM30 = auto() - TM31 = auto() - TM32 = auto() - TM33 = auto() - TM34 = auto() - TM35 = auto() - TM36 = auto() - TM37 = auto() - TM38 = auto() - TM39 = auto() - TM40 = auto() - TM41 = auto() - TM42 = auto() - TM43 = auto() - TM44 = auto() - TM45 = auto() - TM46 = auto() - TM47 = auto() - TM48 = auto() - TM49 = auto() - TM50 = auto() - TM51 = auto() - TM52 = auto() - TM53 = auto() - TM54 = auto() - TM55 = auto() - TM56 = auto() - TM57 = auto() - TM58 = auto() - TM59 = auto() - TM60 = auto() - TM61 = auto() - TM62 = auto() - TM63 = auto() - TM64 = auto() - TM65 = auto() - TM66 = auto() - TM67 = auto() - TM68 = auto() - TM69 = auto() - TM70 = auto() - TM71 = auto() - TM72 = auto() - TM73 = auto() - TM74 = auto() - TM75 = auto() - TM76 = auto() - TM77 = auto() - TM78 = auto() - TM79 = auto() - TM80 = auto() - TM81 = auto() - TM82 = auto() - TM83 = auto() - TM84 = auto() - TM85 = auto() - TM86 = auto() - TM87 = auto() - TM88 = auto() - TM89 = auto() - TM90 = auto() - TM91 = auto() - TM92 = auto() - HM01 = auto() - HM02 = auto() - HM03 = auto() - HM04 = auto() - HM05 = auto() - HM06 = auto() - HM07 = auto() - HM08 = auto() diff --git a/tools/json2bin/consts/trainer.py b/tools/json2bin/consts/trainer.py deleted file mode 100644 index 147f17936d..0000000000 --- a/tools/json2bin/consts/trainer.py +++ /dev/null @@ -1,124 +0,0 @@ -from enum import Enum, Flag, auto - - -class TrainerClass(Enum): - TRAINER_CLASS_PLAYER_MALE = 0 - TRAINER_CLASS_PLAYER_FEMALE = auto() - TRAINER_CLASS_YOUNGSTER = auto() - TRAINER_CLASS_LASS = auto() - TRAINER_CLASS_CAMPER = auto() - TRAINER_CLASS_PICNICKER = auto() - TRAINER_CLASS_BUG_CATCHER = auto() - TRAINER_CLASS_AROMA_LADY = auto() - TRAINER_CLASS_TWINS = auto() - TRAINER_CLASS_HIKER = auto() - TRAINER_CLASS_BATTLE_GIRL = auto() - TRAINER_CLASS_FISHERMAN = auto() - TRAINER_CLASS_CYCLIST_MALE = auto() - TRAINER_CLASS_CYCLIST_FEMALE = auto() - TRAINER_CLASS_BLACK_BELT = auto() - TRAINER_CLASS_ARTIST = auto() - TRAINER_CLASS_BREEDER_MALE = auto() - TRAINER_CLASS_BREEDER_FEMALE = auto() - TRAINER_CLASS_COWGIRL = auto() - TRAINER_CLASS_JOGGER = auto() - TRAINER_CLASS_POKEFAN_MALE = auto() - TRAINER_CLASS_POKEFAN_FEMALE = auto() - TRAINER_CLASS_POKE_KID = auto() - TRAINER_CLASS_YOUNG_COUPLE = auto() - TRAINER_CLASS_ACE_TRAINER_MALE = auto() - TRAINER_CLASS_ACE_TRAINER_FEMALE = auto() - TRAINER_CLASS_WAITRESS = auto() - TRAINER_CLASS_VETERAN = auto() - TRAINER_CLASS_NINJA_BOY = auto() - TRAINER_CLASS_DRAGON_TAMER = auto() - TRAINER_CLASS_BIRD_KEEPER = auto() - TRAINER_CLASS_DOUBLE_TEAM = auto() - TRAINER_CLASS_RICH_BOY = auto() - TRAINER_CLASS_LADY = auto() - TRAINER_CLASS_GENTLEMAN = auto() - TRAINER_CLASS_SOCIALITE = auto() - TRAINER_CLASS_BEAUTY = auto() - TRAINER_CLASS_COLLECTOR = auto() - TRAINER_CLASS_POLICEMAN = auto() - TRAINER_CLASS_RANGER_MALE = auto() - TRAINER_CLASS_RANGER_FEMALE = auto() - TRAINER_CLASS_SCIENTIST = auto() - TRAINER_CLASS_SWIMMER_MALE = auto() - TRAINER_CLASS_SWIMMER_FEMALE = auto() - TRAINER_CLASS_TUBER_MALE = auto() - TRAINER_CLASS_TUBER_FEMALE = auto() - TRAINER_CLASS_SAILOR = auto() - TRAINER_CLASS_SIS_AND_BRO = auto() - TRAINER_CLASS_RUIN_MANIAC = auto() - TRAINER_CLASS_PSYCHIC_MALE = auto() - TRAINER_CLASS_PSYCHIC_FEMALE = auto() - TRAINER_CLASS_PI = auto() - TRAINER_CLASS_GUITARIST = auto() - TRAINER_CLASS_ACE_TRAINER_SNOW_MALE = auto() - TRAINER_CLASS_ACE_TRAINER_SNOW_FEMALE = auto() - TRAINER_CLASS_SKIER_MALE = auto() - TRAINER_CLASS_SKIER_FEMALE = auto() - TRAINER_CLASS_ROUGHNECK = auto() - TRAINER_CLASS_CLOWN = auto() - TRAINER_CLASS_WORKER = auto() - TRAINER_CLASS_SCHOOL_KID_MALE = auto() - TRAINER_CLASS_SCHOOL_KID_FEMALE = auto() - TRAINER_CLASS_LEADER_ROARK = auto() - TRAINER_CLASS_RIVAL = auto() - TRAINER_CLASS_LEADER_BYRON = auto() - TRAINER_CLASS_ELITE_FOUR_AARON = auto() - TRAINER_CLASS_ELITE_FOUR_BERTHA = auto() - TRAINER_CLASS_ELITE_FOUR_FLINT = auto() - TRAINER_CLASS_ELITE_FOUR_LUCIAN = auto() - TRAINER_CLASS_CHAMPION_CYNTHIA = auto() - TRAINER_CLASS_BELLE_AND_PA = auto() - TRAINER_CLASS_RANCHER = auto() - TRAINER_CLASS_COMMANDER_MARS = auto() - TRAINER_CLASS_GALACTIC_GRUNT_MALE = auto() - TRAINER_CLASS_LEADER_GARDENIA = auto() - TRAINER_CLASS_LEADER_WAKE = auto() - TRAINER_CLASS_LEADER_MAYLENE = auto() - TRAINER_CLASS_LEADER_FANTINA = auto() - TRAINER_CLASS_LEADER_CANDICE = auto() - TRAINER_CLASS_LEADER_VOLKNER = auto() - TRAINER_CLASS_PARASOL_LADY = auto() - TRAINER_CLASS_WAITER = auto() - TRAINER_CLASS_INTERVIEWERS = auto() - TRAINER_CLASS_CAMERAMAN = auto() - TRAINER_CLASS_REPORTERS = auto() - TRAINER_CLASS_IDOL = auto() - TRAINER_CLASS_GALACTIC_BOSS = auto() - TRAINER_CLASS_COMMANDER_JUPITER = auto() - TRAINER_CLASS_COMMANDER_SATURN = auto() - TRAINER_CLASS_GALACTIC_GRUNT_FEMALE = auto() - TRAINER_CLASS_TRAINER_CHERYL = auto() - TRAINER_CLASS_TRAINER_RILEY = auto() - TRAINER_CLASS_TRAINER_MARLEY = auto() - TRAINER_CLASS_TRAINER_BUCK = auto() - TRAINER_CLASS_TRAINER_MIRA = auto() - TRAINER_CLASS_DP_PLAYER_MALE = auto() - TRAINER_CLASS_DP_PLAYER_FEMALE = auto() - TRAINER_CLASS_TOWER_TYCOON = auto() - TRAINER_CLASS_MAID = auto() - TRAINER_CLASS_HALL_MATRON = auto() - TRAINER_CLASS_FACTORY_HEAD = auto() - TRAINER_CLASS_ARCADE_STAR = auto() - TRAINER_CLASS_CASTLE_VALET = auto() - TRAINER_CLASS_DP_PLAYER_MALE_2 = auto() - TRAINER_CLASS_DP_PLAYER_FEMALE_2 = auto() - - -class AIFlag(Flag): - AI_FLAG_BASIC = 1 - AI_FLAG_EVAL_ATTACK = auto() - AI_FLAG_EXPERT = auto() - AI_FLAG_SETUP_FIRST_TURN = auto() - AI_FLAG_RISKY = auto() - AI_FLAG_DAMAGE_PRIORITY = auto() - AI_FLAG_BATON_PASS = auto() - AI_FLAG_TAG_STRATEGY = auto() - AI_FLAG_CHECK_HP = auto() - AI_FLAG_WEATHER = auto() - AI_FLAG_HARRASSMENT = auto() -