diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index f6d5dc8fee..7592fce313 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1391,6 +1391,11 @@ .4byte \sidestatus .endm + .macro trycopycat failInstr:req + callnative BS_TryCopycat + .4byte \failInstr + .endm + .macro setzeffect callnative BS_SetZEffect .endm @@ -1805,11 +1810,6 @@ .4byte \jumpInstr .endm - .macro trycopycat failInstr:req - various BS_ATTACKER, VARIOUS_TRY_COPYCAT - .4byte \failInstr - .endm - .macro showabilitypopup battler:req various \battler, VARIOUS_ABILITY_POPUP .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 9f0f1dcd15..3a8f7f1582 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -443,6 +443,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE .4byte BattleScript_EffectGlaiveRush @ EFFECT_GLAIVE_RUSH .4byte BattleScript_EffectBrickBreak @ EFFECT_RAGING_BULL + .4byte BattleScript_EffectHit @ EFFECT_RAGE_FIST BattleScript_EffectGlaiveRush:: call BattleScript_EffectHit_Ret diff --git a/include/battle.h b/include/battle.h index b276f5080c..f5df5a4620 100644 --- a/include/battle.h +++ b/include/battle.h @@ -735,6 +735,8 @@ struct BattleStruct bool8 transformZeroToHero[PARTY_SIZE][NUM_BATTLE_SIDES]; u8 pledgeMove:1; bool8 isSkyBattle:1; + u8 timesGotHit[NUM_BATTLE_SIDES][PARTY_SIZE]; + u8 enduredDamage; }; // The palaceFlags member of struct BattleStruct contains 1 flag per move to indicate which moves the AI should consider, @@ -767,7 +769,7 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER #define IS_MOVE_RECOIL(move)(IS_EFFECT_RECOIL(gBattleMoves[move].effect)) #define BATTLER_MAX_HP(battlerId)(gBattleMons[battlerId].hp == gBattleMons[battlerId].maxHP) -#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0)) +#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0) || (gBattleStruct->enduredDamage & gBitTable[gBattlerTarget])) #define BATTLER_DAMAGED(battlerId) ((gSpecialStatuses[battlerId].physicalDmg != 0 || gSpecialStatuses[battlerId].specialDmg != 0)) #define IS_BATTLER_OF_TYPE(battlerId, type)((GetBattlerType(battlerId, 0) == type || GetBattlerType(battlerId, 1) == type || (GetBattlerType(battlerId, 2) != TYPE_MYSTERY && GetBattlerType(battlerId, 2) == type))) diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 19118ca4e9..47edeb55bf 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -420,7 +420,8 @@ #define EFFECT_MAX_MOVE 414 #define EFFECT_GLAIVE_RUSH 415 #define EFFECT_RAGING_BULL 416 +#define EFFECT_RAGE_FIST 417 -#define NUM_BATTLE_MOVE_EFFECTS 417 +#define NUM_BATTLE_MOVE_EFFECTS 418 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 5474e3b242..eabc965e57 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -143,106 +143,105 @@ #define VARIOUS_ARGUMENT_STATUS_EFFECT 51 #define VARIOUS_TRY_HIT_SWITCH_TARGET 52 #define VARIOUS_TRY_AUTOTOMIZE 53 -#define VARIOUS_TRY_COPYCAT 54 -#define VARIOUS_ABILITY_POPUP 55 -#define VARIOUS_DEFOG 56 -#define VARIOUS_JUMP_IF_TARGET_ALLY 57 -#define VARIOUS_TRY_SYNCHRONOISE 58 -#define VARIOUS_PSYCHO_SHIFT 59 -#define VARIOUS_CURE_STATUS 60 -#define VARIOUS_POWER_TRICK 61 -#define VARIOUS_AFTER_YOU 62 -#define VARIOUS_BESTOW 63 -#define VARIOUS_ARGUMENT_TO_MOVE_EFFECT 64 -#define VARIOUS_JUMP_IF_NOT_GROUNDED 65 -#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 66 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 67 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 68 -#define VARIOUS_SET_AURORA_VEIL 69 -#define VARIOUS_TRY_THIRD_TYPE 70 -#define VARIOUS_ACUPRESSURE 71 -#define VARIOUS_SET_POWDER 72 -#define VARIOUS_SPECTRAL_THIEF 73 -#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 74 -#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 75 -#define VARIOUS_JUMP_IF_ROAR_FAILS 76 -#define VARIOUS_TRY_INSTRUCT 77 -#define VARIOUS_JUMP_IF_NOT_BERRY 78 -#define VARIOUS_TRACE_ABILITY 79 -#define VARIOUS_UPDATE_NICK 80 -#define VARIOUS_TRY_ILLUSION_OFF 81 -#define VARIOUS_SET_SPRITEIGNORE0HP 82 -#define VARIOUS_HANDLE_FORM_CHANGE 83 -#define VARIOUS_GET_STAT_VALUE 84 -#define VARIOUS_JUMP_IF_FULL_HP 85 -#define VARIOUS_LOSE_TYPE 86 -#define VARIOUS_TRY_ACTIVATE_SOULHEART 87 -#define VARIOUS_TRY_ACTIVATE_RECEIVER 88 -#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 89 -#define VARIOUS_TRY_FRISK 90 -#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 91 -#define VARIOUS_TRY_FAIRY_LOCK 92 -#define VARIOUS_JUMP_IF_NO_ALLY 93 -#define VARIOUS_POISON_TYPE_IMMUNITY 94 -#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 95 -#define VARIOUS_INFATUATE_WITH_BATTLER 96 -#define VARIOUS_SET_LAST_USED_ITEM 97 -#define VARIOUS_PARALYZE_TYPE_IMMUNITY 98 -#define VARIOUS_JUMP_IF_ABSENT 99 -#define VARIOUS_DESTROY_ABILITY_POPUP 100 -#define VARIOUS_TOTEM_BOOST 101 -#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 102 -#define VARIOUS_MOVEEND_ITEM_EFFECTS 103 -#define VARIOUS_TERRAIN_SEED 104 -#define VARIOUS_MAKE_INVISIBLE 105 -#define VARIOUS_ROOM_SERVICE 106 -#define VARIOUS_EERIE_SPELL_PP_REDUCE 107 -#define VARIOUS_JUMP_IF_TEAM_HEALTHY 108 -#define VARIOUS_TRY_HEAL_QUARTER_HP 109 -#define VARIOUS_REMOVE_TERRAIN 110 -#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 111 -#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 112 -#define VARIOUS_GET_ROTOTILLER_TARGETS 113 -#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 114 -#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 115 -#define VARIOUS_CONSUME_BERRY 116 -#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 117 -#define VARIOUS_JUMP_IF_SPECIES 118 -#define VARIOUS_UPDATE_ABILITY_POPUP 119 -#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 120 -#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 121 -#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 122 -#define VARIOUS_PHOTON_GEYSER_CHECK 123 -#define VARIOUS_SHELL_SIDE_ARM_CHECK 124 -#define VARIOUS_TRY_NO_RETREAT 125 -#define VARIOUS_TRY_TAR_SHOT 126 -#define VARIOUS_CAN_TAR_SHOT_WORK 127 -#define VARIOUS_CHECK_POLTERGEIST 128 -#define VARIOUS_CUT_1_3_HP_RAISE_STATS 129 -#define VARIOUS_TRY_END_NEUTRALIZING_GAS 130 -#define VARIOUS_JUMP_IF_UNDER_200 131 -#define VARIOUS_SET_SKY_DROP 132 -#define VARIOUS_CLEAR_SKY_DROP 133 -#define VARIOUS_SKY_DROP_YAWN 134 -#define VARIOUS_JUMP_IF_HOLD_EFFECT 135 -#define VARIOUS_CURE_CERTAIN_STATUSES 136 -#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 137 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 138 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 139 -#define VARIOUS_SAVE_BATTLER_ITEM 140 -#define VARIOUS_RESTORE_BATTLER_ITEM 141 -#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 142 -#define VARIOUS_SET_BEAK_BLAST 143 -#define VARIOUS_SWAP_SIDE_STATUSES 144 -#define VARIOUS_SWAP_STATS 145 -#define VARIOUS_TEATIME_INVUL 146 -#define VARIOUS_TEATIME_TARGETS 147 -#define VARIOUS_TRY_WIND_RIDER_POWER 148 -#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 149 -#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 150 -#define VARIOUS_STORE_HEALING_WISH 151 -#define VARIOUS_HIT_SWITCH_TARGET_FAILED 152 -#define VARIOUS_TRY_REVIVAL_BLESSING 153 +#define VARIOUS_ABILITY_POPUP 54 +#define VARIOUS_DEFOG 55 +#define VARIOUS_JUMP_IF_TARGET_ALLY 56 +#define VARIOUS_TRY_SYNCHRONOISE 57 +#define VARIOUS_PSYCHO_SHIFT 58 +#define VARIOUS_CURE_STATUS 59 +#define VARIOUS_POWER_TRICK 60 +#define VARIOUS_AFTER_YOU 61 +#define VARIOUS_BESTOW 62 +#define VARIOUS_ARGUMENT_TO_MOVE_EFFECT 63 +#define VARIOUS_JUMP_IF_NOT_GROUNDED 64 +#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 65 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 66 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 67 +#define VARIOUS_SET_AURORA_VEIL 68 +#define VARIOUS_TRY_THIRD_TYPE 69 +#define VARIOUS_ACUPRESSURE 70 +#define VARIOUS_SET_POWDER 71 +#define VARIOUS_SPECTRAL_THIEF 72 +#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 73 +#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 74 +#define VARIOUS_JUMP_IF_ROAR_FAILS 75 +#define VARIOUS_TRY_INSTRUCT 76 +#define VARIOUS_JUMP_IF_NOT_BERRY 77 +#define VARIOUS_TRACE_ABILITY 78 +#define VARIOUS_UPDATE_NICK 79 +#define VARIOUS_TRY_ILLUSION_OFF 80 +#define VARIOUS_SET_SPRITEIGNORE0HP 81 +#define VARIOUS_HANDLE_FORM_CHANGE 82 +#define VARIOUS_GET_STAT_VALUE 83 +#define VARIOUS_JUMP_IF_FULL_HP 84 +#define VARIOUS_LOSE_TYPE 85 +#define VARIOUS_TRY_ACTIVATE_SOULHEART 86 +#define VARIOUS_TRY_ACTIVATE_RECEIVER 87 +#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 88 +#define VARIOUS_TRY_FRISK 89 +#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 90 +#define VARIOUS_TRY_FAIRY_LOCK 91 +#define VARIOUS_JUMP_IF_NO_ALLY 92 +#define VARIOUS_POISON_TYPE_IMMUNITY 93 +#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 94 +#define VARIOUS_INFATUATE_WITH_BATTLER 95 +#define VARIOUS_SET_LAST_USED_ITEM 96 +#define VARIOUS_PARALYZE_TYPE_IMMUNITY 97 +#define VARIOUS_JUMP_IF_ABSENT 98 +#define VARIOUS_DESTROY_ABILITY_POPUP 99 +#define VARIOUS_TOTEM_BOOST 100 +#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 101 +#define VARIOUS_MOVEEND_ITEM_EFFECTS 102 +#define VARIOUS_TERRAIN_SEED 103 +#define VARIOUS_MAKE_INVISIBLE 104 +#define VARIOUS_ROOM_SERVICE 105 +#define VARIOUS_EERIE_SPELL_PP_REDUCE 106 +#define VARIOUS_JUMP_IF_TEAM_HEALTHY 107 +#define VARIOUS_TRY_HEAL_QUARTER_HP 108 +#define VARIOUS_REMOVE_TERRAIN 109 +#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 110 +#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 111 +#define VARIOUS_GET_ROTOTILLER_TARGETS 112 +#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 113 +#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 114 +#define VARIOUS_CONSUME_BERRY 115 +#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 116 +#define VARIOUS_JUMP_IF_SPECIES 117 +#define VARIOUS_UPDATE_ABILITY_POPUP 118 +#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 119 +#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 120 +#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 121 +#define VARIOUS_PHOTON_GEYSER_CHECK 122 +#define VARIOUS_SHELL_SIDE_ARM_CHECK 123 +#define VARIOUS_TRY_NO_RETREAT 124 +#define VARIOUS_TRY_TAR_SHOT 125 +#define VARIOUS_CAN_TAR_SHOT_WORK 126 +#define VARIOUS_CHECK_POLTERGEIST 127 +#define VARIOUS_CUT_1_3_HP_RAISE_STATS 128 +#define VARIOUS_TRY_END_NEUTRALIZING_GAS 129 +#define VARIOUS_JUMP_IF_UNDER_200 130 +#define VARIOUS_SET_SKY_DROP 131 +#define VARIOUS_CLEAR_SKY_DROP 132 +#define VARIOUS_SKY_DROP_YAWN 133 +#define VARIOUS_JUMP_IF_HOLD_EFFECT 134 +#define VARIOUS_CURE_CERTAIN_STATUSES 135 +#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 136 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 137 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 138 +#define VARIOUS_SAVE_BATTLER_ITEM 139 +#define VARIOUS_RESTORE_BATTLER_ITEM 140 +#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 141 +#define VARIOUS_SET_BEAK_BLAST 142 +#define VARIOUS_SWAP_SIDE_STATUSES 143 +#define VARIOUS_SWAP_STATS 144 +#define VARIOUS_TEATIME_INVUL 145 +#define VARIOUS_TEATIME_TARGETS 146 +#define VARIOUS_TRY_WIND_RIDER_POWER 147 +#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 148 +#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 149 +#define VARIOUS_STORE_HEALING_WISH 150 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 151 +#define VARIOUS_TRY_REVIVAL_BLESSING 152 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 @@ -299,27 +298,28 @@ #define MOVEEND_MOVE_EFFECTS2 13 #define MOVEEND_ITEM_EFFECTS_ALL 14 #define MOVEEND_KINGSROCK 15 // These item effects will occur each strike of a multi-hit move -#define MOVEEND_SUBSTITUTE 16 -#define MOVEEND_SKY_DROP_CONFUSE 17 -#define MOVEEND_UPDATE_LAST_MOVES 18 -#define MOVEEND_MIRROR_MOVE 19 -#define MOVEEND_NEXT_TARGET 20 // Everything up until here is handled for each strike of a multi-hit move -#define MOVEEND_MULTIHIT_MOVE 21 -#define MOVEEND_DEFROST 22 -#define MOVEEND_RECOIL 23 -#define MOVEEND_MAGICIAN 24 // Occurs after final multi-hit strike, and after other items/abilities would activate -#define MOVEEND_EJECT_BUTTON 25 -#define MOVEEND_RED_CARD 26 -#define MOVEEND_EJECT_PACK 27 -#define MOVEEND_LIFEORB_SHELLBELL 28 // Includes shell bell, throat spray, etc -#define MOVEEND_CHANGED_ITEMS 29 -#define MOVEEND_PICKPOCKET 30 -#define MOVEEND_DANCER 31 -#define MOVEEND_EMERGENCY_EXIT 32 -#define MOVEEND_SYMBIOSIS 33 -#define MOVEEND_OPPORTUNIST 34 // Occurs after other stat change items/abilities to try and copy the boosts -#define MOVEEND_CLEAR_BITS 35 -#define MOVEEND_COUNT 36 +#define MOVEEND_NUM_HITS 16 +#define MOVEEND_SUBSTITUTE 17 +#define MOVEEND_SKY_DROP_CONFUSE 18 +#define MOVEEND_UPDATE_LAST_MOVES 19 +#define MOVEEND_MIRROR_MOVE 20 +#define MOVEEND_NEXT_TARGET 21 // Everything up until here is handled for each strike of a multi-hit move +#define MOVEEND_MULTIHIT_MOVE 22 +#define MOVEEND_DEFROST 23 +#define MOVEEND_RECOIL 24 +#define MOVEEND_MAGICIAN 25 // Occurs after final multi-hit strike, and after other items/abilities would activate +#define MOVEEND_EJECT_BUTTON 26 +#define MOVEEND_RED_CARD 27 +#define MOVEEND_EJECT_PACK 28 +#define MOVEEND_LIFEORB_SHELLBELL 29 // Includes shell bell, throat spray, etc +#define MOVEEND_CHANGED_ITEMS 30 +#define MOVEEND_PICKPOCKET 31 +#define MOVEEND_DANCER 32 +#define MOVEEND_EMERGENCY_EXIT 33 +#define MOVEEND_SYMBIOSIS 34 +#define MOVEEND_OPPORTUNIST 35 // Occurs after other stat change items/abilities to try and copy the boosts +#define MOVEEND_CLEAR_BITS 36 +#define MOVEEND_COUNT 37 // switch cases #define B_SWITCH_NORMAL 0 diff --git a/include/pokemon.h b/include/pokemon.h index 84a6025aa4..6c3df51a75 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -632,7 +632,6 @@ u8 GetNature(struct Pokemon *mon); u8 GetNatureFromPersonality(u32 personality); u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem, struct Pokemon *tradePartner); bool8 IsMonPastEvolutionLevel(struct Pokemon *mon); -u16 HoennPokedexNumToSpecies(u16 hoennNum); u16 NationalPokedexNumToSpecies(u16 nationalNum); u16 NationalToHoennOrder(u16 nationalNum); u16 SpeciesToNationalPokedexNum(u16 species); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2254c9f7de..ce885ec3ef 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2001,7 +2001,10 @@ static void Cmd_adjustdamage(void) if (DoesSubstituteBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove)) goto END; if (DoesDisguiseBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove)) + { + gBattleStruct->enduredDamage |= gBitTable[gBattlerTarget]; goto END; + } if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage) goto END; @@ -2043,6 +2046,7 @@ static void Cmd_adjustdamage(void) // Handle reducing the dmg to 1 hp. gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1; + gBattleStruct->enduredDamage |= gBitTable[gBattlerTarget]; if (gProtectStructs[gBattlerTarget].endured) { @@ -5545,6 +5549,16 @@ static void Cmd_moveend(void) } gBattleScripting.moveendState++; break; + case MOVEEND_NUM_HITS: + if (gBattlerAttacker != gBattlerTarget + && gBattleMoves[gCurrentMove].split != SPLIT_STATUS + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && TARGET_TURN_DAMAGED) + { + gBattleStruct->timesGotHit[GetBattlerSide(gBattlerTarget)][gBattlerPartyIndexes[gBattlerTarget]]++; + } + gBattleScripting.moveendState++; + break; case MOVEEND_SUBSTITUTE: // update substitute for (i = 0; i < gBattlersCount; i++) { @@ -6060,6 +6074,7 @@ static void Cmd_moveend(void) gBattleStruct->zmove.effect = EFFECT_HIT; gBattleStruct->hitSwitchTargetFailed = FALSE; gBattleStruct->isAtkCancelerForCalledMove = FALSE; + gBattleStruct->enduredDamage = 0; gBattleScripting.moveendState++; break; case MOVEEND_COUNT: @@ -9509,25 +9524,6 @@ static void Cmd_various(void) } return; } - case VARIOUS_TRY_COPYCAT: - { - VARIOUS_ARGS(const u8 *failInstr); - if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gBattleMoves[gLastUsedMove].copycatBanned) - { - gBattlescriptCurrInstr = cmd->failInstr; - } - else - { - if (IsMaxMove(gLastUsedMove)) - gCalledMove = gBattleStruct->dynamax.lastUsedBaseMove; - else - gCalledMove = gLastUsedMove; - gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; - gBattlerTarget = GetMoveTarget(gCalledMove, NO_TARGET_OVERRIDE); - gBattlescriptCurrInstr = cmd->nextInstr; - } - return; - } case VARIOUS_TRY_INSTRUCT: { VARIOUS_ARGS(const u8 *failInstr); @@ -12279,6 +12275,7 @@ static void Cmd_transformdataexecution(void) { s32 i; u8 *battleMonAttacker, *battleMonTarget; + u8 timesGotHit; gBattleMons[gBattlerAttacker].status2 |= STATUS2_TRANSFORMED; gDisableStructs[gBattlerAttacker].disabledMove = MOVE_NONE; @@ -12288,6 +12285,9 @@ static void Cmd_transformdataexecution(void) gDisableStructs[gBattlerAttacker].mimickedMoves = 0; gDisableStructs[gBattlerAttacker].usedMoves = 0; + timesGotHit = gBattleStruct->timesGotHit[GetBattlerSide(gBattlerTarget)][gBattlerPartyIndexes[gBattlerTarget]]; + gBattleStruct->timesGotHit[GetBattlerSide(gBattlerAttacker)][gBattlerPartyIndexes[gBattlerAttacker]] = timesGotHit; + PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species) battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]); @@ -16447,3 +16447,24 @@ void BS_TryHealPulse(void) gBattlescriptCurrInstr = cmd->nextInstr; } } + +void BS_TryCopycat(void) +{ + NATIVE_ARGS(const u8 *failInstr); + + if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gBattleMoves[gLastUsedMove].copycatBanned) + { + gBattlescriptCurrInstr = cmd->failInstr; + } + else + { + if (IsMaxMove(gLastUsedMove)) + gCalledMove = gBattleStruct->dynamax.lastUsedBaseMove; + else + gCalledMove = gLastUsedMove; + + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; + gBattlerTarget = GetMoveTarget(gCalledMove, NO_TARGET_OVERRIDE); + gBattlescriptCurrInstr = cmd->nextInstr; + } +} diff --git a/src/battle_util.c b/src/battle_util.c index 9f15e3819e..2d89aa100d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8853,6 +8853,10 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 case EFFECT_MAX_MOVE: basePower = GetMaxMovePower(gBattleMons[battlerAtk].moves[gBattleStruct->chosenMovePositions[battlerAtk]]); break; + case EFFECT_RAGE_FIST: + basePower += 50 * gBattleStruct->timesGotHit[GetBattlerSide(battlerAtk)][gBattlerPartyIndexes[battlerAtk]]; + basePower = (basePower > 350) ? 350 : basePower; + break; } // Move-specific base power changes diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 078f32f5ac..3820b24fe6 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -14135,7 +14135,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { - .effect = EFFECT_PLACEHOLDER, // EFFECT_RAGE_FIST + .effect = EFFECT_RAGE_FIST, .power = 50, .type = TYPE_GHOST, .accuracy = 100, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 8c08f50885..8468d7669c 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -209,7 +209,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 45, .expYield = 64, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -257,7 +257,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 45, .expYield = 142, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -298,7 +298,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define VENUSAUR_MISC_INFO \ .types = { TYPE_GRASS, TYPE_POISON }, \ .catchRate = 45, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .evYield_SpDefense = 1, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -484,8 +484,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 142, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -524,7 +524,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define CHARIZARD_MISC_INFO \ .catchRate = 45, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -698,7 +698,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 63, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -746,7 +746,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 142, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -921,7 +921,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 255, .expYield = 39, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -969,7 +969,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 120, .expYield = 72, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -1016,7 +1016,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, \ .catchRate = 45, \ .expYield = 178, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .evYield_SpDefense = 1, \ .itemRare = ITEM_SILVER_POWDER, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -1102,7 +1102,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 255, .expYield = 39, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -1151,7 +1151,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 120, .expYield = 72, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -1194,7 +1194,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define BEEDRILL_MISC_INFO \ .types = { TYPE_BUG, TYPE_POISON }, \ .catchRate = 45, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .evYield_SpDefense = 1, \ .itemRare = ITEM_POISON_BARB, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -1297,7 +1297,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 50, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -1345,7 +1345,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 120, .expYield = 122, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -1388,7 +1388,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define PIDGEOT_MISC_INFO \ .types = { TYPE_NORMAL, TYPE_FLYING }, \ .catchRate = 45, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -1493,7 +1493,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 35, \ .catchRate = 255, \ .expYield = 51, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .speciesName = _("Rattata"), \ .cryId = CRY_RATTATA, \ .natDexNum = NATIONAL_DEX_RATTATA, \ @@ -1504,7 +1504,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define RATICATE_MISC_INFO \ .catchRate = 127, \ .expYield = 145, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .speciesName = _("Raticate"), \ .cryId = CRY_RATICATE, \ .natDexNum = NATIONAL_DEX_RATICATE, \ @@ -1668,7 +1668,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 52, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -1717,7 +1717,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 90, .expYield = 155, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -1769,7 +1769,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 255, .expYield = 58, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -1818,7 +1818,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 90, .expYield = 157, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -1867,7 +1867,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, \ .catchRate = 190, \ .expYield = 41, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 10, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -1931,7 +1931,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, \ .catchRate = 190, \ .expYield = 112, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .itemRare = ITEM_LIGHT_BALL, \ .eggCycles = 10, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -2274,7 +2274,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define RAICHU_MISC_INFO \ .catchRate = 75, \ .expYield = 218, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 10, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -2375,7 +2375,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SANDSHREW_MISC_INFO \ .catchRate = 255, \ .expYield = 60, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .speciesName = _("Sandshrew"), \ .cryId = CRY_SANDSHREW, \ .natDexNum = NATIONAL_DEX_SANDSHREW, \ @@ -2387,7 +2387,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SANDSLASH_MISC_INFO \ .catchRate = 90, \ .expYield = 158, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .speciesName = _("Sandslash"), \ .cryId = CRY_SANDSLASH, \ .natDexNum = NATIONAL_DEX_SANDSLASH, \ @@ -2555,7 +2555,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 235, .expYield = 55, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2604,7 +2604,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 120, .expYield = 128, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2652,7 +2652,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_GROUND }, .catchRate = 45, .expYield = 227, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2699,7 +2699,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 235, .expYield = 55, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2747,7 +2747,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 120, .expYield = 128, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2795,7 +2795,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_GROUND }, .catchRate = 45, .expYield = 227, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2903,7 +2903,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = CLEFAIRY_FAMILY_TYPES, .catchRate = 150, .expYield = 113, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -2953,7 +2953,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = CLEFAIRY_FAMILY_TYPES, .catchRate = 25, .expYield = 217, - .evYield_HP = 3, + .evYield_HP = 3, .itemRare = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -3009,7 +3009,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 65, \ .catchRate = 190, \ .expYield = 60, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .speciesName = _("Vulpix"), \ .cryId = CRY_VULPIX, \ .natDexNum = NATIONAL_DEX_VULPIX, \ @@ -3027,7 +3027,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define NINETALES_MISC_INFO \ .catchRate = 75, \ .expYield = 177, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .evYield_SpDefense = 1, \ .speciesName = _("Ninetales"), \ .cryId = CRY_NINETALES, \ @@ -3177,7 +3177,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = JIGGLYPUFF_FAMILY_TYPES, .catchRate = 170, .expYield = 42, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -3227,7 +3227,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = JIGGLYPUFF_FAMILY_TYPES, .catchRate = 170, .expYield = 95, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -3277,7 +3277,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = JIGGLYPUFF_FAMILY_TYPES, .catchRate = 50, .expYield = 196, - .evYield_HP = 3, + .evYield_HP = 3, .itemRare = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -3328,7 +3328,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FLYING }, .catchRate = 255, .expYield = 49, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -3379,7 +3379,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FLYING }, .catchRate = 90, .expYield = 159, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -3431,7 +3431,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FLYING }, .catchRate = 90, .expYield = 241, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -3482,7 +3482,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 255, .expYield = 64, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -3531,7 +3531,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 120, .expYield = 138, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -3583,7 +3583,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 45, .expYield = 221, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemRare = ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -3685,7 +3685,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GRASS }, .catchRate = 190, .expYield = 57, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -3736,8 +3736,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GRASS }, .catchRate = 75, .expYield = 142, - .evYield_Attack = 2, - .evYield_Defense = 1, + .evYield_Attack = 2, + .evYield_Defense = 1, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -3838,8 +3838,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 75, .expYield = 158, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -3891,7 +3891,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define DIGLETT_MISC_INFO \ .catchRate = 255, \ .expYield = 53, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .speciesName = _("Diglett"), \ .cryId = CRY_DIGLETT, \ .natDexNum = NATIONAL_DEX_DIGLETT, \ @@ -3908,7 +3908,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define DUGTRIO_MISC_INFO \ .catchRate = 50, \ .expYield = 149, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .speciesName = _("Dugtrio"), \ .cryId = CRY_DUGTRIO, \ .natDexNum = NATIONAL_DEX_DUGTRIO, \ @@ -4067,7 +4067,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define PERSIAN_MISC_INFO \ .catchRate = 90, \ .expYield = 154, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .itemRare = ITEM_QUICK_CLAW, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -4090,7 +4090,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 90, .baseSpAttack = 40, .baseSpDefense = 40, - .evYield_Speed = 1, + .evYield_Speed = 1, .types = { TYPE_NORMAL, TYPE_NORMAL }, .itemRare = ITEM_QUICK_CLAW, .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, @@ -4167,7 +4167,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 90, .baseSpAttack = 50, .baseSpDefense = 40, - .evYield_Speed = 1, + .evYield_Speed = 1, .types = { TYPE_DARK, TYPE_DARK }, .itemRare = ITEM_QUICK_CLAW, .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_RATTLED }, @@ -4244,7 +4244,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 40, .baseSpAttack = 40, .baseSpDefense = 40, - .evYield_Attack = 1, + .evYield_Attack = 1, .types = { TYPE_STEEL, TYPE_STEEL }, .abilities = { ABILITY_PICKUP, ABILITY_TOUGH_CLAWS, ABILITY_UNNERVE }, .bodyColor = BODY_COLOR_BROWN, @@ -4284,7 +4284,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 90, .expYield = 154, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4330,7 +4330,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 90, .baseSpAttack = 40, .baseSpDefense = 40, - .evYield_Speed = 1, + .evYield_Speed = 1, .types = { TYPE_NORMAL, TYPE_NORMAL }, .itemRare = ITEM_QUICK_CLAW, .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, @@ -4371,7 +4371,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 64, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4419,7 +4419,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 175, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4468,7 +4468,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 190, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4517,7 +4517,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 75, .expYield = 159, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4616,7 +4616,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GROWLITHE_MISC_INFO \ .catchRate = 190, \ .expYield = 70, \ - .evYield_Attack = 1, \ + .evYield_Attack = 1, \ .speciesName = _("Growlithe"), \ .cryId = CRY_GROWLITHE, \ .natDexNum = NATIONAL_DEX_GROWLITHE, \ @@ -4627,7 +4627,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ARCANINE_MISC_INFO \ .catchRate = 75, \ .expYield = 194, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .speciesName = _("Arcanine"), \ .cryId = CRY_ARCANINE, \ .natDexNum = NATIONAL_DEX_ARCANINE, \ @@ -4795,7 +4795,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 60, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4844,7 +4844,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 120, .expYield = 135, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -4897,7 +4897,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FIGHTING }, .catchRate = 45, .expYield = 230, - .evYield_Defense = 3, + .evYield_Defense = 3, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -5002,7 +5002,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 200, .expYield = 62, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -5051,7 +5051,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 100, .expYield = 140, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -5098,7 +5098,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ALAKAZAM_MISC_INFO \ .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, \ .catchRate = 50, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .itemRare = ITEM_TWISTED_SPOON, \ .genderRatio = PERCENT_FEMALE(25), \ .eggCycles = 20, \ @@ -5200,7 +5200,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 180, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -5249,7 +5249,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 90, .expYield = 142, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -5299,7 +5299,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, \ .catchRate = 45, \ .expYield = 227, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .itemRare = ITEM_FOCUS_BAND, \ .genderRatio = PERCENT_FEMALE(25), \ .eggCycles = 20, \ @@ -5380,7 +5380,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 255, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -5428,7 +5428,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 120, .expYield = 137, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -5477,7 +5477,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 45, .expYield = 221, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -5636,7 +5636,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 30, \ .catchRate = 255, \ .expYield = 60, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .speciesName = _("Geodude"), \ .cryId = CRY_GEODUDE, \ .natDexNum = NATIONAL_DEX_GEODUDE, \ @@ -5659,7 +5659,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 45, \ .catchRate = 120, \ .expYield = 137, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .speciesName = _("Graveler"), \ .cryId = CRY_GRAVELER, \ .natDexNum = NATIONAL_DEX_GRAVELER, \ @@ -5684,7 +5684,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 65, \ .catchRate = 45, \ .expYield = 223, \ - .evYield_Defense = 3, \ + .evYield_Defense = 3, \ .speciesName = _("Golem"), \ .cryId = CRY_GOLEM, \ .natDexNum = NATIONAL_DEX_GOLEM, \ @@ -5876,7 +5876,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 65, \ .catchRate = 190, \ .expYield = 82, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .speciesName = _("Ponyta"), \ .cryId = CRY_PONYTA, \ .natDexNum = NATIONAL_DEX_PONYTA, \ @@ -5893,7 +5893,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 80, \ .catchRate = 60, \ .expYield = 175, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .speciesName = _("Rapidash"), \ .cryId = CRY_RAPIDASH, \ .natDexNum = NATIONAL_DEX_RAPIDASH, \ @@ -6031,7 +6031,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 40, \ .catchRate = 190, \ .expYield = 63, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -6120,7 +6120,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 80, .types = { TYPE_WATER, TYPE_PSYCHIC }, .expYield = 172, - .evYield_Defense = 2, + .evYield_Defense = 2, .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .height = 16, .weight = 785, @@ -6196,7 +6196,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 80, .types = { TYPE_WATER, TYPE_PSYCHIC }, .expYield = 207, - .evYield_Defense = 2, + .evYield_Defense = 2, .abilities = { ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR }, .height = 20, .weight = 1200, @@ -6262,7 +6262,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 70, .types = { TYPE_POISON, TYPE_PSYCHIC }, .expYield = 172, - .evYield_Attack = 2, + .evYield_Attack = 2, .abilities = { ABILITY_QUICK_DRAW, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .height = 16, .weight = 705, @@ -6340,7 +6340,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_STEEL }, .catchRate = 190, .expYield = 65, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, @@ -6390,7 +6390,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_STEEL }, .catchRate = 60, .expYield = 163, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, @@ -6442,7 +6442,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_STEEL }, .catchRate = 30, .expYield = 241, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, @@ -6488,7 +6488,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define FARFETCHD_MISC_INFO \ .catchRate = 45, \ .expYield = 132, \ - .evYield_Attack = 1, \ + .evYield_Attack = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -6586,7 +6586,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_LEEK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -6637,7 +6637,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 190, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -6688,7 +6688,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 45, .expYield = 165, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -6843,7 +6843,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 50, \ .catchRate = 190, \ .expYield = 65, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .speciesName = _("Grimer"), \ .cryId = CRY_GRIMER, \ .natDexNum = NATIONAL_DEX_GRIMER, \ @@ -6861,8 +6861,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 100, \ .catchRate = 75, \ .expYield = 175, \ - .evYield_HP = 1, \ - .evYield_Attack = 1, \ + .evYield_HP = 1, \ + .evYield_Attack = 1, \ .speciesName = _("Muk"), \ .cryId = CRY_MUK, \ .natDexNum = NATIONAL_DEX_MUK, \ @@ -7009,7 +7009,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 61, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemCommon = ITEM_PEARL, .itemRare = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), @@ -7060,7 +7060,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ICE }, .catchRate = 60, .expYield = 184, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemCommon = ITEM_PEARL, .itemRare = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), @@ -7111,7 +7111,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_POISON }, .catchRate = 190, .expYield = 62, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -7160,7 +7160,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_POISON }, .catchRate = 90, .expYield = 142, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -7209,7 +7209,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GENGAR_MISC_INFO \ .types = { TYPE_GHOST, TYPE_POISON }, \ .catchRate = 45, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -7339,7 +7339,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_GROUND }, .catchRate = 45, .expYield = 77, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -7381,7 +7381,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define STEELIX_MISC_INFO \ .types = { TYPE_STEEL, TYPE_GROUND }, \ .catchRate = 25, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .itemRare = ITEM_METAL_COAT, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ @@ -7586,7 +7586,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 65, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -7633,7 +7633,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 60, \ .expYield = 166, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -7722,7 +7722,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 55, \ .catchRate = 190, \ .expYield = 66, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .speciesName = _("Voltorb"), \ .cryId = CRY_VOLTORB, \ .natDexNum = NATIONAL_DEX_VOLTORB, \ @@ -7744,7 +7744,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ .catchRate = 60, \ .expYield = 172, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .speciesName = _("Electrode"), \ .cryId = CRY_ELECTRODE, \ .natDexNum = NATIONAL_DEX_ELECTRODE, \ @@ -7868,7 +7868,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_PSYCHIC }, .catchRate = 90, .expYield = 65, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_PSYCHIC_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -7910,7 +7910,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define EXEGGUTOR_MISC_INFO \ .catchRate = 45, \ .expYield = 186, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -8010,7 +8010,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 190, .expYield = 64, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_THICK_CLUB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -8059,7 +8059,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 80, \ .catchRate = 75, \ .expYield = 149, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .itemRare = ITEM_THICK_CLUB, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -8143,7 +8143,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 75, .expYield = 42, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = MON_MALE, .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -8194,7 +8194,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 159, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = MON_MALE, .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -8339,7 +8339,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 77, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -8389,7 +8389,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 30, .expYield = 180, - .evYield_HP = 3, + .evYield_HP = 3, .itemRare = ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -8440,7 +8440,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 190, .expYield = 68, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -8493,7 +8493,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 70, \ .catchRate = 60, \ .expYield = 172, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -8589,7 +8589,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_ROCK }, .catchRate = 120, .expYield = 69, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -8639,7 +8639,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_ROCK }, .catchRate = 60, .expYield = 170, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -8691,7 +8691,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_ROCK }, .catchRate = 30, .expYield = 241, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -8744,7 +8744,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 130, .expYield = 110, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_OVAL_STONE, .genderRatio = MON_FEMALE, .eggCycles = 40, @@ -8795,7 +8795,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 30, .expYield = 395, - .evYield_HP = 2, + .evYield_HP = 2, .itemCommon = ITEM_LUCKY_PUNCH, .genderRatio = MON_FEMALE, .eggCycles = 40, @@ -8845,7 +8845,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 30, .expYield = 608, - .evYield_HP = 3, + .evYield_HP = 3, .itemRare = ITEM_LUCKY_EGG, .genderRatio = MON_FEMALE, .eggCycles = 40, @@ -8896,7 +8896,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 87, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -8945,7 +8945,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 30, .expYield = 187, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -8988,7 +8988,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define KANGASKHAN_MISC_INFO \ .types = { TYPE_NORMAL, TYPE_NORMAL }, \ .catchRate = 45, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .genderRatio = MON_FEMALE, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -9082,7 +9082,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 59, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -9131,8 +9131,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 154, - .evYield_Defense = 1, - .evYield_SpAttack = 1, + .evYield_Defense = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -9183,8 +9183,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_DRAGON }, .catchRate = 45, .expYield = 243, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), @@ -9236,7 +9236,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 64, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -9287,7 +9287,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 60, .expYield = 158, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -9339,7 +9339,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 68, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemCommon = ITEM_STARDUST, .itemRare = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, @@ -9390,7 +9390,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_PSYCHIC }, .catchRate = 60, .expYield = 182, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemCommon = ITEM_STARDUST, .itemRare = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, @@ -9551,7 +9551,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 90, .baseSpDefense = 90, .types = { TYPE_ICE, TYPE_PSYCHIC }, - .evYield_Speed = 2, + .evYield_Speed = 2, .abilities = { ABILITY_VITAL_SPIRIT, ABILITY_SCREEN_CLEANER, ABILITY_ICE_BODY }, .bodyColor = BODY_COLOR_WHITE, .categoryName = _("Dancing"), @@ -9591,7 +9591,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 182, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -9640,7 +9640,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 45, .expYield = 100, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -9685,7 +9685,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SCIZOR_MISC_INFO \ .types = { TYPE_BUG, TYPE_STEEL }, \ .catchRate = 25, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -9786,7 +9786,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ROCK }, .catchRate = 15, .expYield = 175, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -9837,7 +9837,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 61, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = MON_FEMALE, .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -9887,7 +9887,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 159, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_FEMALE, .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -9937,7 +9937,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 72, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -9988,7 +9988,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 172, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -10040,7 +10040,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 30, .expYield = 243, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemRare = ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -10092,7 +10092,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 73, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -10143,7 +10143,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 173, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -10194,7 +10194,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 30, .expYield = 243, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemRare = ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, @@ -10237,7 +10237,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #if P_FAMILY_PINSIR #define PINSIR_MISC_INFO \ .catchRate = 45, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -10358,8 +10358,8 @@ const struct SpeciesInfo gSpeciesInfo[] = { TAUROS_MISC_INFO, .types = { TYPE_NORMAL, TYPE_NORMAL }, - .evYield_Attack = 1, - .evYield_Speed = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_BROWN, .weight = 884, @@ -10386,7 +10386,7 @@ const struct SpeciesInfo gSpeciesInfo[] = { TAUROS_MISC_INFO, .types = { TYPE_FIGHTING, TYPE_FIGHTING }, - .evYield_Attack = 2, + .evYield_Attack = 2, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .bodyColor = BODY_COLOR_BROWN, .weight = 1150, @@ -10412,7 +10412,7 @@ const struct SpeciesInfo gSpeciesInfo[] = { TAUROS_MISC_INFO, .types = { TYPE_FIGHTING, TYPE_FIRE }, - .evYield_Attack = 2, + .evYield_Attack = 2, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .bodyColor = BODY_COLOR_BROWN, .weight = 850, @@ -10438,7 +10438,7 @@ const struct SpeciesInfo gSpeciesInfo[] = { TAUROS_MISC_INFO, .types = { TYPE_FIGHTING, TYPE_WATER }, - .evYield_Attack = 2, + .evYield_Attack = 2, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .bodyColor = BODY_COLOR_BROWN, .weight = 1100, @@ -10474,7 +10474,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 40, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, @@ -10515,7 +10515,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GYARADOS_MISC_INFO \ .catchRate = 45, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 5, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -10613,7 +10613,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ICE }, \ .catchRate = 45, \ .expYield = 187, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .itemCommon = ITEM_MYSTIC_WATER, \ .itemRare = ITEM_MYSTIC_WATER, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -10695,7 +10695,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 35, .expYield = 101, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_QUICK_POWDER, .itemRare = ITEM_METAL_POWDER, .genderRatio = MON_GENDERLESS, @@ -10835,7 +10835,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 184, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -10882,7 +10882,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 184, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -10929,7 +10929,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 184, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -10977,7 +10977,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 184, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -11073,7 +11073,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 184, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 35, @@ -11120,7 +11120,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 45, .expYield = 184, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 35, @@ -11220,7 +11220,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 79, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -11270,7 +11270,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 180, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -11321,7 +11321,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 30, .expYield = 241, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -11373,7 +11373,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 45, .expYield = 71, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -11421,7 +11421,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 45, .expYield = 173, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -11470,7 +11470,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 45, .expYield = 71, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -11518,7 +11518,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 45, .expYield = 173, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -11559,7 +11559,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define AERODACTYL_MISC_INFO \ .types = { TYPE_ROCK, TYPE_FLYING }, \ .catchRate = 45, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 35, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -11660,7 +11660,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 50, .expYield = 78, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_LEFTOVERS, .itemRare = ITEM_LEFTOVERS, .genderRatio = PERCENT_FEMALE(12.5), @@ -11710,7 +11710,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, \ .catchRate = 25, \ .expYield = 189, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .itemCommon = ITEM_LEFTOVERS, \ .itemRare = ITEM_LEFTOVERS, \ .genderRatio = PERCENT_FEMALE(12.5), \ @@ -11845,7 +11845,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 100, .types = { TYPE_PSYCHIC, TYPE_FLYING }, .expYield = 290, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .eggCycles = 120, .abilities = { ABILITY_COMPETITIVE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, @@ -11902,7 +11902,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 90, .types = { TYPE_ELECTRIC, TYPE_FLYING }, .expYield = 261, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .eggCycles = 80, #if P_UPDATED_ABILITIES >= GEN_6 .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_STATIC }, @@ -11941,7 +11941,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 90, .types = { TYPE_FIGHTING, TYPE_FLYING }, .expYield = 290, - .evYield_Attack = 3, + .evYield_Attack = 3, .eggCycles = 120, .abilities = { ABILITY_DEFIANT, ABILITY_NONE, ABILITY_NONE }, .categoryName = _("Strong Legs"), @@ -11996,7 +11996,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 85, .types = { TYPE_FIRE, TYPE_FLYING }, .expYield = 261, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .eggCycles = 80, .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_FLAME_BODY }, .bodyColor = BODY_COLOR_YELLOW, @@ -12069,7 +12069,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -12118,7 +12118,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 147, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -12167,7 +12167,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_FLYING }, .catchRate = 45, .expYield = 270, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemRare = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -12208,7 +12208,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #if P_FAMILY_MEWTWO #define SPECIES_MEWTWO_MISC_INFO \ .catchRate = 3, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -12347,7 +12347,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 270, - .evYield_HP = 3, + .evYield_HP = 3, .itemCommon = ITEM_LUM_BERRY, .itemRare = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, @@ -12448,7 +12448,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 142, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -12497,7 +12497,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 236, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -12549,7 +12549,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -12597,8 +12597,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 142, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -12639,7 +12639,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define TYPHLOSION_MISC_INFO \ .catchRate = 45, \ .expYield = 240, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -12739,7 +12739,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 63, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -12787,8 +12787,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 142, - .evYield_Attack = 1, - .evYield_Defense = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -12837,8 +12837,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 239, - .evYield_Attack = 2, - .evYield_Defense = 1, + .evYield_Attack = 2, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -12888,7 +12888,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 43, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -12936,7 +12936,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 90, .expYield = 145, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -12985,7 +12985,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 52, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -13033,7 +13033,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 90, .expYield = 158, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -13184,7 +13184,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 255, .expYield = 50, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -13232,7 +13232,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 90, .expYield = 140, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -13281,7 +13281,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ELECTRIC }, .catchRate = 190, .expYield = 66, - .evYield_HP = 1, + .evYield_HP = 1, .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -13330,7 +13330,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ELECTRIC }, .catchRate = 75, .expYield = 161, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -13483,7 +13483,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 30, .expYield = 245, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 10, @@ -13536,7 +13536,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FLYING }, .catchRate = 190, .expYield = 64, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -13585,8 +13585,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FLYING }, .catchRate = 75, .expYield = 165, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -13636,7 +13636,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 235, .expYield = 56, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -13685,7 +13685,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 120, .expYield = 128, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -13724,7 +13724,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define AMPHAROS_MISC_INFO \ .catchRate = 45, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -13827,7 +13827,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 150, .expYield = 38, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -13880,7 +13880,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 190, .expYield = 88, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -13932,7 +13932,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 75, .expYield = 189, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -13982,7 +13982,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 255, .expYield = 58, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14031,7 +14031,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 65, .expYield = 144, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14131,7 +14131,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FLYING }, .catchRate = 120, .expYield = 119, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14180,7 +14180,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FLYING }, .catchRate = 45, .expYield = 207, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14230,7 +14230,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 72, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14281,7 +14281,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 169, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 100, @@ -14333,7 +14333,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 235, .expYield = 36, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14381,7 +14381,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 120, .expYield = 149, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14430,7 +14430,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 75, .expYield = 78, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -14481,7 +14481,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 30, .expYield = 180, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -14531,7 +14531,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 25, \ .catchRate = 255, \ .expYield = 42, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -14587,7 +14587,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 90, .expYield = 151, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -14714,7 +14714,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FLYING }, .catchRate = 30, .expYield = 81, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -14766,7 +14766,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FLYING }, .catchRate = 30, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -14866,7 +14866,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 45, .expYield = 173, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -14917,8 +14917,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, \ .catchRate = 225, \ .expYield = 118, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 40, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -15204,7 +15204,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 125, .expYield = 52, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15254,7 +15254,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 142, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15308,7 +15308,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_PSYCHIC }, .catchRate = 60, .expYield = 159, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15409,7 +15409,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 190, .expYield = 58, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15457,7 +15457,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_STEEL }, .catchRate = 75, .expYield = 163, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15506,7 +15506,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 190, .expYield = 145, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15620,7 +15620,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_FLYING }, .catchRate = 60, .expYield = 86, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15673,7 +15673,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_FLYING }, .catchRate = 30, .expYield = 179, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15728,7 +15728,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 190, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15780,7 +15780,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #endif .catchRate = 75, .expYield = 158, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15827,7 +15827,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 55, \ .catchRate = 45, \ .expYield = 88, \ - .evYield_Attack = 1, \ + .evYield_Attack = 1, \ .itemRare = ITEM_POISON_BARB, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -15908,7 +15908,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_POISON }, .catchRate = 45, .expYield = 179, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -15958,7 +15958,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ROCK }, .catchRate = 190, .expYield = 177, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .itemCommon = ITEM_BERRY_JUICE, .itemRare = ITEM_BERRY_JUICE, @@ -16002,7 +16002,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define HERACROSS_MISC_INFO \ .types = { TYPE_BUG, TYPE_FIGHTING }, \ .catchRate = 45, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -16101,7 +16101,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 75, \ .catchRate = 60, \ .expYield = 86, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .itemRare = ITEM_QUICK_CLAW, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -16161,8 +16161,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_ICE }, .catchRate = 45, .expYield = 179, - .evYield_Attack = 1, - .evYield_Speed = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -16243,7 +16243,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_POISON }, .catchRate = 20, .expYield = 102, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16293,7 +16293,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 120, .expYield = 66, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16342,7 +16342,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 60, .expYield = 175, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16407,7 +16407,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 45, .baseSpDefense = 80, .catchRate = 20, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .abilities = { ABILITY_GUTS, ABILITY_BULLETPROOF, ABILITY_UNNERVE }, .height = 24, @@ -16443,7 +16443,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 135, .baseSpDefense = 65, .catchRate = 5, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_MALE, .abilities = { ABILITY_MINDS_EYE, ABILITY_NONE }, .height = 27, @@ -16481,7 +16481,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 190, .expYield = 50, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16529,7 +16529,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_ROCK }, .catchRate = 75, .expYield = 151, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16579,7 +16579,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_GROUND }, .catchRate = 225, .expYield = 50, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16627,8 +16627,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_GROUND }, .catchRate = 75, .expYield = 158, - .evYield_HP = 1, - .evYield_Attack = 1, + .evYield_HP = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16679,7 +16679,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_GROUND }, .catchRate = 50, .expYield = 239, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16753,7 +16753,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 65, .baseSpDefense = CORSOLA_DEFENSES, .types = { TYPE_WATER, TYPE_ROCK }, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_LUMINOUS_MOSS, .abilities = { ABILITY_HUSTLE, ABILITY_NATURAL_CURE, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, @@ -16819,7 +16819,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 30, .expYield = 179, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16869,7 +16869,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 60, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16917,8 +16917,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 168, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -16970,7 +16970,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_FLYING }, .catchRate = 45, .expYield = 116, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17119,7 +17119,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_FLYING }, .catchRate = 25, .expYield = 163, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -17169,7 +17169,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FIRE }, .catchRate = 120, .expYield = 66, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -17209,7 +17209,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define HOUNDOOM_MISC_INFO \ .types = { TYPE_DARK, TYPE_FIRE }, \ .catchRate = 45, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = 35, \ @@ -17309,7 +17309,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 120, .expYield = 66, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17357,8 +17357,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 60, .expYield = 175, - .evYield_Attack = 1, - .evYield_Defense = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17409,7 +17409,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 163, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17458,8 +17458,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 263, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17509,7 +17509,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 88, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -17558,7 +17558,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 172, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemCommon = ITEM_MOOMOO_MILK, .itemRare = ITEM_MOOMOO_MILK, .genderRatio = MON_FEMALE, @@ -17609,8 +17609,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 3, .expYield = 261, - .evYield_Speed = 2, - .evYield_SpAttack = 1, + .evYield_Speed = 2, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, @@ -17664,8 +17664,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 3, .expYield = 261, - .evYield_HP = 1, - .evYield_Attack = 2, + .evYield_HP = 1, + .evYield_Attack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, @@ -17719,7 +17719,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 3, .expYield = 261, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 80, @@ -17774,7 +17774,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_GROUND }, .catchRate = 45, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -17822,7 +17822,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_GROUND }, .catchRate = 45, .expYield = 144, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -17862,7 +17862,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define TYRANITAR_MISC_INFO \ .types = { TYPE_ROCK, TYPE_DARK }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 40, \ .friendship = 35, \ @@ -18067,7 +18067,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_GRASS }, .catchRate = 45, .expYield = 270, - .evYield_HP = 3, + .evYield_HP = 3, .itemCommon = ITEM_LUM_BERRY, .itemRare = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, @@ -18120,7 +18120,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18168,7 +18168,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 142, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18207,7 +18207,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SCEPTILE_MISC_INFO \ .catchRate = 45, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -18308,7 +18308,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18357,8 +18357,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIGHTING }, .catchRate = 45, .expYield = 142, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18400,7 +18400,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define BLAZIKEN_MISC_INFO \ .types = { TYPE_FIRE, TYPE_FIGHTING }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -18495,7 +18495,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18543,7 +18543,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 45, .expYield = 142, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -18583,7 +18583,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SWAMPERT_MISC_INFO \ .types = { TYPE_WATER, TYPE_GROUND }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -18682,7 +18682,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DARK }, .catchRate = 255, .expYield = 56, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -18730,7 +18730,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DARK }, .catchRate = 127, .expYield = 147, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -18777,7 +18777,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 41, \ .catchRate = 255, \ .expYield = 56, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -18806,7 +18806,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 61, \ .catchRate = 90, \ .expYield = 147, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -18934,7 +18934,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_NORMAL }, .catchRate = 45, .expYield = 260, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -18984,7 +18984,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 255, .expYield = 56, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_PECHA_BERRY, .itemRare = ITEM_BRIGHT_POWDER, .genderRatio = PERCENT_FEMALE(50), @@ -19035,7 +19035,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 120, .expYield = 72, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -19083,7 +19083,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 45, .expYield = 178, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemRare = ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -19134,7 +19134,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 120, .expYield = 72, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -19385,7 +19385,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 255, .expYield = 44, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -19434,7 +19434,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DARK }, .catchRate = 120, .expYield = 119, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -19485,7 +19485,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DARK }, .catchRate = 45, .expYield = 216, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemRare = ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -19541,7 +19541,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 200, .expYield = 54, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -19589,7 +19589,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 45, .expYield = 159, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -19638,7 +19638,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FLYING }, .catchRate = 190, .expYield = 54, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemCommon = ITEM_PRETTY_FEATHER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -19688,7 +19688,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FLYING }, .catchRate = 45, .expYield = 154, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemCommon = ITEM_PRETTY_FEATHER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -19747,7 +19747,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, RALTS_FAMILY_TYPE2 }, .catchRate = 235, .expYield = 40, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -19795,7 +19795,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, RALTS_FAMILY_TYPE2 }, .catchRate = 120, .expYield = 97, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -19835,7 +19835,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GARDEVOIR_MISC_INFO \ .catchRate = 45, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = 35, \ @@ -19920,7 +19920,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GALLADE_MISC_INFO \ .types = { TYPE_PSYCHIC, TYPE_FIGHTING }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_MALE, \ .eggCycles = 20, \ .friendship = 35, \ @@ -20019,7 +20019,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_WATER }, .catchRate = 200, .expYield = 54, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemCommon = ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -20073,7 +20073,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 75, .expYield = 159, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .itemRare = ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), @@ -20125,7 +20125,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 255, .expYield = 59, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -20175,7 +20175,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FIGHTING }, .catchRate = 90, .expYield = 161, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -20226,7 +20226,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 56, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20274,7 +20274,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 120, .expYield = 154, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20322,7 +20322,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 252, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20371,7 +20371,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GROUND }, .catchRate = 255, .expYield = 53, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -20421,7 +20421,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 120, .expYield = 160, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20469,7 +20469,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GHOST }, .catchRate = 45, .expYield = 83, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20519,7 +20519,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 190, .expYield = 48, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -20567,7 +20567,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 120, .expYield = 126, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -20615,7 +20615,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 221, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -20664,7 +20664,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 180, .expYield = 47, - .evYield_HP = 1, + .evYield_HP = 1, .itemRare = ITEM_BLACK_BELT, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -20713,7 +20713,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 200, .expYield = 166, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, @@ -20763,7 +20763,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 255, .expYield = 75, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -20814,7 +20814,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_STEEL }, .catchRate = 60, .expYield = 184, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 2, .itemRare = ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), @@ -20867,7 +20867,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 52, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20915,8 +20915,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 60, .expYield = 140, - .evYield_HP = 1, - .evYield_Speed = 1, + .evYield_HP = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -20957,8 +20957,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SABLEYE_MISC_INFO \ .types = { TYPE_DARK, TYPE_GHOST }, \ .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ + .evYield_Attack = 1, \ + .evYield_Defense = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = 35, \ @@ -21054,8 +21054,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #define MAWILE_MISC_INFO \ .types = MAWILE_TYPES, \ .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ + .evYield_Attack = 1, \ + .evYield_Defense = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -21155,7 +21155,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_ROCK }, .catchRate = 180, .expYield = 66, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, @@ -21204,7 +21204,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_ROCK }, .catchRate = 90, .expYield = 151, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, @@ -21244,7 +21244,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define AGGRON_MISC_INFO \ .catchRate = 45, \ - .evYield_Defense = 3, \ + .evYield_Defense = 3, \ .itemRare = ITEM_HARD_STONE, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 35, \ @@ -21346,7 +21346,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_PSYCHIC }, .catchRate = 180, .expYield = 56, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -21388,7 +21388,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define MEDICHAM_MISC_INFO \ .types = { TYPE_FIGHTING, TYPE_PSYCHIC }, \ .catchRate = 90, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -21483,7 +21483,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 120, .expYield = 59, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -21523,7 +21523,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define MANECTRIC_MISC_INFO \ .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, \ .catchRate = 45, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -21621,7 +21621,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 200, .expYield = 142, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -21671,7 +21671,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 200, .expYield = 142, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -21726,7 +21726,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 150, .expYield = 151, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_BRIGHT_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, @@ -21779,7 +21779,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 150, .expYield = 151, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_BRIGHT_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, @@ -21830,7 +21830,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 255, .expYield = 56, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -21881,7 +21881,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 150, .expYield = 140, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -21934,7 +21934,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 75, .expYield = 232, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -21988,7 +21988,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 225, .expYield = 60, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_ORAN_BERRY, .itemRare = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), @@ -22040,7 +22040,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 75, .expYield = 163, - .evYield_HP = 2, + .evYield_HP = 2, .itemCommon = ITEM_ORAN_BERRY, .itemRare = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), @@ -22093,7 +22093,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_DARK }, .catchRate = 225, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -22134,7 +22134,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SHARPEDO_MISC_INFO \ .types = { TYPE_WATER, TYPE_DARK }, \ .catchRate = 60, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .itemRare = ITEM_DEEP_SEA_TOOTH, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -22235,7 +22235,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 125, .expYield = 80, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -22283,7 +22283,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 60, .expYield = 175, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -22333,7 +22333,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_GROUND }, .catchRate = 255, .expYield = 61, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -22375,8 +22375,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #define CAMERUPT_MISC_INFO \ .types = { TYPE_FIRE, TYPE_GROUND }, \ .catchRate = 150, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -22477,7 +22477,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 90, .expYield = 165, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -22625,7 +22625,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 126, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -22675,7 +22675,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 255, .expYield = 58, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -22728,8 +22728,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_DRAGON }, .catchRate = 120, .expYield = 119, - .evYield_Attack = 1, - .evYield_Speed = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -22781,8 +22781,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_DRAGON }, .catchRate = 45, .expYield = 234, - .evYield_Attack = 1, - .evYield_Speed = 2, + .evYield_Attack = 1, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -22836,7 +22836,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 190, .expYield = 67, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -22885,8 +22885,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DARK }, .catchRate = 60, .expYield = 166, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -23078,7 +23078,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 90, .expYield = 160, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -23129,8 +23129,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 90, .expYield = 160, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -23181,7 +23181,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 161, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemCommon = ITEM_STARDUST, .itemRare = ITEM_MOON_STONE, .genderRatio = MON_GENDERLESS, @@ -23233,7 +23233,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 161, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemCommon = ITEM_STARDUST, .itemRare = ITEM_SUN_STONE, .genderRatio = MON_GENDERLESS, @@ -23285,7 +23285,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 190, .expYield = 58, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -23334,7 +23334,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 75, .expYield = 164, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -23383,7 +23383,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 205, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -23431,7 +23431,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_DARK }, .catchRate = 155, .expYield = 164, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -23680,7 +23680,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_BUG }, .catchRate = 45, .expYield = 71, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -23728,7 +23728,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_BUG }, .catchRate = 45, .expYield = 173, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -23777,7 +23777,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 40, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -23877,7 +23877,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 70, \ .catchRate = 45, \ .expYield = 147, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .itemCommon = ITEM_MYSTIC_WATER, \ .itemRare = ITEM_MYSTIC_WATER, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -24052,7 +24052,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 225, .expYield = 59, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -24094,7 +24094,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define BANETTE_MISC_INFO \ .types = { TYPE_GHOST, TYPE_GHOST }, \ .catchRate = 45, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .itemRare = ITEM_SPELL_TAG, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ @@ -24244,7 +24244,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 90, .expYield = 159, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -24297,7 +24297,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 45, .expYield = 236, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -24350,7 +24350,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FLYING }, .catchRate = 200, .expYield = 161, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -24400,7 +24400,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 120, .expYield = 57, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -24456,7 +24456,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 159, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .itemRare = ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -24500,7 +24500,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ABSOL_MISC_INFO \ .types = { TYPE_DARK, TYPE_DARK }, \ .catchRate = 30, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = 35, \ @@ -24596,7 +24596,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 190, .expYield = 60, - .evYield_HP = 1, + .evYield_HP = 1, .itemRare = ITEM_SNOWBALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -24639,7 +24639,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GLALIE_MISC_INFO \ .types = { TYPE_ICE, TYPE_ICE }, \ .catchRate = 75, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -24738,7 +24738,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_GHOST }, .catchRate = 75, .expYield = 168, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -24789,7 +24789,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_WATER }, .catchRate = 255, .expYield = 58, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -24838,7 +24838,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_WATER }, .catchRate = 120, .expYield = 144, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -24886,7 +24886,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_WATER }, .catchRate = 45, .expYield = 239, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -24935,7 +24935,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 69, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemCommon = ITEM_PEARL, .itemRare = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), @@ -24988,8 +24988,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 60, .expYield = 170, - .evYield_Attack = 1, - .evYield_Defense = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, .itemRare = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -25037,7 +25037,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 60, .expYield = 170, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -25087,8 +25087,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ROCK }, .catchRate = 25, .expYield = 170, - .evYield_HP = 1, - .evYield_Defense = 1, + .evYield_HP = 1, + .evYield_Defense = 1, .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, @@ -25140,7 +25140,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 116, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemCommon = ITEM_HEART_SCALE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, @@ -25190,7 +25190,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -25239,7 +25239,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 147, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -25280,7 +25280,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SALAMENCE_MISC_INFO \ .types = { TYPE_DRAGON, TYPE_FLYING }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .itemRare = ITEM_DRAGON_FANG, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 40, \ @@ -25381,7 +25381,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 60, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, @@ -25431,7 +25431,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 147, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, @@ -25472,7 +25472,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define METAGROSS_MISC_INFO \ .types = { TYPE_STEEL, TYPE_PSYCHIC }, \ .catchRate = 3, \ - .evYield_Defense = 3, \ + .evYield_Defense = 3, \ .itemRare = ITEM_METAL_COAT, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 40, \ @@ -25572,7 +25572,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 3, .expYield = 261, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, @@ -25673,7 +25673,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 3, .expYield = 261, - .evYield_Defense = 2, + .evYield_Defense = 2, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 80, @@ -25907,7 +25907,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 3, \ .expYield = 302, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -25997,7 +25997,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GROUDON_MISC_INFO \ .catchRate = 3, \ .expYield = 302, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -26090,8 +26090,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_FLYING }, \ .catchRate = 45, \ .expYield = 306, \ - .evYield_Attack = 2, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 2, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -26191,7 +26191,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 270, - .evYield_HP = 3, + .evYield_HP = 3, .itemCommon = ITEM_STAR_PIECE, .itemRare = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, @@ -26268,9 +26268,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 150, .baseSpAttack = 150, .baseSpDefense = 50, - .evYield_Attack = 1, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, FRONT_PIC(DeoxysNormal, 64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DeoxysNormal, @@ -26292,8 +26292,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 150, .baseSpAttack = 180, .baseSpDefense = 20, - .evYield_Attack = 2, - .evYield_SpAttack = 1, + .evYield_Attack = 2, + .evYield_SpAttack = 1, FRONT_PIC(DeoxysAttack, 64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DeoxysAttack, @@ -26315,7 +26315,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 90, .baseSpAttack = 70, .baseSpDefense = 160, - .evYield_Defense = 2, + .evYield_Defense = 2, .evYield_SpDefense = 1, FRONT_PIC(DeoxysDefense, 56, 64), .frontPicYOffset = 0, @@ -26338,7 +26338,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 180, .baseSpAttack = 95, .baseSpDefense = 90, - .evYield_Speed = 3, + .evYield_Speed = 3, .noFlip = TRUE, FRONT_PIC(DeoxysSpeed, 64, 64), .frontPicYOffset = 1, @@ -26365,7 +26365,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 64, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26413,8 +26413,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 142, - .evYield_Attack = 1, - .evYield_Defense = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26462,8 +26462,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GROUND }, .catchRate = 45, .expYield = 236, - .evYield_Attack = 2, - .evYield_Defense = 1, + .evYield_Attack = 2, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26513,7 +26513,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26562,8 +26562,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIGHTING }, .catchRate = 45, .expYield = 142, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26612,9 +26612,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIGHTING }, .catchRate = 45, .expYield = 240, - .evYield_Attack = 1, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26663,7 +26663,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 63, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26715,7 +26715,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 142, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26767,7 +26767,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_STEEL }, .catchRate = 45, .expYield = 239, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -26820,7 +26820,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 49, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -26870,7 +26870,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 120, .expYield = 119, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -26920,7 +26920,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 45, .expYield = 218, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -26970,7 +26970,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 50, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -27020,7 +27020,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_WATER }, .catchRate = 127, .expYield = 144, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -27070,7 +27070,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 255, .expYield = 39, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -27121,7 +27121,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 45, .expYield = 134, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -27173,7 +27173,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 235, .expYield = 53, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -27223,7 +27223,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 120, .expYield = 127, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 100, @@ -27273,7 +27273,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 235, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -27324,7 +27324,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 45, .expYield = 70, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -27372,7 +27372,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 45, .expYield = 173, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -27421,7 +27421,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_STEEL }, .catchRate = 45, .expYield = 70, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -27469,7 +27469,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_STEEL }, .catchRate = 45, .expYield = 173, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -27663,7 +27663,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 59, .baseSpDefense = 85, .types = { TYPE_BUG, TYPE_GROUND }, - .evYield_Defense = 2, + .evYield_Defense = 2, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( "Its earthen skin is reasonably hard, it has\n" @@ -27687,7 +27687,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 69, .baseSpDefense = 95, .types = { TYPE_BUG, TYPE_STEEL }, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -27713,8 +27713,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 45, .expYield = 148, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_SILVER_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, @@ -27765,7 +27765,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 120, .expYield = 49, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_HONEY, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, @@ -27816,7 +27816,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 45, .expYield = 166, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .itemRare = ITEM_POISON_BARB, .genderRatio = MON_FEMALE, @@ -27868,7 +27868,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 200, .expYield = 142, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 100, @@ -27918,7 +27918,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 66, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -27967,7 +27967,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 173, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -28017,7 +28017,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 190, .expYield = 55, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -28065,7 +28065,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, \ .catchRate = 75, \ .expYield = 158, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .itemRare = ITEM_MIRACLE_SEED, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -28140,7 +28140,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 190, \ .expYield = 65, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -28209,7 +28209,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, \ .catchRate = 75, \ .expYield = 166, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -28278,7 +28278,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_FLYING }, .catchRate = 125, .expYield = 70, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -28327,7 +28327,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_FLYING }, .catchRate = 60, .expYield = 174, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -28377,7 +28377,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 190, .expYield = 70, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 0, @@ -28416,7 +28416,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define LOPUNNY_MISC_INFO \ .catchRate = 60, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = 140, \ @@ -28517,7 +28517,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 190, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -28565,7 +28565,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 75, .expYield = 158, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -28614,7 +28614,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_DARK }, .catchRate = 225, .expYield = 66, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -28662,7 +28662,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_DARK }, .catchRate = 60, .expYield = 168, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -28711,7 +28711,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_PSYCHIC }, .catchRate = 255, .expYield = 60, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, @@ -28761,7 +28761,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_PSYCHIC }, .catchRate = 90, .expYield = 175, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, @@ -28813,7 +28813,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 30, .expYield = 144, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -28863,7 +28863,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_DARK }, .catchRate = 100, .expYield = 170, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, @@ -28913,7 +28913,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_GROUND }, .catchRate = 45, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -28963,7 +28963,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_GROUND }, .catchRate = 45, .expYield = 144, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -29005,7 +29005,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GARCHOMP_MISC_INFO \ .types = { TYPE_DRAGON, TYPE_GROUND }, \ .catchRate = 45, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 40, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -29099,7 +29099,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 75, .expYield = 57, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -29139,8 +29139,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #define LUCARIO_MISC_INFO \ .types = { TYPE_FIGHTING, TYPE_STEEL }, \ .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -29239,7 +29239,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 140, .expYield = 66, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -29291,7 +29291,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 60, .expYield = 184, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -29344,7 +29344,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_BUG }, .catchRate = 120, .expYield = 66, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -29393,7 +29393,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_DARK }, .catchRate = 45, .expYield = 175, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -29443,7 +29443,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FIGHTING }, .catchRate = 140, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, @@ -29494,7 +29494,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FIGHTING }, .catchRate = 75, .expYield = 172, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -29546,7 +29546,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 200, .expYield = 159, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -29596,7 +29596,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 66, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -29646,7 +29646,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 161, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -29697,7 +29697,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_ICE }, .catchRate = 120, .expYield = 67, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -29740,8 +29740,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ABOMASNOW_MISC_INFO \ .types = { TYPE_GRASS, TYPE_ICE }, \ .catchRate = 60, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ .itemRare = ITEM_NEVER_MELT_ICE, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -29833,8 +29833,8 @@ const struct SpeciesInfo gSpeciesInfo[] = #if P_FAMILY_ROTOM #define ROTOM_MISC_INFO \ .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -30019,7 +30019,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 261, - .evYield_Defense = 2, + .evYield_Defense = 2, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 80, @@ -30071,8 +30071,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 261, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 80, @@ -30124,8 +30124,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 3, .expYield = 261, - .evYield_Attack = 2, - .evYield_SpAttack = 1, + .evYield_Attack = 2, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 140, @@ -30169,7 +30169,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_DRAGON }, \ .catchRate = 3, \ .expYield = 306, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -30255,7 +30255,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_DRAGON }, \ .catchRate = 3, \ .expYield = 306, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -30348,7 +30348,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_STEEL }, .catchRate = 3, .expYield = 270, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 100, @@ -30398,7 +30398,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 3, .expYield = 302, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -30441,7 +30441,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_DRAGON }, \ .catchRate = 3, \ .expYield = 306, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -30587,7 +30587,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 30, .expYield = 216, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -30636,7 +30636,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 3, .expYield = 270, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -30687,8 +30687,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DARK }, .catchRate = 3, .expYield = 270, - .evYield_Speed = 1, - .evYield_SpAttack = 2, + .evYield_Speed = 1, + .evYield_SpAttack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -30731,7 +30731,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define SHAYMIN_MISC_INFO \ .catchRate = 45, \ .expYield = 270, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .itemCommon = ITEM_LUM_BERRY, \ .itemRare = ITEM_LUM_BERRY, \ .genderRatio = MON_GENDERLESS, \ @@ -30832,7 +30832,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { type, type }, \ .catchRate = 3, \ .expYield = 324, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -30899,7 +30899,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FIRE }, .catchRate = 3, .expYield = 270, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -30949,7 +30949,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -30997,7 +30997,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 145, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31045,7 +31045,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 238, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31094,7 +31094,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31142,7 +31142,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIGHTING }, .catchRate = 45, .expYield = 146, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31190,7 +31190,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIGHTING }, .catchRate = 45, .expYield = 238, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31240,7 +31240,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 62, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31288,7 +31288,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 145, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31357,7 +31357,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 108, .baseSpDefense = 70, .types = { TYPE_WATER, TYPE_WATER }, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHELL_ARMOR }, .weight = 946, .description = COMPOUND_STRING( @@ -31388,7 +31388,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 100, .baseSpDefense = 65, .types = { TYPE_WATER, TYPE_DARK }, - .evYield_Attack = 3, + .evYield_Attack = 3, .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHARPNESS }, .weight = 582, .description = COMPOUND_STRING( @@ -31420,7 +31420,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 51, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -31468,7 +31468,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 147, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31517,7 +31517,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 55, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -31565,7 +31565,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 120, .expYield = 130, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -31613,7 +31613,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 225, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -31662,7 +31662,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DARK }, .catchRate = 255, .expYield = 56, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31710,7 +31710,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DARK }, .catchRate = 90, .expYield = 156, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31759,7 +31759,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 190, .expYield = 63, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31807,7 +31807,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 75, .expYield = 174, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31856,7 +31856,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 190, .expYield = 63, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31905,7 +31905,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 75, .expYield = 174, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -31955,7 +31955,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 190, .expYield = 63, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32003,7 +32003,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 174, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32052,7 +32052,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 190, .expYield = 58, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -32101,7 +32101,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 75, .expYield = 170, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, @@ -32151,7 +32151,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 53, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -32199,7 +32199,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 120, .expYield = 125, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -32247,7 +32247,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 45, .expYield = 220, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -32300,7 +32300,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 190, .expYield = 59, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32348,7 +32348,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 75, .expYield = 174, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32397,7 +32397,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 255, .expYield = 56, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemCommon = ITEM_EVERSTONE, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), @@ -32447,8 +32447,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 120, .expYield = 137, - .evYield_Attack = 1, - .evYield_Defense = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, .itemCommon = ITEM_EVERSTONE, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), @@ -32499,7 +32499,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 45, .expYield = 232, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemCommon = ITEM_EVERSTONE, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), @@ -32550,7 +32550,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FLYING }, .catchRate = 190, .expYield = 65, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -32599,7 +32599,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FLYING }, .catchRate = 45, .expYield = 149, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -32649,7 +32649,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 120, .expYield = 66, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32698,7 +32698,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_STEEL }, .catchRate = 60, .expYield = 178, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32738,7 +32738,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define AUDINO_MISC_INFO \ .catchRate = 255, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .itemCommon = ITEM_ORAN_BERRY, \ .itemRare = ITEM_SITRUS_BERRY, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -32843,7 +32843,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 180, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -32891,7 +32891,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 90, .expYield = 142, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32940,7 +32940,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 227, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -32989,7 +32989,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 59, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -33037,7 +33037,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 120, .expYield = 134, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -33085,7 +33085,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GROUND }, .catchRate = 45, .expYield = 229, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -33134,7 +33134,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 163, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, @@ -33184,7 +33184,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 163, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, @@ -33235,7 +33235,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GRASS }, .catchRate = 255, .expYield = 62, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -33284,7 +33284,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GRASS }, .catchRate = 120, .expYield = 133, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -33333,7 +33333,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_GRASS }, .catchRate = 45, .expYield = 225, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemRare = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -33383,7 +33383,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 255, .expYield = 52, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -33436,7 +33436,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 120, .expYield = 126, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -33489,7 +33489,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_POISON }, .catchRate = 45, .expYield = 218, - .evYield_Speed = 3, + .evYield_Speed = 3, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -33549,7 +33549,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = COTTONEE_FAMILY_TYPES, .catchRate = 190, .expYield = 56, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -33598,7 +33598,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = COTTONEE_FAMILY_TYPES, .catchRate = 75, .expYield = 168, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -33648,7 +33648,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 190, .expYield = 56, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_ABSORB_BULB, .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -33715,7 +33715,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 110, .baseSpDefense = 75, .types = { TYPE_GRASS, TYPE_GRASS }, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .abilities = { ABILITY_CHLOROPHYLL, ABILITY_OWN_TEMPO, ABILITY_LEAF_GUARD }, .categoryName = _("Flowering"), .height = 11, @@ -33752,8 +33752,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 50, .baseSpDefense = 75, .types = { TYPE_GRASS, TYPE_FIGHTING }, - .evYield_Attack = 1, - .evYield_Speed = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, .abilities = { ABILITY_CHLOROPHYLL, ABILITY_HUSTLE, ABILITY_LEAF_GUARD }, .categoryName = _("Spinning"), .height = 12, @@ -33793,7 +33793,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 190, \ .expYield = 161, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 40, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -33889,7 +33889,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_GHOST }, \ .catchRate = 45, \ .expYield = 265, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ .growthRate = GROWTH_MEDIUM_FAST, \ @@ -33969,7 +33969,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_DARK }, .catchRate = 180, .expYield = 58, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34018,7 +34018,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_DARK }, .catchRate = 90, .expYield = 123, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34067,7 +34067,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_DARK }, .catchRate = 45, .expYield = 234, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemCommon = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34115,7 +34115,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 45, \ .catchRate = 120, \ .expYield = 63, \ - .evYield_Attack = 1, \ + .evYield_Attack = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -34179,12 +34179,12 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 30, \ .baseSpDefense = 55, \ .expYield = 168, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ DARMANITAN_MISC_INFO #define DARMANITAN_ZEN_MODE_MISC_INFO \ .expYield = 189, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .categoryName = _("Blazing"), \ DARMANITAN_MISC_INFO @@ -34345,7 +34345,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 255, .expYield = 161, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34395,7 +34395,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ROCK }, .catchRate = 190, .expYield = 65, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34444,7 +34444,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ROCK }, .catchRate = 75, .expYield = 170, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -34494,7 +34494,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FIGHTING }, .catchRate = 180, .expYield = 70, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -34543,7 +34543,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FIGHTING }, .catchRate = 90, .expYield = 171, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .itemRare = ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), @@ -34594,7 +34594,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FLYING }, .catchRate = 45, .expYield = 172, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -34636,7 +34636,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define YAMASK_MISC_INFO \ .catchRate = 190, \ .expYield = 61, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -34698,7 +34698,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 90, .expYield = 169, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -34775,7 +34775,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GHOST }, .catchRate = 90, .expYield = 169, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -34825,7 +34825,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ROCK }, .catchRate = 45, .expYield = 71, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -34873,7 +34873,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ROCK }, .catchRate = 45, .expYield = 173, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -34922,7 +34922,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FLYING }, .catchRate = 45, .expYield = 71, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -34970,7 +34970,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FLYING }, .catchRate = 45, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -35020,7 +35020,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 190, .expYield = 66, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_SILK_SCARF, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -35068,7 +35068,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, \ .catchRate = 60, \ .expYield = 166, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .itemCommon = ITEM_SILK_SCARF, \ .itemRare = ITEM_BLACK_SLUDGE, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -35143,7 +35143,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ZORUA_MISC_INFO \ .catchRate = 75, \ .expYield = 66, \ - .evYield_SpAttack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -35166,7 +35166,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ZOROARK_MISC_INFO \ .catchRate = 45, \ .expYield = 179, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -35312,7 +35312,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 60, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -35360,7 +35360,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 60, .expYield = 165, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -35555,7 +35555,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 200, .expYield = 58, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -35605,7 +35605,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 100, .expYield = 130, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -35654,7 +35654,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 50, .expYield = 221, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -35704,7 +35704,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FLYING }, .catchRate = 190, .expYield = 61, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -35752,7 +35752,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FLYING }, .catchRate = 45, .expYield = 166, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -35801,7 +35801,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 255, .expYield = 61, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -35850,7 +35850,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 120, .expYield = 138, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -35899,7 +35899,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 45, .expYield = 241, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemCommon = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -35948,7 +35948,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_GRASS }, \ .catchRate = 190, \ .expYield = 67, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -36030,7 +36030,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_GRASS }, \ .catchRate = 75, \ .expYield = 166, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -36118,7 +36118,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_FLYING }, .catchRate = 200, .expYield = 150, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36168,7 +36168,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 200, .expYield = 63, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -36216,7 +36216,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_STEEL }, .catchRate = 75, .expYield = 173, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -36265,7 +36265,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 190, .expYield = 59, - .evYield_HP = 1, + .evYield_HP = 1, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -36315,7 +36315,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 75, .expYield = 162, - .evYield_HP = 2, + .evYield_HP = 2, .itemCommon = ITEM_TINY_MUSHROOM, .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), @@ -36472,7 +36472,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 75, .expYield = 165, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -36521,7 +36521,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ELECTRIC }, .catchRate = 190, .expYield = 64, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36569,7 +36569,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ELECTRIC }, .catchRate = 75, .expYield = 165, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36618,7 +36618,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_STEEL }, .catchRate = 255, .expYield = 61, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -36667,7 +36667,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_STEEL }, .catchRate = 90, .expYield = 171, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -36718,7 +36718,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 130, .expYield = 60, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36768,7 +36768,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 60, .expYield = 154, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36818,7 +36818,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 30, .expYield = 234, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36869,7 +36869,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 190, .expYield = 55, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36918,7 +36918,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 60, .expYield = 142, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -36967,7 +36967,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 30, .expYield = 232, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37017,7 +37017,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 255, .expYield = 67, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37065,7 +37065,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 90, .expYield = 170, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37114,7 +37114,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_FIRE }, .catchRate = 190, .expYield = 55, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37167,7 +37167,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_FIRE }, .catchRate = 90, .expYield = 130, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37220,7 +37220,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_FIRE }, .catchRate = 45, .expYield = 234, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37274,7 +37274,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 75, .expYield = 64, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -37322,7 +37322,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 60, .expYield = 144, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -37370,7 +37370,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 243, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -37419,7 +37419,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 120, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37467,7 +37467,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 60, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -37572,7 +37572,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 200, .expYield = 61, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -37620,7 +37620,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 75, .expYield = 173, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -37661,7 +37661,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define STUNFISK_MISC_INFO \ .catchRate = 75, \ .expYield = 165, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .growthRate = GROWTH_MEDIUM_FAST, \ @@ -37754,7 +37754,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 180, .expYield = 70, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -37802,7 +37802,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 179, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -37851,7 +37851,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 170, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, @@ -37901,7 +37901,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GHOST }, .catchRate = 190, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -37951,7 +37951,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GHOST }, .catchRate = 90, .expYield = 169, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -38002,7 +38002,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_STEEL }, .catchRate = 120, .expYield = 68, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -38050,7 +38050,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_STEEL }, .catchRate = 45, .expYield = 172, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -38149,7 +38149,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 172, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -38198,7 +38198,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 190, .expYield = 70, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -38260,7 +38260,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 57, .baseSpDefense = 75, .types = { TYPE_NORMAL, TYPE_FLYING }, - .evYield_Attack = 2, + .evYield_Attack = 2, .abilities = { ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_DEFIANT }, .bodyColor = BODY_COLOR_RED, .categoryName = _("Valiant"), @@ -38299,7 +38299,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 112, .baseSpDefense = 70, .types = { TYPE_PSYCHIC, TYPE_FLYING }, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .abilities = { ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_TINTED_LENS }, .bodyColor = BODY_COLOR_WHITE, .categoryName = _("Battle Cry"), @@ -38339,7 +38339,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FLYING }, .catchRate = 190, .expYield = 74, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 35, @@ -38387,7 +38387,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FLYING }, .catchRate = 60, .expYield = 179, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 35, @@ -38436,7 +38436,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 90, .expYield = 169, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -38485,7 +38485,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_STEEL }, .catchRate = 90, .expYield = 169, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -38534,7 +38534,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DRAGON }, .catchRate = 45, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -38582,7 +38582,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DRAGON }, .catchRate = 45, .expYield = 147, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -38630,7 +38630,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DRAGON }, .catchRate = 45, .expYield = 270, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -38680,7 +38680,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FIRE }, .catchRate = 45, .expYield = 72, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -38728,7 +38728,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FIRE }, .catchRate = 15, .expYield = 248, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .itemCommon = ITEM_SILVER_POWDER, .itemRare = ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), @@ -38780,7 +38780,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_FIGHTING }, .catchRate = 3, .expYield = 261, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, @@ -38830,7 +38830,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FIGHTING }, .catchRate = 3, .expYield = 261, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, @@ -38923,7 +38923,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_FLYING }, \ .catchRate = 3, \ .expYield = 261, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_MALE, \ .eggCycles = 120, \ .friendship = 90, \ @@ -39033,7 +39033,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 111, .baseSpAttack = 125, .baseSpDefense = 80, - .evYield_Attack = 3, + .evYield_Attack = 3, .abilities = { ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT }, .cryId = CRY_THUNDURUS_INCARNATE, .height = 15, @@ -39067,7 +39067,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 101, .baseSpAttack = 145, .baseSpDefense = 80, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .abilities = { ABILITY_VOLT_ABSORB, ABILITY_NONE, ABILITY_VOLT_ABSORB }, .cryId = CRY_THUNDURUS_THERIAN, .height = 30, @@ -39102,7 +39102,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_FIRE }, .catchRate = 3, .expYield = 306, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -39152,7 +39152,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_ELECTRIC }, .catchRate = 3, .expYield = 306, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -39220,7 +39220,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 101, .baseSpAttack = 115, .baseSpDefense = 80, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .abilities = { ABILITY_SAND_FORCE, ABILITY_NONE, ABILITY_SHEER_FORCE }, .cryId = CRY_LANDORUS_INCARNATE, .height = 15, @@ -39254,7 +39254,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 91, .baseSpAttack = 105, .baseSpDefense = 80, - .evYield_Attack = 3, + .evYield_Attack = 3, .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE }, .cryId = CRY_LANDORUS_THERIAN, .height = 13, @@ -39305,9 +39305,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 130, .baseSpDefense = 90, .expYield = 297, - .evYield_HP = 1, - .evYield_Attack = 1, - .evYield_SpAttack = 1, + .evYield_HP = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 1, .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .cryId = CRY_KYUREM, .height = 30, @@ -39343,7 +39343,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 170, .baseSpDefense = 100, .expYield = 315, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .abilities = { ABILITY_TURBOBLAZE, ABILITY_NONE }, .cryId = CRY_KYUREM_WHITE, .height = 36, @@ -39377,7 +39377,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 120, .baseSpDefense = 90, .expYield = 315, - .evYield_Attack = 3, + .evYield_Attack = 3, .abilities = { ABILITY_TERAVOLT, ABILITY_NONE }, .cryId = CRY_KYUREM_BLACK, .height = 33, @@ -39414,7 +39414,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FIGHTING }, \ .catchRate = 3, \ .expYield = 261, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 80, \ .friendship = 35, \ @@ -39479,7 +39479,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define MELOETTA_MISC_INFO \ .catchRate = 3, \ .expYield = 270, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .itemCommon = ITEM_STAR_PIECE, \ .itemRare = ITEM_STAR_PIECE, \ .genderRatio = MON_GENDERLESS, \ @@ -39516,7 +39516,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 128, .baseSpDefense = 128, .types = { TYPE_NORMAL, TYPE_PSYCHIC }, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .evYield_SpDefense = 1, .description = COMPOUND_STRING( "The melodies sung by Meloetta have the\n" @@ -39545,7 +39545,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpAttack = 77, .baseSpDefense = 77, .types = { TYPE_NORMAL, TYPE_FIGHTING }, - .evYield_Attack = 1, + .evYield_Attack = 1, .evYield_Defense = 1, .description = COMPOUND_STRING( ""), @@ -39574,9 +39574,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_STEEL }, \ .catchRate = 3, \ .expYield = 270, \ - .evYield_Attack = 1, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ + .evYield_Attack = 1, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -39630,7 +39630,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 63, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39678,7 +39678,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 142, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39726,7 +39726,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FIGHTING }, .catchRate = 45, .expYield = 239, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39775,7 +39775,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 61, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39823,7 +39823,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 143, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39871,7 +39871,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 240, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39920,7 +39920,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 63, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -39968,7 +39968,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 142, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -40025,7 +40025,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define GRENINJA_MISC_INFO \ .types = { TYPE_WATER, TYPE_DARK }, \ .catchRate = 45, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ .growthRate = GROWTH_MEDIUM_SLOW, \ @@ -40111,7 +40111,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 47, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40159,7 +40159,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_GROUND }, .catchRate = 127, .expYield = 148, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40208,7 +40208,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 56, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40256,7 +40256,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FLYING }, .catchRate = 120, .expYield = 134, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40305,7 +40305,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FLYING }, .catchRate = 45, .expYield = 175, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40355,7 +40355,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 255, .expYield = 40, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40403,7 +40403,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 120, .expYield = 75, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -40450,9 +40450,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FLYING }, \ .catchRate = 45, \ .expYield = 185, \ - .evYield_HP = 1, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ + .evYield_HP = 1, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -40678,7 +40678,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_NORMAL }, .catchRate = 220, .expYield = 74, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(87.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -40726,7 +40726,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_NORMAL }, .catchRate = 65, .expYield = 177, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(87.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41033,7 +41033,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 200, .expYield = 70, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41081,7 +41081,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 186, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41130,7 +41130,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 220, .expYield = 70, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -41179,7 +41179,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_DARK }, .catchRate = 65, .expYield = 173, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -41228,7 +41228,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, \ .catchRate = 160, \ .expYield = 165, \ - .evYield_Speed = 1, \ + .evYield_Speed = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -41369,7 +41369,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 190, .expYield = 71, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41417,7 +41417,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, \ .catchRate = 75, \ .expYield = 163, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ .growthRate = GROWTH_MEDIUM_FAST, \ @@ -41487,7 +41487,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_GHOST }, .catchRate = 180, .expYield = 65, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41536,7 +41536,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_GHOST }, .catchRate = 90, .expYield = 157, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41611,7 +41611,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 60, .baseSpAttack = 50, .baseSpDefense = AEGISLASH_MAIN_STAT, - .evYield_Defense = 2, + .evYield_Defense = 2, .evYield_SpDefense = 1, .description = COMPOUND_STRING( "Generations of kings were attended to\n" @@ -41639,8 +41639,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 60, .baseSpAttack = AEGISLASH_MAIN_STAT, .baseSpDefense = 50, - .evYield_Attack = 2, - .evYield_SpAttack = 1, + .evYield_Attack = 2, + .evYield_SpAttack = 1, .description = COMPOUND_STRING( ""), FRONT_PIC(AegislashBlade, 64, 64), @@ -41668,7 +41668,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FAIRY }, .catchRate = 200, .expYield = 68, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41718,7 +41718,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FAIRY }, .catchRate = 140, .expYield = 162, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41767,7 +41767,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FAIRY }, .catchRate = 200, .expYield = 68, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41816,7 +41816,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FAIRY }, .catchRate = 140, .expYield = 168, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41865,7 +41865,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_PSYCHIC }, .catchRate = 190, .expYield = 58, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41914,7 +41914,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_PSYCHIC }, .catchRate = 80, .expYield = 169, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -41963,7 +41963,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 120, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42011,7 +42011,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_WATER }, .catchRate = 45, .expYield = 175, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42158,7 +42158,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 225, .expYield = 66, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -42207,7 +42207,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 55, .expYield = 100, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -42257,7 +42257,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_NORMAL }, .catchRate = 190, .expYield = 58, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42305,8 +42305,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_NORMAL }, .catchRate = 75, .expYield = 168, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42355,7 +42355,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_DRAGON }, .catchRate = 45, .expYield = 72, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -42403,7 +42403,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_DRAGON }, .catchRate = 45, .expYield = 182, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -42452,7 +42452,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ICE }, .catchRate = 45, .expYield = 72, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -42500,7 +42500,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ICE }, .catchRate = 45, .expYield = 104, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = STANDARD_FRIENDSHIP, @@ -42549,7 +42549,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FLYING }, .catchRate = 100, .expYield = 175, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -42603,7 +42603,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_FAIRY }, .catchRate = 180, .expYield = 151, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42652,7 +42652,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FAIRY }, .catchRate = 60, .expYield = 100, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -42930,7 +42930,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_FAIRY }, .catchRate = 75, .expYield = 165, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -42981,7 +42981,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GRASS }, .catchRate = 120, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -43031,7 +43031,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GRASS }, .catchRate = 60, .expYield = 166, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -43073,7 +43073,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GRASS }, \ .catchRate = 120, \ .expYield = 67, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -43206,7 +43206,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GRASS }, \ .catchRate = 60, \ .expYield = 173, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -43346,7 +43346,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 190, .expYield = 61, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -43387,7 +43387,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define AVALUGG_MISC_INFO \ .catchRate = 55, \ .expYield = 180, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -43483,7 +43483,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_DRAGON }, .catchRate = 190, .expYield = 49, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -43536,7 +43536,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_DRAGON }, .catchRate = 45, .expYield = 187, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -43589,7 +43589,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FAIRY }, \ .catchRate = 45, \ .expYield = 306, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -43640,7 +43640,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FLYING }, .catchRate = 45, .expYield = 306, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -43683,7 +43683,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ZYGARDE_MISC_INFO(ability) \ .types = { TYPE_DRAGON, TYPE_GROUND }, \ .catchRate = 3, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -43810,7 +43810,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define DIANCE_MISC_INFO \ .types = { TYPE_ROCK, TYPE_FAIRY }, \ .catchRate = 3, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .evYield_SpDefense = 2, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 25, \ @@ -43900,7 +43900,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define HOOPA_MISC_INFO \ .catchRate = 3, \ .expYield = 270, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .growthRate = GROWTH_SLOW, \ @@ -43998,7 +43998,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_WATER }, .catchRate = 3, .expYield = 270, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -44048,7 +44048,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FLYING }, .catchRate = 45, .expYield = 64, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44096,7 +44096,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FLYING }, .catchRate = 45, .expYield = 147, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44138,7 +44138,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define DECIDUEYE_MISC_INFO \ .catchRate = 45, \ .expYield = 239, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -44228,7 +44228,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 64, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44276,7 +44276,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 147, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44324,7 +44324,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_DARK }, .catchRate = 45, .expYield = 239, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44373,7 +44373,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 64, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44421,7 +44421,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 147, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44469,7 +44469,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_FAIRY }, .catchRate = 45, .expYield = 239, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44518,7 +44518,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 255, .expYield = 53, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_ORAN_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44567,7 +44567,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 120, .expYield = 124, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44616,7 +44616,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FLYING }, .catchRate = 45, .expYield = 218, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemRare = ITEM_RAWST_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44666,7 +44666,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 51, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44715,7 +44715,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 127, .expYield = 146, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44765,7 +44765,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_BUG }, .catchRate = 255, .expYield = 60, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44813,7 +44813,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ELECTRIC }, .catchRate = 120, .expYield = 140, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -44863,7 +44863,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 225, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -44913,7 +44913,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 225, .expYield = 68, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_ASPEAR_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -44963,7 +44963,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_ICE }, .catchRate = 60, .expYield = 167, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_CHERI_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45011,7 +45011,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 70, \ .catchRate = 45, \ .expYield = 167, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .itemRare = ITEM_HONEY, \ .genderRatio = PERCENT_FEMALE(75), \ .eggCycles = 20, \ @@ -45120,7 +45120,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FAIRY }, .catchRate = 190, .expYield = 61, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45170,7 +45170,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FAIRY }, .catchRate = 75, .expYield = 162, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45220,7 +45220,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, \ .catchRate = 190, \ .expYield = 56, \ - .evYield_Attack = 1, \ + .evYield_Attack = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -45273,7 +45273,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, \ .catchRate = 90, \ .expYield = 170, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -45378,7 +45378,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 60, \ .expYield = 61, \ - .evYield_HP = 1, \ + .evYield_HP = 1, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -45465,7 +45465,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_WATER }, .catchRate = 190, .expYield = 61, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45514,7 +45514,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_WATER }, .catchRate = 75, .expYield = 173, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45564,7 +45564,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 190, .expYield = 77, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_LIGHT_CLAY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45613,7 +45613,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 60, .expYield = 175, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_LIGHT_CLAY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45762,7 +45762,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 190, .expYield = 50, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45811,7 +45811,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 75, .expYield = 168, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -45962,7 +45962,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FIRE }, .catchRate = 120, .expYield = 64, - .evYield_Speed = 1, + .evYield_Speed = 1, .itemRare = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -46011,7 +46011,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_FIRE }, .catchRate = 45, .expYield = 168, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_SMOKE_BALL, .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -46061,7 +46061,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FIGHTING }, .catchRate = 140, .expYield = 68, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -46109,7 +46109,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_FIGHTING }, .catchRate = 70, .expYield = 175, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -46158,7 +46158,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 235, .expYield = 42, - .evYield_HP = 1, + .evYield_HP = 1, .itemRare = ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -46207,7 +46207,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 120, .expYield = 102, - .evYield_Speed = 2, + .evYield_Speed = 2, .itemRare = ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -46257,7 +46257,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 230, - .evYield_Attack = 3, + .evYield_Attack = 3, .itemCommon = ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -46409,7 +46409,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 172, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -46458,7 +46458,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_WATER }, .catchRate = 90, .expYield = 46, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -46506,7 +46506,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_WATER }, .catchRate = 45, .expYield = 186, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -46555,7 +46555,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GROUND }, .catchRate = 140, .expYield = 64, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -46604,7 +46604,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GROUND }, .catchRate = 60, .expYield = 168, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -46703,7 +46703,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 3, .expYield = 107, - .evYield_HP = 2, + .evYield_HP = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -46752,7 +46752,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { type, type }, \ .catchRate = 3, \ .expYield = 257, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -46814,7 +46814,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FLYING }, \ .catchRate = 30, \ .expYield = 154, \ - .evYield_Defense = 1, \ + .evYield_Defense = 1, \ .evYield_SpDefense = 1, \ .itemRare = ITEM_STAR_PIECE, \ .genderRatio = MON_GENDERLESS, \ @@ -46914,7 +46914,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 45, .expYield = 168, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -46963,7 +46963,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_DRAGON }, .catchRate = 70, .expYield = 170, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -47013,7 +47013,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_STEEL }, .catchRate = 180, .expYield = 152, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_ELECTRIC_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, @@ -47134,7 +47134,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_PSYCHIC }, .catchRate = 80, .expYield = 166, - .evYield_Attack = 2, + .evYield_Attack = 2, .itemRare = ITEM_RAZOR_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -47184,7 +47184,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_DRAGON }, .catchRate = 70, .expYield = 170, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .itemRare = ITEM_PERSIM_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -47234,7 +47234,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GRASS }, .catchRate = 25, .expYield = 181, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -47285,7 +47285,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 45, .expYield = 60, - .evYield_Defense = 1, + .evYield_Defense = 1, .itemRare = ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -47334,7 +47334,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_FIGHTING }, .catchRate = 45, .expYield = 147, - .evYield_Defense = 2, + .evYield_Defense = 2, .itemRare = ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -47383,7 +47383,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_FIGHTING }, .catchRate = 45, .expYield = 270, - .evYield_Defense = 3, + .evYield_Defense = 3, .itemCommon = ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -47433,7 +47433,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_FAIRY }, .catchRate = 3, .expYield = 257, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -47484,7 +47484,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FAIRY }, .catchRate = 3, .expYield = 257, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -47535,7 +47535,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_FAIRY }, .catchRate = 3, .expYield = 257, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -47638,7 +47638,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 40, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -47688,7 +47688,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 45, .expYield = 140, - .evYield_Defense = 1, + .evYield_Defense = 1, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -47740,7 +47740,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_STEEL }, .catchRate = 45, .expYield = 306, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -47788,7 +47788,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_GHOST }, .catchRate = 45, .expYield = 306, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -47890,8 +47890,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FIGHTING }, .catchRate = 45, .expYield = 257, - .evYield_Attack = 1, - .evYield_Defense = 2, + .evYield_Attack = 1, + .evYield_Defense = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -47941,7 +47941,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_BUG, TYPE_FIGHTING }, .catchRate = 45, .expYield = 257, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -47991,7 +47991,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 257, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48041,9 +48041,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_FLYING }, .catchRate = 45, .expYield = 257, - .evYield_Attack = 1, - .evYield_Defense = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48093,7 +48093,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_STEEL }, .catchRate = 45, .expYield = 257, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48144,7 +48144,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_DRAGON }, .catchRate = 45, .expYield = 257, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48214,8 +48214,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 255, .expYield = 270, - .evYield_Attack = 1, - .evYield_SpAttack = 2, + .evYield_Attack = 1, + .evYield_SpAttack = 2, .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, .cryId = CRY_NECROZMA, @@ -48251,7 +48251,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_STEEL }, .catchRate = 255, .expYield = 306, - .evYield_Attack = 3, + .evYield_Attack = 3, .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_NECROZMA_DUSK_MANE, @@ -48284,7 +48284,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_GHOST }, .catchRate = 255, .expYield = 306, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .cryId = CRY_NECROZMA_DAWN_WINGS, @@ -48319,9 +48319,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_DRAGON }, .catchRate = 255, .expYield = 339, - .evYield_Attack = 1, - .evYield_Speed = 1, - .evYield_SpAttack = 1, + .evYield_Attack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .abilities = { ABILITY_NEUROFORCE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_NECROZMA_ULTRA, @@ -48357,7 +48357,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_FAIRY }, \ .catchRate = 3, \ .expYield = 270, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -48419,8 +48419,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_GHOST }, .catchRate = 3, .expYield = 270, - .evYield_Attack = 2, - .evYield_Speed = 1, + .evYield_Attack = 2, + .evYield_Speed = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48471,7 +48471,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_POISON }, .catchRate = 45, .expYield = 189, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48520,7 +48520,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_POISON, TYPE_DRAGON }, .catchRate = 45, .expYield = 243, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48570,7 +48570,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_STEEL }, .catchRate = 30, .expYield = 257, - .evYield_Defense = 3, + .evYield_Defense = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48620,7 +48620,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_GHOST }, .catchRate = 30, .expYield = 257, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48670,7 +48670,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 3, .expYield = 270, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48719,7 +48719,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 3, .expYield = 135, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -48765,7 +48765,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, \ .catchRate = 3, \ .expYield = 270, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -48840,7 +48840,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -48888,7 +48888,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, .catchRate = 45, .expYield = 147, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -48934,7 +48934,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GRASS }, \ .catchRate = 45, \ .expYield = 265, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -49013,7 +49013,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -49061,7 +49061,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, .catchRate = 45, .expYield = 147, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -49107,7 +49107,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_FIRE }, \ .catchRate = 45, \ .expYield = 265, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -49187,7 +49187,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 62, - .evYield_Speed = 1, + .evYield_Speed = 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, @@ -49236,7 +49236,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 45, .expYield = 147, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -49282,7 +49282,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, \ .catchRate = 45, \ .expYield = 265, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -49361,7 +49361,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 55, - .evYield_HP = 1, + .evYield_HP = 1, .itemRare = ITEM_ORAN_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -49409,7 +49409,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 90, .expYield = 161, - .evYield_HP = 2, + .evYield_HP = 2, .itemRare = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -49459,7 +49459,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_FLYING }, .catchRate = 255, .expYield = 49, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -49507,7 +49507,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_FLYING }, .catchRate = 120, .expYield = 128, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -49555,7 +49555,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FLYING, TYPE_STEEL }, \ .catchRate = 45, \ .expYield = 248, \ - .evYield_Defense = 3, \ + .evYield_Defense = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50006,7 +50006,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 255, .expYield = 122, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -50054,7 +50054,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 127, .expYield = 172, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -50103,7 +50103,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 57, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -50149,7 +50149,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ROCK }, \ .catchRate = 75, \ .expYield = 170, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50228,7 +50228,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 255, .expYield = 54, - .evYield_HP = 1, + .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -50276,7 +50276,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 45, .expYield = 172, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -50325,7 +50325,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 255, .expYield = 48, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -50373,7 +50373,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FIRE }, .catchRate = 120, .expYield = 144, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -50419,7 +50419,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_FIRE }, \ .catchRate = 45, \ .expYield = 255, \ - .evYield_Defense = 3, \ + .evYield_Defense = 3, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 15, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50499,7 +50499,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DRAGON }, .catchRate = 255, .expYield = 52, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -50548,7 +50548,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DRAGON }, \ .catchRate = 45, \ .expYield = 170, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50625,7 +50625,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_DRAGON }, \ .catchRate = 45, \ .expYield = 170, \ - .evYield_HP = 2, \ + .evYield_HP = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50752,7 +50752,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, .catchRate = 255, .expYield = 63, - .evYield_Defense = 1, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -50798,7 +50798,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GROUND, TYPE_GROUND }, \ .catchRate = 120, \ .expYield = 179, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -50964,7 +50964,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 255, .expYield = 56, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51012,7 +51012,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_WATER }, .catchRate = 60, .expYield = 172, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51061,7 +51061,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_POISON }, .catchRate = 75, .expYield = 48, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -51109,7 +51109,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_POISON }, \ .catchRate = 45, \ .expYield = 176, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -51247,7 +51247,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_BUG }, .catchRate = 190, .expYield = 61, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51293,7 +51293,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIRE, TYPE_BUG }, \ .catchRate = 75, \ .expYield = 184, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -51373,7 +51373,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 180, .expYield = 62, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -51421,7 +51421,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 168, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -51468,7 +51468,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, \ .catchRate = 120, \ .expYield = 62, \ - .evYield_SpAttack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -51529,7 +51529,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, \ .catchRate = 60, \ .expYield = 178, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -51591,7 +51591,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 235, .expYield = 53, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51639,7 +51639,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_PSYCHIC }, .catchRate = 120, .expYield = 130, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51685,7 +51685,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_FAIRY }, \ .catchRate = 45, \ .expYield = 255, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_FEMALE, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -51764,7 +51764,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FAIRY }, .catchRate = 255, .expYield = 53, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51812,7 +51812,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FAIRY }, .catchRate = 120, .expYield = 130, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -51859,7 +51859,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_FAIRY }, \ .catchRate = 45, \ .expYield = 255, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_MALE, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -52142,7 +52142,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 45, .expYield = 165, - .evYield_Attack = 2, + .evYield_Attack = 2, .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -52190,7 +52190,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 75, .expYield = 152, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -52238,7 +52238,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_BUG }, .catchRate = 190, .expYield = 37, - .evYield_SpAttack = 1, + .evYield_SpAttack = 1, .itemRare = ITEM_SNOWBALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -52287,7 +52287,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_BUG }, .catchRate = 75, .expYield = 166, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -52337,7 +52337,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ROCK, TYPE_ROCK }, .catchRate = 60, .expYield = 165, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, @@ -52379,7 +52379,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, \ .catchRate = 60, \ .expYield = 165, \ - .evYield_Defense = 2, \ + .evYield_Defense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -52482,7 +52482,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpeed = 95, .baseSpAttack = 105, .baseSpDefense = 95, - .evYield_SpAttack = 2, + .evYield_SpAttack = 2, .genderRatio = MON_MALE, .abilities = { ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, .cryId = CRY_INDEEDEE_MALE, @@ -52542,7 +52542,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_DARK }, \ .catchRate = 180, \ .expYield = 153, \ - .evYield_Speed = 2, \ + .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 10, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -52614,7 +52614,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, .catchRate = 190, .expYield = 66, - .evYield_Attack = 1, + .evYield_Attack = 1, .itemRare = ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, @@ -52662,7 +52662,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_STEEL }, \ .catchRate = 90, \ .expYield = 175, \ - .evYield_Attack = 2, \ + .evYield_Attack = 2, \ .itemRare = ITEM_LAGGING_TAIL, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 25, \ @@ -52743,7 +52743,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_DRAGON }, .catchRate = 45, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -52792,7 +52792,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ICE }, .catchRate = 45, .expYield = 177, - .evYield_Attack = 2, + .evYield_Attack = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -52840,7 +52840,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_DRAGON }, .catchRate = 45, .expYield = 177, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -52889,7 +52889,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_WATER, TYPE_ICE }, .catchRate = 45, .expYield = 177, - .evYield_Defense = 2, + .evYield_Defense = 2, .genderRatio = MON_GENDERLESS, .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, @@ -52937,7 +52937,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_STEEL, TYPE_DRAGON }, \ .catchRate = 45, \ .expYield = 187, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 30, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -53016,7 +53016,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_GHOST }, .catchRate = 45, .expYield = 54, - .evYield_Speed = 1, + .evYield_Speed = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -53065,7 +53065,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_GHOST }, .catchRate = 45, .expYield = 144, - .evYield_Speed = 2, + .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -53113,7 +53113,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_GHOST }, .catchRate = 45, .expYield = 300, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, @@ -53154,7 +53154,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #if P_FAMILY_ZACIAN #define ZACIAN_MISC_INFO \ .catchRate = 10, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -53234,7 +53234,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #if P_FAMILY_ZAMAZENTA #define ZAMAZENTA_MISC_INFO \ .catchRate = 10, \ - .evYield_Speed = 3, \ + .evYield_Speed = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -53316,7 +53316,7 @@ const struct SpeciesInfo gSpeciesInfo[] = #define ETERNATUS_MISC_INFO \ .types = { TYPE_POISON, TYPE_DRAGON }, \ .catchRate = 255, \ - .evYield_HP = 3, \ + .evYield_HP = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -53410,7 +53410,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .catchRate = 3, .expYield = 77, - .evYield_Attack = 1, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -53459,7 +53459,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .baseSpDefense = 60, \ .catchRate = 3, \ .expYield = 275, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ .eggCycles = 120, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -53598,7 +53598,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DARK, TYPE_GRASS }, \ .catchRate = 3, \ .expYield = 300, \ - .evYield_Attack = 3, \ + .evYield_Attack = 3, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -53668,7 +53668,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ELECTRIC, TYPE_ELECTRIC }, .catchRate = 3, .expYield = 290, - .evYield_Speed = 3, + .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 35, @@ -53719,7 +53719,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_DRAGON, TYPE_DRAGON }, .catchRate = 3, .expYield = 290, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 35, @@ -53770,7 +53770,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_ICE, TYPE_ICE }, .catchRate = 3, .expYield = 290, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 35, @@ -53819,7 +53819,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 3, .expYield = 290, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 35, @@ -53877,7 +53877,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_GRASS }, .catchRate = 3, .expYield = 250, - .evYield_HP = 3, + .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -53923,7 +53923,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_ICE }, .catchRate = 3, .expYield = 340, - .evYield_Attack = 3, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -53966,7 +53966,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_PSYCHIC, TYPE_GHOST }, .catchRate = 3, .expYield = 340, - .evYield_SpAttack = 3, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -54004,7 +54004,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_FAIRY, TYPE_FLYING }, \ .catchRate = 3, \ .expYield = 116, \ - .evYield_SpAttack = 3, \ + .evYield_SpAttack = 3, \ .genderRatio = MON_FEMALE, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -59153,7 +59153,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GHOST }, \ .catchRate = 120, \ .expYield = 62, \ - .evYield_SpAttack = 1, \ + .evYield_SpAttack = 1, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ @@ -59212,7 +59212,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .types = { TYPE_GRASS, TYPE_GHOST }, \ .catchRate = 60, \ .expYield = 178, \ - .evYield_SpAttack = 2, \ + .evYield_SpAttack = 2, \ .genderRatio = MON_GENDERLESS, \ .eggCycles = 20, \ .friendship = STANDARD_FRIENDSHIP, \ diff --git a/src/pokedex.c b/src/pokedex.c index 377105610f..33b7dd02dd 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2434,15 +2434,15 @@ static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused) if (sPokedexView->dexMode == DEX_MODE_HOENN) dexNum = NationalToHoennOrder(dexNum); memcpy(text, sText_No0000, ARRAY_COUNT(sText_No0000)); - if (NATIONAL_DEX_COUNT > 999) + if (NATIONAL_DEX_COUNT > 999 && sPokedexView->dexMode != DEX_MODE_HOENN) { text[2] = CHAR_0 + dexNum / 1000; offset++; } - text[offset] = CHAR_0 + (dexNum % 1000) / 100; - text[offset + 1] = CHAR_0 + ((dexNum % 1000) % 100) / 10; - text[offset + 2] = CHAR_0 + ((dexNum % 1000) % 100) % 10; - text[offset + 3] = EOS; + text[offset++] = CHAR_0 + (dexNum % 1000) / 100; + text[offset++] = CHAR_0 + ((dexNum % 1000) % 100) / 10; + text[offset++] = CHAR_0 + ((dexNum % 1000) % 100) % 10; + text[offset++] = EOS; PrintMonDexNumAndName(0, FONT_NARROW, text, left, top); } diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 55078d0784..d5258362ab 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -2802,12 +2802,12 @@ static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused) if (NATIONAL_DEX_COUNT > 999 && sPokedexView->dexMode != DEX_MODE_HOENN) { text[0] = CHAR_0 + dexNum / 1000; - offset = 1; + offset++; } - text[offset] = CHAR_0 + (dexNum % 1000) / 100; - text[offset + 1] = CHAR_0 + ((dexNum % 1000) % 100) / 10; - text[offset + 2] = CHAR_0 + ((dexNum % 1000) % 100) % 10; - text[offset + 3] = EOS; + text[offset++] = CHAR_0 + (dexNum % 1000) / 100; + text[offset++] = CHAR_0 + ((dexNum % 1000) % 100) / 10; + text[offset++] = CHAR_0 + ((dexNum % 1000) % 100) % 10; + text[offset++] = EOS; PrintMonDexNumAndName(0, FONT_NARROW, text, left, top); } diff --git a/test/battle/move_effect/rage_fist.c b/test/battle/move_effect/rage_fist.c new file mode 100644 index 0000000000..7a09461a4f --- /dev/null +++ b/test/battle/move_effect/rage_fist.c @@ -0,0 +1,294 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_RAGE_FIST].effect == EFFECT_RAGE_FIST); + ASSUME(gBattleMoves[MOVE_RAGE_FIST].power == 50); +} + +SINGLE_BATTLE_TEST("Rage Fist base power is increased by 50 if the user takes damage") +{ + u8 turns; + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + for (turns = 0; turns < 2; turns++) { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_TACKLE); } + } + } SCENE { + for (turns = 0; turns < 2; turns++) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[turns]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + HP_BAR(player); + } + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(2.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is increased by each multi hit") +{ + u8 turns; + s16 timesGotHit[2]; + + GIVEN { + ASSUME(gBattleMoves[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + for (turns = 0; turns < 2; turns++) { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_BULLET_SEED); } + } + } SCENE { + for (turns = 0; turns < 2; turns++) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[turns]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_BULLET_SEED, opponent); + HP_BAR(player); + } + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(6.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is not increased by a confusion hit") +{ + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_CONFUSE_RAY); } + TURN {} + TURN { MOVE(player, MOVE_RAGE_FIST, WITH_RNG(RNG_CONFUSION, FALSE)); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent); + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, player); + MESSAGE("Wobbuffet became confused!"); + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, player); + MESSAGE("It hurt itself in its confusion!"); + HP_BAR(player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_EQ(timesGotHit[0], timesGotHit[1]); + } +} + +DOUBLE_BATTLE_TEST("Rage Fist maximum base power is 350") +{ + u16 turns; + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_REGIROCK); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + for (turns = 1; turns <= 3; turns++) { + TURN { + if (turns == 1) + MOVE(playerLeft, MOVE_RAGE_FIST, target: opponentLeft); + + MOVE(playerRight, MOVE_TACKLE, target: playerLeft); + MOVE(opponentLeft, MOVE_TACKLE, target: playerLeft); + MOVE(opponentRight, MOVE_TACKLE, target: playerLeft); + } + } + TURN { MOVE(playerLeft, MOVE_RAGE_FIST, target: opponentLeft); } + } SCENE { + for (turns = 1; turns <= 3; turns++) { + if (turns == 1) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, playerLeft); + HP_BAR(opponentLeft, captureDamage: ×GotHit[0]); + } + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, playerRight); + HP_BAR(playerLeft); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + HP_BAR(playerLeft); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight); + HP_BAR(playerLeft); + } + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, playerLeft); + HP_BAR(opponentLeft, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(7.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is not increased if a substitute was hit") +{ + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); } + TURN { MOVE(player, MOVE_SUBSTITUTE); MOVE(opponent, MOVE_CRUNCH); } + TURN { MOVE(player, MOVE_RAGE_FIST); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SUBSTITUTE, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CRUNCH, opponent); + MESSAGE("The SUBSTITUTE took damage for Wobbuffet!"); + MESSAGE("Wobbuffet's SUBSTITUTE faded!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_EQ(timesGotHit[0], timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is not lost if user switches out") +{ + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_TACKLE); } + TURN { SWITCH(player, 1); MOVE(opponent, MOVE_TACKLE); } + TURN { SWITCH(player, 0); } + TURN { MOVE(player, MOVE_RAGE_FIST); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + MESSAGE("Wobbuffet, that's enough! Come back!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + MESSAGE("Wynaut, that's enough! Come back!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(2.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is increased by 50 even if a damaging move does no damage - False Swipe") +{ + u8 turns; + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_REGIROCK); + } WHEN { + for (turns = 0; turns < 2; turns++) { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_FALSE_SWIPE); } + } + } SCENE { + for (turns = 0; turns < 2; turns++) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[turns]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FALSE_SWIPE, opponent); + HP_BAR(player); + } + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(2.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is increased by 50 even if a damaging move does no damage - Endure") +{ + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(2); } + OPPONENT(SPECIES_REGIROCK); + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_FALSE_SWIPE); } + TURN { MOVE(player, MOVE_ENDURE); MOVE(opponent, MOVE_TACKLE); } + TURN { MOVE(player, MOVE_RAGE_FIST); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FALSE_SWIPE, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ENDURE, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(3.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is not increased if move had no affect") +{ + u8 turns; + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_GASTLY); + OPPONENT(SPECIES_REGIROCK); + } WHEN { + for (turns = 0; turns < 2; turns++) { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_TACKLE); } + } + } SCENE { + for (turns = 0; turns < 2; turns++) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[turns]); + MESSAGE("Foe Regirock used Tackle!"); + MESSAGE("It doesn't affect Gastly…"); + } + } THEN { + EXPECT_EQ(timesGotHit[0], timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist base power is increased if Disguise breaks") +{ + s16 timesGotHit[2]; + + GIVEN { + PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); } + OPPONENT(SPECIES_REGIROCK); + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_ROCK_THROW); } + TURN { MOVE(player, MOVE_RAGE_FIST); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ROCK_THROW, opponent); + ABILITY_POPUP(player, ABILITY_DISGUISE); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(2.0), timesGotHit[1]); + } +} + +SINGLE_BATTLE_TEST("Rage Fist number of hits is copied by Transform") +{ + s16 timesGotHit[2]; + + // KNOWN_FAILING; // After Transform , wrong move is used by transformed mon + GIVEN { + PLAYER(SPECIES_REGIROCK); + OPPONENT(SPECIES_REGIROCK) { Moves(MOVE_RAGE_FIST, MOVE_CELEBRATE); } + } WHEN { + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_CELEBRATE); } + TURN { MOVE(player, MOVE_TRANSFORM); MOVE(opponent, MOVE_CELEBRATE); } + TURN { MOVE(player, MOVE_RAGE_FIST); MOVE(opponent, MOVE_CELEBRATE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TRANSFORM, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAGE_FIST, player); + HP_BAR(opponent, captureDamage: ×GotHit[1]); + } THEN { + EXPECT_MUL_EQ(timesGotHit[0], Q_4_12(2.0), timesGotHit[1]); + } +}