diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_switch_items.c | 6 | ||||
| -rw-r--r-- | src/battle_controller_link_opponent.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_link_partner.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_opponent.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_player.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_player_partner.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_recorded_opponent.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_recorded_player.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_wally.c | 2 | ||||
| -rw-r--r-- | src/battle_factory.c | 6 | ||||
| -rw-r--r-- | src/battle_factory_screen.c | 4 | ||||
| -rw-r--r-- | src/battle_main.c | 2 | ||||
| -rw-r--r-- | src/battle_pike.c | 8 | ||||
| -rw-r--r-- | src/battle_pyramid.c | 10 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 10 | ||||
| -rw-r--r-- | src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h | 320 | ||||
| -rw-r--r-- | src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h | 320 | ||||
| -rw-r--r-- | src/data/battle_frontier/trainer_hill.h | 384 | ||||
| -rw-r--r-- | src/field_specials.c | 2 | ||||
| -rw-r--r-- | src/pokemon.c | 32 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 8 | ||||
| -rw-r--r-- | src/trade.c | 2 |
22 files changed, 565 insertions, 565 deletions
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index de798eee3..4c6cccdab 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -93,7 +93,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) continue; GetMonData(&party[i], MON_DATA_SPECIES); // Unused return value. - GetMonData(&party[i], MON_DATA_ALT_ABILITY); // Unused return value. + GetMonData(&party[i], MON_DATA_ABILITY_NUM); // Unused return value. for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++) { @@ -197,7 +197,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); - if (GetMonData(&party[i], MON_DATA_ALT_ABILITY) != 0) + if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0) monAbility = gBaseStats[species].ability2; else monAbility = gBaseStats[species].ability1; @@ -392,7 +392,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); - if (GetMonData(&party[i], MON_DATA_ALT_ABILITY) != 0) + if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0) monAbility = gBaseStats[species].ability2; else monAbility = gBaseStats[species].ability1; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 3fb5da9dc..d3842e416 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -602,7 +602,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gEnemyParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gEnemyParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 6fc73a604..1c92aaaad 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -487,7 +487,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gPlayerParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 392811327..e096536c9 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -585,7 +585,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gEnemyParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gEnemyParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e4b5b5c18..b73bfc36f 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1628,7 +1628,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gPlayerParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 0ec21fd22..e625f24de 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -672,7 +672,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gPlayerParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 69d840020..b21d8288c 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -584,7 +584,7 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gEnemyParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gEnemyParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 95683225e..b59a4f25d 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -567,7 +567,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gPlayerParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 6a5b23e59..f7035540b 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -485,7 +485,7 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst) battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); - battleMon.altAbility = GetMonData(&gPlayerParty[monId], MON_DATA_ALT_ABILITY); + battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); StringCopy10(battleMon.nickname, nickname); diff --git a/src/battle_factory.c b/src/battle_factory.c index d08ffe6e6..1a150db1e 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -373,7 +373,7 @@ static void SetRentalsToOpponentParty(void) gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId = gUnknown_03006298[i]; gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL); gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityNum = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ABILITY_NUM, NULL); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[gUnknown_03006298[i]].itemTableId]); } } @@ -439,7 +439,7 @@ static void SetPlayerAndOpponentParties(void) SetMonMoveAvoidReturn(&gPlayerParty[i], gFacilityTrainerMons[monSetId].moves[k], k); SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); - SetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit); + SetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i].abilityNum); } } @@ -478,7 +478,7 @@ static void SetPlayerAndOpponentParties(void) for (k = 0; k < MAX_MON_MOVES; k++) SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monSetId].moves[k], k); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); - SetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit); + SetMonData(&gEnemyParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityNum); } break; } diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 02804ba0b..280b65dc8 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1742,7 +1742,7 @@ static void Select_CopyMonsToPlayerParty(void) gPlayerParty[i] = sFactorySelectScreen->mons[j].monData; gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId; gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i].abilityNum = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ABILITY_NUM, NULL); gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL); break; } @@ -2266,7 +2266,7 @@ static void CopySwappedMonData(void) gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].monId; gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].ivs; gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].abilityBit = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].abilityNum = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ABILITY_NUM, NULL); } static void Task_FromSwapScreenToSummaryScreen(u8 taskId) diff --git a/src/battle_main.c b/src/battle_main.c index 76bd6d877..b4c4bdf5c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3390,7 +3390,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1; gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; - gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility); + gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum); hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)]; *hpOnSwitchout = gBattleMons[gActiveBattler].hp; for (i = 0; i < NUM_BATTLE_STATS; i++) diff --git a/src/battle_pike.c b/src/battle_pike.c index cc58b81bb..c1dc77452 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1122,7 +1122,7 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate) u8 headerId = GetBattlePikeWildMonHeaderId(); u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; const struct PikeWildMon *const *const wildMons = sWildMons[lvlMode]; - u32 abilityBit; + u32 abilityNum; s32 pikeMonId = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL); pikeMonId = SpeciesToPikeMonId(pikeMonId); @@ -1153,10 +1153,10 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate) &gExperienceTables[gBaseStats[wildMons[headerId][pikeMonId].species].growthRate][monLevel]); if (gBaseStats[wildMons[headerId][pikeMonId].species].ability2) - abilityBit = Random() % 2; + abilityNum = Random() % 2; else - abilityBit = 0; - SetMonData(&gEnemyParty[0], MON_DATA_ALT_ABILITY, &abilityBit); + abilityNum = 0; + SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &abilityNum); for (i = 0; i < MAX_MON_MOVES; i++) SetMonMoveSlot(&gEnemyParty[0], wildMons[headerId][pikeMonId].moves[i], i); diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 34da3a25d..e73d2cea1 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -76,7 +76,7 @@ struct PyramidWildMon { u16 species; u8 lvl; - u8 abilityBit; + u8 abilityNum; u16 moves[4]; }; @@ -1401,23 +1401,23 @@ void GenerateBattlePyramidWildMon(void) MON_DATA_EXP, &gExperienceTables[gBaseStats[wildMons[id].species].growthRate][lvl]); - switch (wildMons[id].abilityBit) + switch (wildMons[id].abilityNum) { case 0: case 1: - SetMonData(&gEnemyParty[0], MON_DATA_ALT_ABILITY, &wildMons[id].abilityBit); + SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &wildMons[id].abilityNum); break; case 2: default: if (gBaseStats[wildMons[id].species].ability2) { i = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL) % 2; - SetMonData(&gEnemyParty[0], MON_DATA_ALT_ABILITY, &i); + SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &i); } else { i = 0; - SetMonData(&gEnemyParty[0], MON_DATA_ALT_ABILITY, &i); + SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &i); } break; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 837fb5bac..d79bfb0db 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4906,7 +4906,7 @@ static void atk4D_switchindataupdate(void) gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1; gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; - gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility); + gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum); // check knocked off item i = GetBattlerSide(gActiveBattler); @@ -8622,7 +8622,7 @@ static void atkAE_healpartystatus(void) for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); - u8 abilityBit = GetMonData(&party[i], MON_DATA_ALT_ABILITY); + u8 abilityNum = GetMonData(&party[i], MON_DATA_ABILITY_NUM); if (species != SPECIES_NONE && species != SPECIES_EGG) { @@ -8635,7 +8635,7 @@ static void atkAE_healpartystatus(void) && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) ability = gBattleMons[gActiveBattler].ability; else - ability = GetAbilityBySpecies(species, abilityBit); + ability = GetAbilityBySpecies(species, abilityNum); if (ability != ABILITY_SOUNDPROOF) toHeal |= (1 << i); @@ -9844,7 +9844,7 @@ static void atkE5_pickup(void) species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); - if (GetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY)) + if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)) ability = gBaseStats[species].ability2; else ability = gBaseStats[species].ability1; @@ -9867,7 +9867,7 @@ static void atkE5_pickup(void) species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); - if (GetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY)) + if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)) ability = gBaseStats[species].ability2; else ability = gBaseStats[species].ability1; diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h index 108b3a3b0..8b6810f88 100644 --- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -3,49 +3,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round1[] = { .species = SPECIES_PLUSLE, .lvl = 35, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} }, { .species = SPECIES_MINUN, .lvl = 35, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_PIKACHU, .lvl = 37, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_ELECTABUZZ, .lvl = 37, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} }, { .species = SPECIES_VILEPLUME, .lvl = 39, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MANECTRIC, .lvl = 39, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 40, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} }, { .species = SPECIES_JOLTEON, .lvl = 40, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} } }; @@ -55,49 +55,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round2[] = { .species = SPECIES_GULPIN, .lvl = 36, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ROSELIA, .lvl = 36, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} }, { .species = SPECIES_BUTTERFREE, .lvl = 38, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} }, { .species = SPECIES_SEVIPER, .lvl = 38, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} }, { .species = SPECIES_SKARMORY, .lvl = 40, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 40, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE} }, { .species = SPECIES_CROBAT, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} }, { .species = SPECIES_GENGAR, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -107,49 +107,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round3[] = { .species = SPECIES_GROWLITHE, .lvl = 37, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_VULPIX, .lvl = 37, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_MAGCARGO, .lvl = 39, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 39, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_WEEZING, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_DUSCLOPS, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} }, { .species = SPECIES_HOUNDOOM, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} } }; @@ -159,49 +159,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round4[] = { .species = SPECIES_DUNSPARCE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_BANETTE, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_DUSCLOPS, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} }, { .species = SPECIES_SHEDINJA, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -211,49 +211,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round5[] = { .species = SPECIES_HAUNTER, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} }, { .species = SPECIES_CHIMECHO, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} }, { .species = SPECIES_SOLROCK, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} }, { .species = SPECIES_MISDREAVUS, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} }, { .species = SPECIES_CLAYDOL, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} }, { .species = SPECIES_WEEZING, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_FLYGON, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} }, { .species = SPECIES_GENGAR, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} } }; @@ -263,49 +263,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round6[] = { .species = SPECIES_DIGLETT, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} }, { .species = SPECIES_TRAPINCH, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_WYNAUT, .lvl = 42, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT} }, { .species = SPECIES_DIGLETT, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC} }, { .species = SPECIES_TRAPINCH, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT} }, { .species = SPECIES_WYNAUT, .lvl = 44, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} }, { .species = SPECIES_WOBBUFFET, .lvl = 45, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} }, { .species = SPECIES_DUGTRIO, .lvl = 45, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT} } }; @@ -315,49 +315,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round7[] = { .species = SPECIES_GLALIE, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_PILOSWINE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_JYNX, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} }, { .species = SPECIES_CLOYSTER, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} } }; @@ -367,49 +367,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round8[] = { .species = SPECIES_WEEZING, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_ELECTRODE, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_GOLEM, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_PINECO, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_SOLROCK, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} } }; @@ -419,49 +419,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round9[] = { .species = SPECIES_WOBBUFFET, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} }, { .species = SPECIES_METANG, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} }, { .species = SPECIES_EXEGGUTOR, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} }, { .species = SPECIES_SLOWKING, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} }, { .species = SPECIES_XATU, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} }, { .species = SPECIES_ALAKAZAM, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} }, { .species = SPECIES_STARMIE, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_ESPEON, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} } }; @@ -471,49 +471,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round10[] = { .species = SPECIES_GOLEM, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_OMASTAR, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} }, { .species = SPECIES_LUNATONE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_CRADILY, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} } }; @@ -523,49 +523,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round11[] = { .species = SPECIES_POLIWRATH, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_HARIYAMA, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONCHAN, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONLEE, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_HERACROSS, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} }, { .species = SPECIES_MACHAMP, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} } }; @@ -575,49 +575,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round12[] = { .species = SPECIES_QUAGSIRE, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_TROPIUS, .lvl = 41, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_PUPITAR, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_CACTURNE, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 44, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 45, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} } }; @@ -627,49 +627,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round13[] = { .species = SPECIES_PINECO, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_VENOMOTH, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} }, { .species = SPECIES_SCIZOR, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} }, { .species = SPECIES_HERACROSS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} }, { .species = SPECIES_FORRETRESS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} } }; @@ -679,49 +679,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round14[] = { .species = SPECIES_SABLEYE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} }, { .species = SPECIES_CRAWDAUNT, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} }, { .species = SPECIES_CACTURNE, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} }, { .species = SPECIES_HOUNDOOM, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_UMBREON, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} } }; @@ -731,49 +731,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round15[] = { .species = SPECIES_OCTILLERY, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} }, { .species = SPECIES_PELIPPER, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_QUAGSIRE, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} }, { .species = SPECIES_SLOWKING, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} }, { .species = SPECIES_BLASTOISE, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} } }; @@ -783,49 +783,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round16[] = { .species = SPECIES_DUSKULL, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_HAUNTER, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} }, { .species = SPECIES_BANETTE, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} }, { .species = SPECIES_SABLEYE, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} }, { .species = SPECIES_DUSCLOPS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} }, { .species = SPECIES_GENGAR, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} } }; @@ -835,49 +835,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round17[] = { .species = SPECIES_MAWILE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_MAGNETON, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_SCIZOR, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SKARMORY, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} }, { .species = SPECIES_AGGRON, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_METAGROSS, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} } }; @@ -887,49 +887,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round18[] = { .species = SPECIES_DRAGONAIR, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_VIBRAVA, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} }, { .species = SPECIES_ALTARIA, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} }, { .species = SPECIES_FLYGON, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} }, { .species = SPECIES_KINGDRA, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_CHARIZARD, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} } }; @@ -939,49 +939,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round19[] = { .species = SPECIES_ARCANINE, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_POLIWRATH, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_RAICHU, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_VAPOREON, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_JOLTEON, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} } }; @@ -991,49 +991,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round20[] = { .species = SPECIES_KANGASKHAN, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} }, { .species = SPECIES_SWELLOW, .lvl = 42, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_URSARING, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} }, { .species = SPECIES_PORYGON2, .lvl = 46, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} }, { .species = SPECIES_TAUROS, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} }, { .species = SPECIES_FEAROW, .lvl = 48, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} }, { .species = SPECIES_SNORLAX, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} }, { .species = SPECIES_SLAKING, .lvl = 50, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} } }; diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h index 10435d767..24f559492 100644 --- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -3,49 +3,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round1[] = { .species = SPECIES_PLUSLE, .lvl = 15, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} }, { .species = SPECIES_MINUN, .lvl = 15, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_PIKACHU, .lvl = 13, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_ELECTABUZZ, .lvl = 13, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} }, { .species = SPECIES_VILEPLUME, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MANECTRIC, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} }, { .species = SPECIES_JOLTEON, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} } }; @@ -55,49 +55,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round2[] = { .species = SPECIES_GULPIN, .lvl = 14, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ROSELIA, .lvl = 14, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} }, { .species = SPECIES_BUTTERFREE, .lvl = 12, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} }, { .species = SPECIES_SEVIPER, .lvl = 12, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} }, { .species = SPECIES_SKARMORY, .lvl = 7, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 7, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE} }, { .species = SPECIES_CROBAT, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -107,49 +107,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round3[] = { .species = SPECIES_GROWLITHE, .lvl = 13, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_VULPIX, .lvl = 13, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_MAGCARGO, .lvl = 11, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 11, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_WEEZING, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_DUSCLOPS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} }, { .species = SPECIES_HOUNDOOM, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} } }; @@ -159,49 +159,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round4[] = { .species = SPECIES_DUNSPARCE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_BANETTE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_DUSCLOPS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -211,49 +211,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round5[] = { .species = SPECIES_HAUNTER, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} }, { .species = SPECIES_CHIMECHO, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} }, { .species = SPECIES_SOLROCK, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} }, { .species = SPECIES_CLAYDOL, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} }, { .species = SPECIES_WEEZING, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_FLYGON, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} } }; @@ -263,49 +263,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round6[] = { .species = SPECIES_DIGLETT, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} }, { .species = SPECIES_TRAPINCH, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_WYNAUT, .lvl = 8, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT} }, { .species = SPECIES_DIGLETT, .lvl = 8, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC} }, { .species = SPECIES_TRAPINCH, .lvl = 6, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT} }, { .species = SPECIES_WYNAUT, .lvl = 6, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} }, { .species = SPECIES_WOBBUFFET, .lvl = 5, - .abilityBit = 0, + .abilityNum = 0, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} }, { .species = SPECIES_DUGTRIO, .lvl = 5, - .abilityBit = 1, + .abilityNum = 1, .moves = {MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT} } }; @@ -315,49 +315,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round7[] = { .species = SPECIES_GLALIE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_PILOSWINE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_JYNX, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} }, { .species = SPECIES_CLOYSTER, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} } }; @@ -367,49 +367,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round8[] = { .species = SPECIES_WEEZING, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_ELECTRODE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_GOLEM, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_PINECO, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_SOLROCK, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} } }; @@ -419,49 +419,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round9[] = { .species = SPECIES_WOBBUFFET, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} }, { .species = SPECIES_METANG, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} }, { .species = SPECIES_EXEGGUTOR, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} }, { .species = SPECIES_SLOWKING, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} }, { .species = SPECIES_XATU, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} }, { .species = SPECIES_ALAKAZAM, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_ESPEON, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} } }; @@ -471,49 +471,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round10[] = { .species = SPECIES_GOLEM, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_OMASTAR, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} }, { .species = SPECIES_LUNATONE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_CRADILY, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} } }; @@ -523,49 +523,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round11[] = { .species = SPECIES_POLIWRATH, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_HARIYAMA, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONCHAN, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONLEE, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_HERACROSS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} }, { .species = SPECIES_MACHAMP, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} } }; @@ -575,49 +575,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round12[] = { .species = SPECIES_QUAGSIRE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_TROPIUS, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_PUPITAR, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_CACTURNE, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} } }; @@ -627,49 +627,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round13[] = { .species = SPECIES_PINECO, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_VENOMOTH, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} }, { .species = SPECIES_SCIZOR, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} }, { .species = SPECIES_HERACROSS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} }, { .species = SPECIES_FORRETRESS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} } }; @@ -679,49 +679,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round14[] = { .species = SPECIES_SABLEYE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} }, { .species = SPECIES_CRAWDAUNT, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} }, { .species = SPECIES_CACTURNE, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} }, { .species = SPECIES_HOUNDOOM, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_UMBREON, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} } }; @@ -731,49 +731,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round15[] = { .species = SPECIES_OCTILLERY, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} }, { .species = SPECIES_PELIPPER, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_QUAGSIRE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} }, { .species = SPECIES_SLOWKING, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} }, { .species = SPECIES_BLASTOISE, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} } }; @@ -783,49 +783,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round16[] = { .species = SPECIES_DUSKULL, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_HAUNTER, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} }, { .species = SPECIES_BANETTE, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} }, { .species = SPECIES_SABLEYE, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} }, { .species = SPECIES_DUSCLOPS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} } }; @@ -835,49 +835,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round17[] = { .species = SPECIES_MAWILE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_MAGNETON, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_SCIZOR, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SKARMORY, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} }, { .species = SPECIES_AGGRON, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_METAGROSS, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} } }; @@ -887,49 +887,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round18[] = { .species = SPECIES_DRAGONAIR, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_VIBRAVA, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} }, { .species = SPECIES_ALTARIA, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} }, { .species = SPECIES_FLYGON, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} }, { .species = SPECIES_KINGDRA, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_CHARIZARD, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} } }; @@ -939,49 +939,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round19[] = { .species = SPECIES_ARCANINE, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_POLIWRATH, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_RAICHU, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_VAPOREON, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_JOLTEON, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} } }; @@ -991,49 +991,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round20[] = { .species = SPECIES_KANGASKHAN, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} }, { .species = SPECIES_SWELLOW, .lvl = 10, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_URSARING, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} }, { .species = SPECIES_PORYGON2, .lvl = 8, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} }, { .species = SPECIES_TAUROS, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} }, { .species = SPECIES_FEAROW, .lvl = 6, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} }, { .species = SPECIES_SNORLAX, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} }, { .species = SPECIES_SLAKING, .lvl = 5, - .abilityBit = 2, + .abilityNum = 2, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} } }; diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h index ca0d623e9..64d216e4b 100644 --- a/src/data/battle_frontier/trainer_hill.h +++ b/src/data/battle_frontier/trainer_hill.h @@ -45,7 +45,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("MISDREAVUS"), .friendship = 255, @@ -68,7 +68,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("SOLROCK"), .friendship = 255, @@ -90,7 +90,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0xC, .nickname = _("CLAYDOL"), .friendship = 255, @@ -112,7 +112,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("WEEZING"), .friendship = 0, @@ -135,7 +135,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("LUNATONE"), .friendship = 255, @@ -157,7 +157,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 24, .spAttackIV = 24, .spDefenseIV = 24, - .altAbility = 0, + .abilityNum = 0, .personality = 0x83, .nickname = _("FLYGON"), .friendship = 255, @@ -191,7 +191,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("SEALEO"), .friendship = 255, @@ -212,7 +212,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("AMPHAROS"), .friendship = 255, @@ -233,7 +233,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x4E, .nickname = _("MACHOKE"), .friendship = 255, @@ -254,7 +254,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("FLAREON"), .friendship = 255, @@ -275,7 +275,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("MAGNETON"), .friendship = 255, @@ -297,7 +297,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x85, .nickname = _("PINSIR"), .friendship = 255, @@ -345,7 +345,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("MEDITITE"), .friendship = 255, @@ -367,7 +367,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 1, + .abilityNum = 1, .personality = 0x80, .nickname = _("HERACROSS"), .friendship = 255, @@ -389,7 +389,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("HITMONTOP"), .friendship = 255, @@ -411,7 +411,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 0, + .abilityNum = 0, .personality = 0x4E, .nickname = _("MACHOP"), .friendship = 255, @@ -433,7 +433,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("PINSIR"), .friendship = 255, @@ -455,7 +455,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 20, .spAttackIV = 20, .spDefenseIV = 20, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("HITMONCHAN"), .friendship = 255, @@ -490,7 +490,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("VULPIX"), .friendship = 255, @@ -512,7 +512,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("MINUN"), .friendship = 255, @@ -534,7 +534,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("ROSELIA"), .friendship = 255, @@ -556,7 +556,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x82, .nickname = _("MR. MIME"), .friendship = 255, @@ -578,7 +578,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x5, .nickname = _("PLUSLE"), .friendship = 255, @@ -600,7 +600,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x37, .nickname = _("TOGEPI"), .friendship = 255, @@ -648,7 +648,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x37, .nickname = _("VAPOREON"), .friendship = 0, @@ -670,7 +670,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x8A, .nickname = _("DODRIO"), .friendship = 0, @@ -692,7 +692,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x14, .nickname = _("OMASTAR"), .friendship = 255, @@ -714,7 +714,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8, .nickname = _("LICKITUNG"), .friendship = 255, @@ -736,7 +736,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x94, .nickname = _("SLOWBRO"), .friendship = 0, @@ -758,7 +758,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8, .nickname = _("LINOONE"), .friendship = 255, @@ -792,7 +792,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xCB, .nickname = _("SKITTY"), .friendship = 255, @@ -814,7 +814,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("MEDICHAM"), .friendship = 0, @@ -836,7 +836,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("STANTLER"), .friendship = 0, @@ -858,7 +858,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("NIDOQUEEN"), .friendship = 0, @@ -880,7 +880,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD7, .nickname = _("NINETALES"), .friendship = 255, @@ -902,7 +902,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("CHARIZARD"), .friendship = 255, @@ -949,7 +949,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x41, .nickname = _("ALAKAZAM"), .friendship = 255, @@ -971,7 +971,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("BLISSEY"), .friendship = 255, @@ -993,7 +993,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("GRUMPIG"), .friendship = 255, @@ -1014,7 +1014,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("GARDEVOIR"), .friendship = 255, @@ -1035,7 +1035,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("VENOMOTH"), .friendship = 255, @@ -1056,7 +1056,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("ESPEON"), .friendship = 255, @@ -1090,7 +1090,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("WEEZING"), .friendship = 255, @@ -1111,7 +1111,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("GLOOM"), .friendship = 255, @@ -1132,7 +1132,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("MUK"), .friendship = 255, @@ -1154,7 +1154,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x83, .nickname = _("TROPIUS"), .friendship = 255, @@ -1175,7 +1175,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x6, .nickname = _("BELLOSSOM"), .friendship = 255, @@ -1197,7 +1197,7 @@ static const struct TrHillTag sDataTagNormal = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x1F, .nickname = _("MEGANIUM"), .friendship = 255, @@ -1257,7 +1257,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x8A, .nickname = _("DELIBIRD"), .friendship = 255, @@ -1278,7 +1278,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("CLEFAIRY"), .friendship = 255, @@ -1299,7 +1299,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("PIKACHU"), .friendship = 255, @@ -1320,7 +1320,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x8A, .nickname = _("MARILL"), .friendship = 255, @@ -1341,7 +1341,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("JIGGLYPUFF"), .friendship = 255, @@ -1362,7 +1362,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x26, .nickname = _("TOGETIC"), .friendship = 255, @@ -1396,7 +1396,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xC1, .nickname = _("WIGGLYTUFF"), .friendship = 255, @@ -1417,7 +1417,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x87, .nickname = _("SABLEYE"), .friendship = 255, @@ -1438,7 +1438,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("GRUMPIG"), .friendship = 255, @@ -1459,7 +1459,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x12, .nickname = _("CORSOLA"), .friendship = 255, @@ -1480,7 +1480,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("CLAMPERL"), .friendship = 255, @@ -1501,7 +1501,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("STARMIE"), .friendship = 255, @@ -1552,7 +1552,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("JIGGLYPUFF"), .friendship = 255, @@ -1577,7 +1577,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("JYNX"), .friendship = 255, @@ -1602,7 +1602,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x96, .nickname = _("EXPLOUD"), .friendship = 255, @@ -1627,7 +1627,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x96, .nickname = _("ABSOL"), .friendship = 255, @@ -1652,7 +1652,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x96, .nickname = _("PIDGEOTTO"), .friendship = 255, @@ -1677,7 +1677,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("ALTARIA"), .friendship = 255, @@ -1712,7 +1712,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("CHIMECHO"), .friendship = 255, @@ -1734,7 +1734,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("WHISMUR"), .friendship = 255, @@ -1756,7 +1756,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8A, .nickname = _("YANMA"), .friendship = 255, @@ -1778,7 +1778,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("ILLUMISE"), .friendship = 255, @@ -1800,7 +1800,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("SPHEAL"), .friendship = 255, @@ -1822,7 +1822,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x87, .nickname = _("VIGOROTH"), .friendship = 255, @@ -1870,7 +1870,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("WOOPER"), .friendship = 255, @@ -1892,7 +1892,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x3, .nickname = _("POLIWAG"), .friendship = 255, @@ -1914,7 +1914,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("PSYDUCK"), .friendship = 255, @@ -1936,7 +1936,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x96, .nickname = _("RHYDON"), .friendship = 0, @@ -1958,7 +1958,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("RHYHORN"), .friendship = 0, @@ -1980,7 +1980,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x80, .nickname = _("CUBONE"), .friendship = 0, @@ -2015,7 +2015,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("MAGNEMITE"), .friendship = 255, @@ -2037,7 +2037,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x41, .nickname = _("ELECTABUZZ"), .friendship = 255, @@ -2058,7 +2058,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("FLAAFFY"), .friendship = 255, @@ -2080,7 +2080,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("BALTOY"), .friendship = 0, @@ -2102,7 +2102,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("PINECO"), .friendship = 0, @@ -2124,7 +2124,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("VOLTORB"), .friendship = 0, @@ -2171,7 +2171,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 31, .spAttackIV = 30, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x202, .nickname = _("UNOWN"), .friendship = 255, @@ -2192,7 +2192,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 30, .spAttackIV = 30, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x10001, .nickname = _("UNOWN"), .friendship = 255, @@ -2213,7 +2213,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 30, .spAttackIV = 30, .spDefenseIV = 30, - .altAbility = 0, + .abilityNum = 0, .personality = 0x102, .nickname = _("UNOWN"), .friendship = 255, @@ -2235,7 +2235,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x88FE980F, .nickname = _("SPINDA"), .friendship = 255, @@ -2256,7 +2256,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("PLUSLE"), .friendship = 255, @@ -2277,7 +2277,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("VOLBEAT"), .friendship = 255, @@ -2312,7 +2312,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xE2880098, .nickname = _("SPINDA"), .friendship = 255, @@ -2333,7 +2333,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("MINUN"), .friendship = 255, @@ -2354,7 +2354,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("ILLUMISE"), .friendship = 255, @@ -2375,7 +2375,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 30, .spAttackIV = 30, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x302, .nickname = _("UNOWN"), .friendship = 255, @@ -2396,7 +2396,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 31, .spAttackIV = 30, .spDefenseIV = 30, - .altAbility = 0, + .abilityNum = 0, .personality = 0x203, .nickname = _("UNOWN"), .friendship = 255, @@ -2417,7 +2417,7 @@ static const struct TrHillTag sDataTagVariety = .speedIV = 30, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x301, .nickname = _("UNOWN"), .friendship = 255, @@ -2478,7 +2478,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("SUNFLORA"), .friendship = 255, @@ -2499,7 +2499,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x91, .nickname = _("TANGELA"), .friendship = 255, @@ -2523,7 +2523,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x1F, .nickname = _("VENUSAUR"), .friendship = 255, @@ -2544,7 +2544,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("LANTURN"), .friendship = 255, @@ -2565,7 +2565,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("MANECTRIC"), .friendship = 255, @@ -2586,7 +2586,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("RAIKOU"), .friendship = 255, @@ -2621,7 +2621,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x2F, .nickname = _("RELICANTH"), .friendship = 255, @@ -2642,7 +2642,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("GOLDUCK"), .friendship = 255, @@ -2663,7 +2663,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("BLASTOISE"), .friendship = 255, @@ -2684,7 +2684,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x93, .nickname = _("MAGCARGO"), .friendship = 255, @@ -2705,7 +2705,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("RAPIDASH"), .friendship = 255, @@ -2726,7 +2726,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("MOLTRES"), .friendship = 255, @@ -2774,7 +2774,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8A, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2796,7 +2796,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x87, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2818,7 +2818,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2840,7 +2840,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2862,7 +2862,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2884,7 +2884,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8A, .nickname = _("SMEARGLE"), .friendship = 255, @@ -2919,7 +2919,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 1, + .abilityNum = 1, .personality = 0xA, .nickname = _("STARYU"), .friendship = 255, @@ -2941,7 +2941,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD, .nickname = _("MEOWTH"), .friendship = 255, @@ -2963,7 +2963,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("BLAZIKEN"), .friendship = 255, @@ -2985,7 +2985,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 1, + .abilityNum = 1, .personality = 0x16, .nickname = _("CUBONE"), .friendship = 255, @@ -3006,7 +3006,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8A, .nickname = _("BEEDRILL"), .friendship = 255, @@ -3028,7 +3028,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 5, .spAttackIV = 5, .spDefenseIV = 5, - .altAbility = 1, + .abilityNum = 1, .personality = 0xD, .nickname = _("RATICATE"), .friendship = 255, @@ -3076,7 +3076,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 25, .spAttackIV = 25, .spDefenseIV = 25, - .altAbility = 0, + .abilityNum = 0, .personality = 0x32, .nickname = _("CHARMELEON"), .friendship = 100, @@ -3097,7 +3097,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 25, .spAttackIV = 25, .spDefenseIV = 25, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("WARTORTLE"), .friendship = 100, @@ -3119,7 +3119,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 25, .spAttackIV = 25, .spDefenseIV = 25, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("IVYSAUR"), .friendship = 100, @@ -3141,7 +3141,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 25, .spAttackIV = 25, .spDefenseIV = 25, - .altAbility = 0, + .abilityNum = 0, .personality = 0x32, .nickname = _("BAYLEEF"), .friendship = 100, @@ -3163,7 +3163,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 25, .spAttackIV = 25, .spDefenseIV = 25, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("CROCONAW"), .friendship = 100, @@ -3185,7 +3185,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("QUILAVA"), .friendship = 100, @@ -3220,7 +3220,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x32, .nickname = _("SMOOCHUM"), .friendship = 50, @@ -3242,7 +3242,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xC8, .nickname = _("AZURILL"), .friendship = 50, @@ -3264,7 +3264,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("ELEKID"), .friendship = 50, @@ -3286,7 +3286,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("CLEFFA"), .friendship = 50, @@ -3308,7 +3308,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x84, .nickname = _("WYNAUT"), .friendship = 50, @@ -3330,7 +3330,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("MAGBY"), .friendship = 50, @@ -3378,7 +3378,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("SUDOWOODO"), .friendship = 255, @@ -3399,7 +3399,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x8C, .nickname = _("SLOWKING"), .friendship = 255, @@ -3420,7 +3420,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("ENTEI"), .friendship = 255, @@ -3441,7 +3441,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("HITMONCHAN"), .friendship = 255, @@ -3462,7 +3462,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0x6, .nickname = _("MANTINE"), .friendship = 255, @@ -3483,7 +3483,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x18, .nickname = _("ZAPDOS"), .friendship = 255, @@ -3517,7 +3517,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("HITMONLEE"), .friendship = 255, @@ -3538,7 +3538,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("PORYGON2"), .friendship = 255, @@ -3559,7 +3559,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("SUICUNE"), .friendship = 255, @@ -3580,7 +3580,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("HOUNDOOM"), .friendship = 255, @@ -3601,7 +3601,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("STANTLER"), .friendship = 255, @@ -3622,7 +3622,7 @@ static const struct TrHillTag sDataTagUnique = .speedIV = 15, .spAttackIV = 15, .spDefenseIV = 15, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("ARTICUNO"), .friendship = 255, @@ -3683,7 +3683,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x35, .nickname = _("SNORLAX"), .friendship = 255, @@ -3705,7 +3705,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("MILTANK"), .friendship = 255, @@ -3727,7 +3727,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x7F, .nickname = _("URSARING"), .friendship = 255, @@ -3749,7 +3749,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("SLAKING"), .friendship = 255, @@ -3771,7 +3771,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("KANGASKHAN"), .friendship = 255, @@ -3793,7 +3793,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("ZANGOOSE"), .friendship = 255, @@ -3828,7 +3828,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("SLOWKING"), .friendship = 255, @@ -3850,7 +3850,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x28, .nickname = _("ESPEON"), .friendship = 255, @@ -3872,7 +3872,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0xF, .nickname = _("STARMIE"), .friendship = 255, @@ -3894,7 +3894,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("GENGAR"), .friendship = 255, @@ -3916,7 +3916,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("GARDEVOIR"), .friendship = 255, @@ -3938,7 +3938,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("ALAKAZAM"), .friendship = 255, @@ -3986,7 +3986,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("SWELLOW"), .friendship = 255, @@ -4008,7 +4008,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("MACHAMP"), .friendship = 255, @@ -4030,7 +4030,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("URSARING"), .friendship = 255, @@ -4052,7 +4052,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("KINGLER"), .friendship = 255, @@ -4074,7 +4074,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("TYRANITAR"), .friendship = 255, @@ -4096,7 +4096,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x80, .nickname = _("DRAGONITE"), .friendship = 255, @@ -4131,7 +4131,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("JOLTEON"), .friendship = 255, @@ -4153,7 +4153,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xA, .nickname = _("ALAKAZAM"), .friendship = 255, @@ -4175,7 +4175,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0xA, .nickname = _("STARMIE"), .friendship = 255, @@ -4197,7 +4197,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x82, .nickname = _("DUSCLOPS"), .friendship = 255, @@ -4219,7 +4219,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xD2, .nickname = _("NINETALES"), .friendship = 255, @@ -4241,7 +4241,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x85, .nickname = _("BANETTE"), .friendship = 255, @@ -4289,7 +4289,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x94, .nickname = _("WOBBUFFET"), .friendship = 255, @@ -4311,7 +4311,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x85, .nickname = _("EXPLOUD"), .friendship = 0, @@ -4333,7 +4333,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("CROBAT"), .friendship = 255, @@ -4355,7 +4355,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0xD, .nickname = _("DUGTRIO"), .friendship = 255, @@ -4377,7 +4377,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x5, .nickname = _("ELECTRODE"), .friendship = 0, @@ -4399,7 +4399,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x14, .nickname = _("GENGAR"), .friendship = 255, @@ -4434,7 +4434,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x82, .nickname = _("LAPRAS"), .friendship = 0, @@ -4456,7 +4456,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8A, .nickname = _("ABSOL"), .friendship = 0, @@ -4478,7 +4478,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x0, .nickname = _("ALTARIA"), .friendship = 0, @@ -4500,7 +4500,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x14, .nickname = _("DEWGONG"), .friendship = 0, @@ -4522,7 +4522,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0x14, .nickname = _("POLITOED"), .friendship = 0, @@ -4544,7 +4544,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0x17, .nickname = _("MAROWAK"), .friendship = 0, @@ -4592,7 +4592,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("FORRETRESS"), .friendship = 255, @@ -4613,7 +4613,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 1, + .abilityNum = 1, .personality = 0xC, .nickname = _("ELECTRODE"), .friendship = 255, @@ -4634,7 +4634,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x7F, .nickname = _("EXEGGUTOR"), .friendship = 255, @@ -4656,7 +4656,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x93, .nickname = _("DUSCLOPS"), .friendship = 255, @@ -4677,7 +4677,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0xF, .nickname = _("NINETALES"), .friendship = 255, @@ -4698,7 +4698,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x96, .nickname = _("BANETTE"), .friendship = 255, @@ -4732,7 +4732,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x95, .nickname = _("SALAMENCE"), .friendship = 255, @@ -4753,7 +4753,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x8C, .nickname = _("GENGAR"), .friendship = 255, @@ -4774,7 +4774,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("GYARADOS"), .friendship = 255, @@ -4795,7 +4795,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x3, .nickname = _("GENGAR"), .friendship = 255, @@ -4817,7 +4817,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x14, .nickname = _("DUSCLOPS"), .friendship = 255, @@ -4839,7 +4839,7 @@ static const struct TrHillTag sDataTagExpert = .speedIV = 31, .spAttackIV = 31, .spDefenseIV = 31, - .altAbility = 0, + .abilityNum = 0, .personality = 0x85, .nickname = _("MISDREAVUS"), .friendship = 255, diff --git a/src/field_specials.c b/src/field_specials.c index 8bd990063..dd1ae2213 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1433,7 +1433,7 @@ void PutZigzagoonInPlayerParty(void) u16 monData; CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, 0x20, FALSE, 0, FALSE, 0); monData = TRUE; - SetMonData(&gPlayerParty[0], MON_DATA_ALT_ABILITY, &monData); + SetMonData(&gPlayerParty[0], MON_DATA_ABILITY_NUM, &monData); monData = MOVE_TACKLE; SetMonData(&gPlayerParty[0], MON_DATA_MOVE1, &monData); monData = MOVE_NONE; diff --git a/src/pokemon.c b/src/pokemon.c index 4479fa448..13aef7aed 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2251,7 +2251,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, if (gBaseStats[species].ability2) { value = personality & 1; - SetBoxMonData(boxMon, MON_DATA_ALT_ABILITY, &value); + SetBoxMonData(boxMon, MON_DATA_ABILITY_NUM, &value); } GiveBoxMonInitialMoveset(boxMon); @@ -2402,8 +2402,8 @@ void CreateBattleTowerMon(struct Pokemon *mon, struct BattleTowerPokemon *src) SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); - value = src->altAbility; - SetMonData(mon, MON_DATA_ALT_ABILITY, &value); + value = src->abilityNum; + SetMonData(mon, MON_DATA_ABILITY_NUM, &value); value = src->hpIV; SetMonData(mon, MON_DATA_HP_IV, &value); value = src->attackIV; @@ -2464,8 +2464,8 @@ void CreateBattleTowerMon2(struct Pokemon *mon, struct BattleTowerPokemon *src, SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); - value = src->altAbility; - SetMonData(mon, MON_DATA_ALT_ABILITY, &value); + value = src->abilityNum; + SetMonData(mon, MON_DATA_ABILITY_NUM, &value); value = src->hpIV; SetMonData(mon, MON_DATA_HP_IV, &value); value = src->attackIV; @@ -2580,7 +2580,7 @@ void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest) dest->speedIV = GetMonData(mon, MON_DATA_SPEED_IV, NULL); dest->spAttackIV = GetMonData(mon, MON_DATA_SPATK_IV, NULL); dest->spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL); - dest->altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY, NULL); + dest->abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM, NULL); dest->personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); GetMonData(mon, MON_DATA_NICKNAME, dest->nickname); } @@ -3842,8 +3842,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) case MON_DATA_IS_EGG: retVal = substruct3->isEgg; break; - case MON_DATA_ALT_ABILITY: - retVal = substruct3->altAbility; + case MON_DATA_ABILITY_NUM: + retVal = substruct3->abilityNum; break; case MON_DATA_COOL_RIBBON: retVal = substruct3->coolRibbon; @@ -4221,8 +4221,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) else boxMon->isEgg = 0; break; - case MON_DATA_ALT_ABILITY: - SET8(substruct3->altAbility); + case MON_DATA_ABILITY_NUM: + SET8(substruct3->abilityNum); break; case MON_DATA_COOL_RIBBON: SET8(substruct3->coolRibbon); @@ -4429,9 +4429,9 @@ u8 GetMonsStateToDoubles_2(void) return (aliveCount > 1) ? PLAYER_HAS_TWO_USABLE_MONS : PLAYER_HAS_ONE_USABLE_MON; } -u8 GetAbilityBySpecies(u16 species, bool8 altAbility) +u8 GetAbilityBySpecies(u16 species, bool8 abilityNum) { - if (altAbility) + if (abilityNum) gLastUsedAbility = gBaseStats[species].ability2; else gLastUsedAbility = gBaseStats[species].ability1; @@ -4442,8 +4442,8 @@ u8 GetAbilityBySpecies(u16 species, bool8 altAbility) u8 GetMonAbility(struct Pokemon *mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); - u8 altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY, NULL); - return GetAbilityBySpecies(species, altAbility); + u8 abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM, NULL); + return GetAbilityBySpecies(species, abilityNum); } void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord) @@ -4586,11 +4586,11 @@ void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex) gBattleMons[battlerId].spAttack = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPATK, NULL); gBattleMons[battlerId].spDefense = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPDEF, NULL); gBattleMons[battlerId].isEgg = GetMonData(&gPlayerParty[partyIndex], MON_DATA_IS_EGG, NULL); - gBattleMons[battlerId].altAbility = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ALT_ABILITY, NULL); + gBattleMons[battlerId].abilityNum = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ABILITY_NUM, NULL); gBattleMons[battlerId].otId = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_ID, NULL); gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1; gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2; - gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].altAbility); + gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum); GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname); StringCopy10(gBattleMons[battlerId].nickname, nickname); GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2ec088628..79aac4b5e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -115,7 +115,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData u8 level; // 0x5 u8 ribbonCount; // 0x6 u8 ailment; // 0x7 - u8 altAbility; // 0x8 + u8 abilityNum; // 0x8 u8 metLocation; // 0x9 u8 metLevel; // 0xA u8 metGame; // 0xB @@ -1356,7 +1356,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) sum->species2 = GetMonData(mon, MON_DATA_SPECIES2); sum->exp = GetMonData(mon, MON_DATA_EXP); sum->level = GetMonData(mon, MON_DATA_LEVEL); - sum->altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY); + sum->abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM); sum->item = GetMonData(mon, MON_DATA_HELD_ITEM); sum->pid = GetMonData(mon, MON_DATA_PERSONALITY); sum->sanity = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG); @@ -3062,13 +3062,13 @@ static void PrintMonOTID(void) static void PrintMonAbilityName(void) { - u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility); + u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.abilityNum); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityNames[ability], 0, 1, 0, 1); } static void PrintMonAbilityDescription(void) { - u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility); + u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.abilityNum); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); } diff --git a/src/trade.c b/src/trade.c index d97325174..f7650ff03 100644 --- a/src/trade.c +++ b/src/trade.c @@ -5840,7 +5840,7 @@ static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) SetMonData(pokemon, MON_DATA_NICKNAME, inGameTrade->name); SetMonData(pokemon, MON_DATA_OT_NAME, inGameTrade->otName); SetMonData(pokemon, MON_DATA_OT_GENDER, &inGameTrade->otGender); - SetMonData(pokemon, MON_DATA_ALT_ABILITY, &inGameTrade->secondAbility); + SetMonData(pokemon, MON_DATA_ABILITY_NUM, &inGameTrade->secondAbility); SetMonData(pokemon, MON_DATA_BEAUTY, &inGameTrade->stats[1]); SetMonData(pokemon, MON_DATA_CUTE, &inGameTrade->stats[2]); SetMonData(pokemon, MON_DATA_COOL, &inGameTrade->stats[0]); |