diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_controller_opponent.c | 4 | ||||
| -rw-r--r-- | src/battle/battle_message.c | 4 | ||||
| -rw-r--r-- | src/battle_tower.c | 391 | ||||
| -rw-r--r-- | src/data/battle_tower/level_100_mons.h | 600 | ||||
| -rw-r--r-- | src/data/battle_tower/level_50_mons.h | 600 | ||||
| -rw-r--r-- | src/de_rom_8040FE0.c | 4 | ||||
| -rw-r--r-- | src/debug/unknown_debug_menu.c | 8 | ||||
| -rw-r--r-- | src/engine/mystery_event_script.c | 2 | ||||
| -rw-r--r-- | src/field/choose_party.c | 6 | ||||
| -rw-r--r-- | src/field/field_specials.c | 2 | ||||
| -rw-r--r-- | src/field/tv.c | 3 |
11 files changed, 813 insertions, 811 deletions
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index b6ada3b7b..09b6bf812 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1222,7 +1222,7 @@ void OpponentHandleTrainerThrow(void) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) trainerPicIndex = get_trainer_class_pic_index(); else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - trainerPicIndex = sub_8135FBC(); + trainerPicIndex = GetEReaderTrainerPicIndex(); else trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic; @@ -1252,7 +1252,7 @@ void OpponentHandleTrainerSlide(void) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) trainerPicIndex = get_trainer_class_pic_index(); else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - trainerPicIndex = sub_8135FBC(); + trainerPicIndex = GetEReaderTrainerPicIndex(); else trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic; diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index 9df153e0a..79855a614 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -632,7 +632,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[get_trainer_class_name_index()]; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - toCpy = gTrainerClassNames[sub_8135FD8()]; + toCpy = gTrainerClassNames[GetEReaderTrainerClassNameIndex()]; else toCpy = gTrainerClassNames[gTrainers[gTrainerBattleOpponent].trainerClass]; break; @@ -661,7 +661,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) } else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) { - sub_8135FF4(text); + SetEReaderTrainerName(text); toCpy = text; } else diff --git a/src/battle_tower.c b/src/battle_tower.c index ce928e33f..91e223216 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -31,7 +31,7 @@ #include "data/battle_tower/trainers_de.h" #endif -const u16 gBattleTowerHeldItems[] = { +static const u16 sBattleTowerHeldItems[] = { ITEM_NONE, ITEM_KINGS_ROCK, ITEM_SITRUS_BERRY, @@ -100,63 +100,63 @@ const u16 gBattleTowerHeldItems[] = { #include "data/battle_tower/level_50_mons.h" #include "data/battle_tower/level_100_mons.h" -const u8 gUnknown_08405E60[] = { - 4, - 7, - 8, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 23, - 29, - 32, - 34, - 36, - 38, - 39, - 41, - 43, - 45, - 46, - 47, - 53, - 56, - 64, - 66, - 72, - 73, +static const u8 sMaleTrainerClasses[] = { + TRAINER_CLASS_RUIN_MANIAC, + TRAINER_CLASS_TUBER_M, + TRAINER_CLASS_COOL_TRAINER_M, + TRAINER_CLASS_RICH_BOY, + TRAINER_CLASS_POKEMANIAC, + TRAINER_CLASS_SWIMMER_M, + TRAINER_CLASS_BLACK_BELT, + TRAINER_CLASS_GUITARIST, + TRAINER_CLASS_KINDLER, + TRAINER_CLASS_CAMPER, + TRAINER_CLASS_BUG_MANIAC, + TRAINER_CLASS_PSYCHIC_M, + TRAINER_CLASS_GENTLEMAN, + TRAINER_CLASS_SCHOOL_KID_M, + TRAINER_CLASS_POKEFAN_M, + TRAINER_CLASS_EXPERT_M, + TRAINER_CLASS_YOUNGSTER, + TRAINER_CLASS_FISHERMAN, + TRAINER_CLASS_CYCLING_TRIATHLETE_M, + TRAINER_CLASS_RUNNING_TRIATHLETE_M, + TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + TRAINER_CLASS_DRAGON_TAMER, + TRAINER_CLASS_BIRD_KEEPER, + TRAINER_CLASS_NINJA_BOY, + TRAINER_CLASS_SAILOR, + TRAINER_CLASS_COLLECTOR, + TRAINER_CLASS_POKEMON_BREEDER_M, + TRAINER_CLASS_POKEMON_RANGER_M, + TRAINER_CLASS_BUG_CATCHER, + TRAINER_CLASS_HIKER, }; -const u8 gUnknown_08405E7E[] = { - 3, - 6, - 9, - 10, - 11, - 12, - 22, - 30, - 33, - 35, - 40, - 42, - 44, - 48, - 49, - 50, - 51, - 65, - 67, - 71, +static const u8 sFemaleTrainerClasses[] = { + TRAINER_CLASS_AROMA_LADY, + TRAINER_CLASS_TUBER_F, + TRAINER_CLASS_COOL_TRAINER_F, + TRAINER_CLASS_HEX_MANIAC, + TRAINER_CLASS_LADY, + TRAINER_CLASS_BEAUTY, + TRAINER_CLASS_PSYCHIC_F, + TRAINER_CLASS_SCHOOL_KID_F, + TRAINER_CLASS_POKEFAN_F, + TRAINER_CLASS_EXPERT_F, + TRAINER_CLASS_CYCLING_TRIATHLETE_F, + TRAINER_CLASS_RUNNING_TRIATHLETE_F, + TRAINER_CLASS_SWIMMING_TRIATHLETE_F, + TRAINER_CLASS_BATTLE_GIRL, + TRAINER_CLASS_PARASOL_LADY, + TRAINER_CLASS_SWIMMER_F, + TRAINER_CLASS_PICNICKER, + TRAINER_CLASS_POKEMON_BREEDER_F, + TRAINER_CLASS_POKEMON_RANGER_F, + TRAINER_CLASS_LASS, }; -const u8 gUnknown_08405E92[] = { +static const u8 sMaleTrainerGfxIds[] = { MAP_OBJ_GFX_HIKER, MAP_OBJ_GFX_TUBER_M, MAP_OBJ_GFX_MAN_4, @@ -189,7 +189,7 @@ const u8 gUnknown_08405E92[] = { MAP_OBJ_GFX_HIKER, }; -const u8 gUnknown_08405EB0[] = { +static const u8 sFemaleTrainerGfxIds[] = { MAP_OBJ_GFX_WOMAN_3, MAP_OBJ_GFX_TUBER_F, MAP_OBJ_GFX_WOMAN_7, @@ -212,7 +212,7 @@ const u8 gUnknown_08405EB0[] = { MAP_OBJ_GFX_LASS, }; -const u16 gBattleTowerBanlist[] = { +const u16 gBattleTowerBannedSpecies[] = { SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, @@ -227,7 +227,7 @@ const u16 gBattleTowerBanlist[] = { }; // Item prizes for battle tower streaks of 5 or fewer sets. -const u16 ShortStreakPrizes[] = { +/*static*/ const u16 sShortStreakPrizes[] = { ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, @@ -237,7 +237,7 @@ const u16 ShortStreakPrizes[] = { }; // Item prizes for battle tower streaks of greater than 5 sets. -const u16 LongStreakPrizes[] = { +/*static*/ const u16 sLongStreakPrizes[] = { ITEM_BRIGHT_POWDER, ITEM_WHITE_HERB, ITEM_QUICK_CLAW, @@ -249,35 +249,35 @@ const u16 LongStreakPrizes[] = { ITEM_CHOICE_BAND, }; +static void ResetBattleTowerStreak(u8 levelType); +static void ValidateBattleTowerRecordChecksums(void); +static void PrintEReaderTrainerFarewellMessage(void); +extern void SetBattleTowerTrainerGfxId(u8); +extern void sub_8135A3C(void); +static void sub_8135CFC(void); +static void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *); +static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); +static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer); +static void SetBattleTowerRecordChecksum(struct BattleTowerRecord *); +static void ClearBattleTowerRecord(struct BattleTowerRecord *); + +extern const u8 gUnknown_08400E23[]; +extern const u8 gUnknown_08400E29[]; extern const u8 gUnknown_08400E2C[]; +extern const u8 gUnknown_08400E2E[]; +extern const u8 gUnknown_08400E30[]; extern const u8 gUnknown_08400E32[]; extern const u8 gUnknown_08400E36[]; -extern void sub_81360D0(void); extern u16 gSpecialVar_0x8004; -extern u8 gUnknown_08400E23[]; -extern u8 gUnknown_08400E29[]; -extern u8 gUnknown_08400E2E[]; -extern u8 gUnknown_08400E30[]; - extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; extern u16 gTrainerBattleOpponent; extern u16 gBattleTypeFlags; extern u8 gSelectedOrderFromParty[]; -extern struct Pokemon gUnknown_030042FC[]; extern u8 gBattleOutcome; +extern struct Pokemon gUnknown_030042FC[]; extern struct BattlePokemon gBattleMons[]; -extern void ValidateBattleTowerRecordChecksums(void); -extern void sub_81349FC(u8); -extern void sub_8135A3C(void); -extern void sub_8135CFC(void); -extern void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *); -static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); -static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer); -static void SetBattleTowerRecordChecksum(struct BattleTowerRecord *); -static void ClearBattleTowerRecord(struct BattleTowerRecord *); - #define ewram160FB (ewram[0x160FB]) @@ -292,14 +292,14 @@ void sub_8134548(void) { case 0: default: - sub_813461C(levelType); + ResetBattleTowerStreak(levelType); if (!var1) { VarSet(VAR_0x4000, 5); } break; case 1: - sub_813461C(levelType); + ResetBattleTowerStreak(levelType); VarSet(VAR_0x4000, 1); var1++; break; @@ -330,14 +330,15 @@ void sub_8134548(void) ValidateBattleTowerRecordChecksums(); } -void sub_813461C(u8 levelType) +void ResetBattleTowerStreak(u8 levelType) { gSaveBlock2.battleTower.var_4AE[levelType] = 0; - gSaveBlock2.battleTower.curChallengeWins[levelType] = 1; - gSaveBlock2.battleTower.curStreakChallengesCompleted[levelType] = 1; + gSaveBlock2.battleTower.curChallengeBattleNum[levelType] = 1; + gSaveBlock2.battleTower.curStreakChallengesNum[levelType] = 1; } -u8 sub_8134650(u8 levelType, u16 b) +// Checks if the next trainer in Battle Tower should be the E-Reader trainer. +bool8 ShouldBattleEReaderTrainer(u8 levelType, u16 winStreak) { u8 trainerTeamLevel; u8 monLevel; @@ -348,11 +349,11 @@ u8 sub_8134650(u8 levelType, u16 b) numValid = 0; - sub_813601C(); + ValidateEReaderTrainer(); - if (gScriptResult != 0 || gSaveBlock2.battleTower.ereaderTrainer.var_2 != b) + if (gScriptResult != 0 || gSaveBlock2.battleTower.ereaderTrainer.winStreak != winStreak) { - return 0; + return FALSE; } trainerTeamLevel = 50; @@ -366,7 +367,7 @@ u8 sub_8134650(u8 levelType, u16 b) monLevel = gSaveBlock2.battleTower.ereaderTrainer.party[i].level; if (gSaveBlock2.battleTower.ereaderTrainer.party[i].level != trainerTeamLevel) { - return 0; + return FALSE; } CheckMonBattleTowerBanlist( @@ -385,7 +386,7 @@ u8 sub_8134650(u8 levelType, u16 b) bool8 sub_81346F4(void) { - s32 recordIndex, j; + s32 recordIndex, i; u8 battleTowerLevelType; u16 winStreak; bool8 retVal; @@ -395,27 +396,28 @@ bool8 sub_81346F4(void) numCandidates = 0; battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; - winStreak = sub_8135D3C(battleTowerLevelType); - if (sub_8134650(battleTowerLevelType, winStreak)) + winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType); + if (ShouldBattleEReaderTrainer(battleTowerLevelType, winStreak)) { - gSaveBlock2.battleTower.battleTowerTrainerId = 0xC8; + gSaveBlock2.battleTower.battleTowerTrainerId = 200; retVal = TRUE; } else { + // Check if one of the battle tower trainers from record mixing should be the next trainer. for (recordIndex = 0; recordIndex < 5; recordIndex++) { struct BattleTowerRecord *record = &gSaveBlock2.battleTower.records[recordIndex]; u32 recordHasData = 0; u32 checksum = 0; - for (j = 0; j < sizeof(struct BattleTowerRecord) / sizeof(u32) - 1; j++) + for (i = 0; i < sizeof(struct BattleTowerRecord) / sizeof(u32) - 1; i++) { - recordHasData |= ((u32 *)record)[j]; - checksum += ((u32 *)record)[j]; + recordHasData |= ((u32 *)record)[i]; + checksum += ((u32 *)record)[i]; } - if (gSaveBlock2.battleTower.records[recordIndex].var_2 == winStreak - && gSaveBlock2.battleTower.records[recordIndex].var_0 == battleTowerLevelType + if (gSaveBlock2.battleTower.records[recordIndex].winStreak == winStreak + && gSaveBlock2.battleTower.records[recordIndex].battleTowerLevelType == battleTowerLevelType && recordHasData && gSaveBlock2.battleTower.records[recordIndex].checksum == checksum) { @@ -443,24 +445,24 @@ bool8 sub_81346F4(void) // bool8 levelType = gSaveBlock2.battleTower.battleTowerLevelType; // if (sub_81346F4()) // { -// sub_81349FC(gSaveBlock2.battleTower.battleTowerTrainerId); -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeWins[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; +// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); +// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; // } // else // { // u16 var1; -// if (gSaveBlock2.battleTower.curStreakChallengesCompleted[levelType] > 7) +// if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] > 7) // { // while (1) // { // s32 i; // u32 temp = ((Random() & 0xFF) * 30) >> 8; // var1 = temp + 70; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeWins[levelType] - 1 && var1 != gSaveBlock2.battleTower.var_4C1[i]; i++) // TODO: [i + 1]??? +// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && var1 != gSaveBlock2.battleTower.var_4C1[i]; i++) // TODO: [i + 1]??? // { } -// if (i == gSaveBlock2.battleTower.curChallengeWins[levelType] - 1) +// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) // { // break; // } @@ -468,18 +470,18 @@ bool8 sub_81346F4(void) // } // else // { -// if (gSaveBlock2.battleTower.curChallengeWins[levelType] == 7) +// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7) // { // while (1) // { // s32 i; // u32 temp = ((Random() & 0xFF) * 5); -// u32 temp2 = (((gSaveBlock2.battleTower.curStreakChallengesCompleted[levelType] - 1) * 10) + 20); +// u32 temp2 = (((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10) + 20); // var1 = temp / 128 + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeWins[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // TODO: [i + 1]???? +// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // TODO: [i + 1]???? // { } -// if (i == gSaveBlock2.battleTower.curChallengeWins[levelType] - 1) +// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) // { // break; // } @@ -491,12 +493,12 @@ bool8 sub_81346F4(void) // { // s32 i; // u32 temp = ((Random() & 0xFF) * 320); -// u32 temp2 = ((gSaveBlock2.battleTower.curStreakChallengesCompleted[levelType] - 1) * 10); +// u32 temp2 = ((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10); // var1 = temp + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeWins[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) +// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // { } -// if (i == gSaveBlock2.battleTower.curChallengeWins[levelType] - 1) +// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) // { // break; // } @@ -505,11 +507,11 @@ bool8 sub_81346F4(void) // } // gSaveBlock2.battleTower.battleTowerTrainerId = var1; -// sub_81349FC(gSaveBlock2.battleTower.battleTowerTrainerId); +// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); -// if (gSaveBlock2.battleTower.curChallengeWins[levelType] < 7) +// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7) // { -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeWins[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; +// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; // } // } // } @@ -536,7 +538,7 @@ void sub_81347F8(void) ldr r2, _08134840 @ =0x00000564\n\ adds r4, r5, r2\n\ ldrb r0, [r4]\n\ - bl sub_81349FC\n\ + bl SetBattleTowerTrainerGfxId\n\ lsls r0, r6, 1\n\ movs r3, 0xAB\n\ lsls r3, 3\n\ @@ -748,7 +750,7 @@ _081349B6:\n\ ldr r2, _081349F4 @ =0x00000564\n\ adds r5, r4, r2\n\ ldrb r0, [r5]\n\ - bl sub_81349FC\n\ + bl SetBattleTowerTrainerGfxId\n\ movs r3, 0xAB\n\ lsls r3, 3\n\ adds r0, r4, r3\n\ @@ -778,7 +780,7 @@ _081349F8: .4byte 0x00000569\n\ .syntax divided\n"); } -void sub_81349FC(u8 trainerIndex) +void SetBattleTowerTrainerGfxId(u8 trainerIndex) { u32 i; u8 trainerClass; @@ -796,18 +798,18 @@ void sub_81349FC(u8 trainerIndex) trainerClass = gSaveBlock2.battleTower.ereaderTrainer.trainerClass; } - for (i = 0; i < 30 && gUnknown_08405E60[i] != trainerClass; i++); + for (i = 0; i < 30 && sMaleTrainerClasses[i] != trainerClass; i++); if (i != 30) { - u8 trainerObjectGfxId = gUnknown_08405E92[i]; + u8 trainerObjectGfxId = sMaleTrainerGfxIds[i]; VarSet(0x4010, trainerObjectGfxId); return; } - for (i = 0; i < 20 && gUnknown_08405E7E[i] != trainerClass; i++); + for (i = 0; i < 20 && sFemaleTrainerClasses[i] != trainerClass; i++); if (i != 20) { - u8 trainerObjectGfxId = gUnknown_08405EB0[i]; + u8 trainerObjectGfxId = sFemaleTrainerGfxIds[i]; VarSet(0x4010, trainerObjectGfxId); return; } @@ -815,9 +817,9 @@ void sub_81349FC(u8 trainerIndex) VarSet(0x4010, MAP_OBJ_GFX_BOY_1); } -void sub_8134AB4() +void SetEReaderTrainerGfxId() { - sub_81349FC(200); + SetBattleTowerTrainerGfxId(200); } // void sub_8134AC0(struct BattleTowerRecord *record) @@ -858,7 +860,7 @@ void sub_8134AB4() // i = 0; // while (i < 5) // { -// if (gSaveBlock2.battleTower.records[i].var_2 == 0) +// if (gSaveBlock2.battleTower.records[i].winStreak == 0) // { // if (i > 4) // { @@ -872,7 +874,7 @@ void sub_8134AB4() // i++; // } -// var1[0] = gSaveBlock2.battleTower.records[0].var_2; +// var1[0] = gSaveBlock2.battleTower.records[0].winStreak; // var2[0] = 0; // l++; @@ -881,13 +883,13 @@ void sub_8134AB4() // j = 0; // if (j < l) // { -// for (; gSaveBlock2.battleTower.records[i].var_2 <= var1[j]; j++) +// for (; gSaveBlock2.battleTower.records[i].winStreak <= var1[j]; j++) // { -// if (gSaveBlock2.battleTower.records[i].var_2 < var1[j]) +// if (gSaveBlock2.battleTower.records[i].winStreak < var1[j]) // { // j = 0; // l = 1; -// var1[0] = gSaveBlock2.battleTower.records[i].var_2; +// var1[0] = gSaveBlock2.battleTower.records[i].winStreak; // var2[0] = i; // break; // } @@ -896,7 +898,7 @@ void sub_8134AB4() // if (j == l) // { -// var1[l] = gSaveBlock2.battleTower.records[i].var_2; +// var1[l] = gSaveBlock2.battleTower.records[i].winStreak; // var2[l] = i; // l++; // } @@ -1329,7 +1331,7 @@ void FillBattleTowerTrainerParty(void) for (i = 0; i < partyIndex; i++) { if (GetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, NULL) != 0 - && GetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, NULL) == gBattleTowerHeldItems[battleTowerMons[battleMonIndex].item]) + && GetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, NULL) == sBattleTowerHeldItems[battleTowerMons[battleMonIndex].heldItem]) { break; } @@ -1368,7 +1370,7 @@ void FillBattleTowerTrainerParty(void) } SetMonData(&gEnemyParty[partyIndex], MON_DATA_FRIENDSHIP, &friendship); - SetMonData(&gEnemyParty[partyIndex], MON_DATA_HELD_ITEM, (u8 *)&gBattleTowerHeldItems[battleTowerMons[battleMonIndex].item]); + SetMonData(&gEnemyParty[partyIndex], MON_DATA_HELD_ITEM, (u8 *)&sBattleTowerHeldItems[battleTowerMons[battleMonIndex].heldItem]); // The pokemon was successfully added to the trainer's party, so it's safe to move on to // the next party slot. @@ -1383,9 +1385,9 @@ u32 CountBattleTowerBanlistCaught() s32 i; u32 numCaught = 0; - for (i = 0; gBattleTowerBanlist[i] != 0xFFFF; i++) + for (i = 0; gBattleTowerBannedSpecies[i] != 0xFFFF; i++) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleTowerBanlist[i]), FLAG_GET_CAUGHT)) + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleTowerBannedSpecies[i]), FLAG_GET_CAUGHT)) { numCaught++; } @@ -1463,16 +1465,16 @@ void CheckMonBattleTowerBanlist(u16 species, u16 heldItem, u16 hp, u8 battleTowe while (1) { - if (gBattleTowerBanlist[counter] == 0xFFFF) - goto EXIT2; + if (gBattleTowerBannedSpecies[counter] == 0xFFFF) + goto EXIT2; // Couldn't get the code to match without this GOTO - if (gBattleTowerBanlist[counter] == species) + if (gBattleTowerBannedSpecies[counter] == species) break; counter++; } - if (gBattleTowerBanlist[counter] != 0xFFFF) + if (gBattleTowerBannedSpecies[counter] != 0xFFFF) return; EXIT2: @@ -1527,9 +1529,9 @@ void CheckPartyBattleTowerBanlist(void) numBanlistCaught = CountBattleTowerBanlistCaught(); - for (i = 0; gBattleTowerBanlist[i] != 0xFFFF; i++) + for (i = 0; gBattleTowerBannedSpecies[i] != 0xFFFF; i++) { - counter = AppendBattleTowerBannedSpeciesName(gBattleTowerBanlist[i], counter, numBanlistCaught); + counter = AppendBattleTowerBannedSpeciesName(gBattleTowerBannedSpecies[i], counter, numBanlistCaught); } if (counter == 0) @@ -1553,24 +1555,24 @@ void CheckPartyBattleTowerBanlist(void) } } -void sub_813545C(u16 *easyChat) +void PrintBattleTowerTrainerMessage(u16 *easyChat) { sub_80EB544(gStringVar4, easyChat, 2, 3); } -void sub_8135474(void) +void PrintBattleTowerTrainerGreeting(void) { if (gSaveBlock2.battleTower.battleTowerTrainerId == 200) { - sub_813545C(gSaveBlock2.battleTower.ereaderTrainer.greeting.easyChat); + PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.greeting.easyChat); } else if (gSaveBlock2.battleTower.battleTowerTrainerId < 100) { - sub_813545C((u16 *)gBattleTowerTrainers[gSaveBlock2.battleTower.battleTowerTrainerId].greeting.easyChat); + PrintBattleTowerTrainerMessage((u16 *)gBattleTowerTrainers[gSaveBlock2.battleTower.battleTowerTrainerId].greeting.easyChat); } else { - sub_813545C(gSaveBlock2.battleTower.records[gSaveBlock2.battleTower.battleTowerTrainerId - 100].greeting.easyChat); + PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.records[gSaveBlock2.battleTower.battleTowerTrainerId - 100].greeting.easyChat); } } @@ -1591,7 +1593,7 @@ void sub_81354CC(void) } break; case 2: - sub_81360D0(); + PrintEReaderTrainerFarewellMessage(); break; } @@ -1673,10 +1675,10 @@ void sub_8135668(void) gSaveBlock2.battleTower.battleTowerLevelType = gSpecialVar_0x8005; break; case 2: - gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType] = gSpecialVar_0x8005; + gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] = gSpecialVar_0x8005; break; case 3: - gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType] = gSpecialVar_0x8005; + gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType] = gSpecialVar_0x8005; break; case 4: gSaveBlock2.battleTower.battleTowerTrainerId = gSpecialVar_0x8005; @@ -1698,21 +1700,21 @@ void sub_8135668(void) gSaveBlock2.battleTower.totalBattleTowerWins++; } - gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType]++; + gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]++; sub_8135A3C(); - gScriptResult = gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType]; + gScriptResult = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]; - gStringVar1[0] = gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType] + 0xA1; + gStringVar1[0] = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] + 0xA1; gStringVar1[1] = 0xFF; break; case 7: - if (gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType] < 1430) + if (gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType] < 1430) { - gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType]++; + gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]++; } sub_8135A3C(); - gScriptResult = gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType]; + gScriptResult = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]; break; case 8: gSaveBlock2.battleTower.unk_554 = gSpecialVar_0x8005; @@ -1725,14 +1727,14 @@ void sub_8135668(void) case 11: if (gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] != 3) { - sub_813461C(battleTowerLevelType); + ResetBattleTowerStreak(battleTowerLevelType); } break; case 12: gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = ewram160FB; break; case 13: - gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = sub_8135D3C(battleTowerLevelType); + gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = GetCurrentBattleTowerWinStreak(battleTowerLevelType); break; case 14: gSaveBlock2.battleTower.lastStreakLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1753,10 +1755,10 @@ void sub_81358A4(void) gScriptResult = gSaveBlock2.battleTower.battleTowerLevelType; break; case 2: - gScriptResult = gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType]; + gScriptResult = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]; break; case 3: - gScriptResult = gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType]; + gScriptResult = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]; break; case 4: gScriptResult = gSaveBlock2.battleTower.battleTowerTrainerId; @@ -1769,19 +1771,19 @@ void sub_81358A4(void) gScriptResult = gSaveBlock2.battleTower.unk_554; break; case 9: - gScriptResult = sub_8135D3C(battleTowerLevelType); + gScriptResult = GetCurrentBattleTowerWinStreak(battleTowerLevelType); break; case 10: SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, gSaveBlock2.battleTower.bestBattleTowerWinStreak); break; case 11: - sub_813461C(battleTowerLevelType); + ResetBattleTowerStreak(battleTowerLevelType); break; case 12: gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = ewram160FB; break; case 13: - gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = sub_8135D3C(battleTowerLevelType); + gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = GetCurrentBattleTowerWinStreak(battleTowerLevelType); break; case 14: gSaveBlock2.battleTower.lastStreakLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1805,7 +1807,7 @@ void sub_8135A14(void) void sub_8135A3C(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; - u16 winStreak = sub_8135D3C(battleTowerLevelType); + u16 winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType); if (gSaveBlock2.battleTower.recordWinStreaks[battleTowerLevelType] < winStreak) { @@ -1852,7 +1854,7 @@ void sub_8135A3C(void) lsls r4, 31\n\ lsrs r4, 31\n\ adds r0, r4, 0\n\ - bl sub_8135D3C\n\ + bl GetCurrentBattleTowerWinStreak\n\ lsls r0, 16\n\ lsrs r5, r0, 16\n\ lsls r4, 1\n\ @@ -1923,22 +1925,22 @@ void sub_8135AC4(void) if (gSaveBlock2.playerGender != MALE) { - trainerClass = gUnknown_08405E7E[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + trainerClass = sFemaleTrainerClasses[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + gSaveBlock2.playerTrainerId[2] + gSaveBlock2.playerTrainerId[3]) % 20u]; } else { - trainerClass = gUnknown_08405E60[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + trainerClass = sMaleTrainerClasses[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + gSaveBlock2.playerTrainerId[2] + gSaveBlock2.playerTrainerId[3]) % 30u]; } - playerRecord->var_0 = battleTowerLevelType; + playerRecord->battleTowerLevelType = battleTowerLevelType; playerRecord->trainerClass = trainerClass; copy_word_to_mem(playerRecord->trainerId, gSaveBlock2.playerTrainerId); StringCopy8(playerRecord->name, gSaveBlock2.playerName); - playerRecord->var_2 = sub_8135D3C(battleTowerLevelType); + playerRecord->winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType); for (i = 0; i < 6; i++) { @@ -1960,8 +1962,8 @@ void sub_8135BA0(void) if (gSpecialVar_0x8004 == 3 || gSpecialVar_0x8004 == 0) { - if (gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType] > 1 - || gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType] > 1) + if (gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType] > 1 + || gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] > 1) { sub_8135AC4(); } @@ -1981,7 +1983,7 @@ void sub_8135BA0(void) TrySavingData(EREADER_SAVE); } -void sub_8135C38(void) +void BattleTower_SoftReset(void) { DoSoftReset(); } @@ -2055,39 +2057,39 @@ void sub_8135CFC(void) } } -u16 sub_8135D3C(u8 battleTowerLevelType) +u16 GetCurrentBattleTowerWinStreak(u8 battleTowerLevelType) { - u16 var2 = ((gSaveBlock2.battleTower.curStreakChallengesCompleted[battleTowerLevelType] - 1) * 7 - 1) + gSaveBlock2.battleTower.curChallengeWins[battleTowerLevelType]; + u16 winStreak = ((gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType] - 1) * 7 - 1) + gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]; - if (var2 > 9999) + if (winStreak > 9999) { return 9999; } - return var2; + return winStreak; } #ifdef NONMATCHING -void sub_8135D84(void) +void DetermineBattleTowerPrize(void) { u16 prizeItem; struct SaveBlock2 *saveBlock = &gSaveBlock2; u8 battleTowerLevelType = saveBlock->battleTower.battleTowerLevelType; - if (saveBlock->battleTower.curStreakChallengesCompleted[battleTowerLevelType] - 1 > 5) + if (saveBlock->battleTower.curStreakChallengesNum[battleTowerLevelType] - 1 > 5) { - prizeItem = LongStreakPrizes[Random() % ARRAY_COUNT(LongStreakPrizes)]; + prizeItem = sLongStreakPrizes[Random() % ARRAY_COUNT(sLongStreakPrizes)]; } else { - prizeItem = ShortStreakPrizes[Random() % ARRAY_COUNT(ShortStreakPrizes)]; + prizeItem = sShortStreakPrizes[Random() % ARRAY_COUNT(sShortStreakPrizes)]; } saveBlock->battleTower.prizeItem = prizeItem; } #else __attribute__((naked)) -void sub_8135D84(void) +void DetermineBattleTowerPrize(void) { asm(".syntax unified\n\ push {r4,r5,lr}\n\ @@ -2106,7 +2108,7 @@ void sub_8135D84(void) cmp r0, 0x5\n\ ble _08135DC0\n\ bl Random\n\ - ldr r4, _08135DBC @ =LongStreakPrizes\n\ + ldr r4, _08135DBC @ =sLongStreakPrizes\n\ lsls r0, 16\n\ lsrs r0, 16\n\ movs r1, 0x9\n\ @@ -2115,10 +2117,10 @@ void sub_8135D84(void) _08135DB0: .4byte gSaveBlock2\n\ _08135DB4: .4byte 0x00000554\n\ _08135DB8: .4byte 0x0000055c\n\ -_08135DBC: .4byte LongStreakPrizes\n\ +_08135DBC: .4byte sLongStreakPrizes\n\ _08135DC0:\n\ bl Random\n\ - ldr r4, _08135DE8 @ =ShortStreakPrizes\n\ + ldr r4, _08135DE8 @ =sShortStreakPrizes\n\ lsls r0, 16\n\ lsrs r0, 16\n\ movs r1, 0x6\n\ @@ -2136,12 +2138,12 @@ _08135DCC:\n\ pop {r0}\n\ bx r0\n\ .align 2, 0\n\ -_08135DE8: .4byte ShortStreakPrizes\n\ +_08135DE8: .4byte sShortStreakPrizes\n\ .syntax divided\n"); } #endif // NONMATCHING -void sub_8135DEC(void) +void GiveBattleTowerPrize(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -2157,7 +2159,7 @@ void sub_8135DEC(void) } } -void sub_8135E50() +void AwardBattleTowerRibbons() { s32 i; u32 partyIndex; @@ -2173,7 +2175,7 @@ void sub_8135E50() gScriptResult = 0; - if (sub_8135D3C(battleTowerLevelType) > 55) + if (GetCurrentBattleTowerWinStreak(battleTowerLevelType) > 55) { for (i = 0; i < 3; i++) { @@ -2205,19 +2207,19 @@ void Debug_FillEReaderTrainerWithPlayerData(void) if (gSaveBlock2.playerGender != MALE) { - ereaderTrainer->trainerClass = gUnknown_08405E7E[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + ereaderTrainer->trainerClass = sFemaleTrainerClasses[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + gSaveBlock2.playerTrainerId[2] + gSaveBlock2.playerTrainerId[3]) % 20u]; } else { - ereaderTrainer->trainerClass = gUnknown_08405E60[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + ereaderTrainer->trainerClass = sMaleTrainerClasses[(gSaveBlock2.playerTrainerId[0] + gSaveBlock2.playerTrainerId[1] + gSaveBlock2.playerTrainerId[2] + gSaveBlock2.playerTrainerId[3]) % 30u]; } copy_word_to_mem(ereaderTrainer->trainerId, gSaveBlock2.playerTrainerId); StringCopy8(ereaderTrainer->name, gSaveBlock2.playerName); - ereaderTrainer->var_2 = 1; + ereaderTrainer->winStreak = 1; j = 7; for (i = 0; i < 6; i++) @@ -2236,29 +2238,30 @@ void Debug_FillEReaderTrainerWithPlayerData(void) SetEReaderTrainerChecksum(ereaderTrainer); } -u8 sub_8135FBC(void) +u8 GetEReaderTrainerPicIndex(void) { return gTrainerClassToPicIndex[gSaveBlock2.battleTower.ereaderTrainer.trainerClass]; } -u8 sub_8135FD8(void) +u8 GetEReaderTrainerClassNameIndex(void) { return gTrainerClassToNameIndex[gSaveBlock2.battleTower.ereaderTrainer.trainerClass]; } -void sub_8135FF4(u8 *text) +void SetEReaderTrainerName(u8 *trainerName) { s32 i; for (i = 0; i < 7; i++) { - text[i] = gSaveBlock2.battleTower.ereaderTrainer.name[i]; + trainerName[i] = gSaveBlock2.battleTower.ereaderTrainer.name[i]; } - text[i] = 0xFF; + trainerName[i] = 0xFF; } -void sub_813601C(void) +// Checks if the saved E-Reader trainer is valid. +void ValidateEReaderTrainer(void) { u32 i; u32 checksum; @@ -2313,12 +2316,12 @@ void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer) } } -void sub_81360C0(void) +void PrintEReaderTrainerGreeting(void) { - sub_813545C(gSaveBlock2.battleTower.ereaderTrainer.greeting.easyChat); + PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.greeting.easyChat); } -void sub_81360D0(void) +void PrintEReaderTrainerFarewellMessage(void) { if (gBattleOutcome == BATTLE_DREW) { @@ -2326,11 +2329,11 @@ void sub_81360D0(void) } else if (gBattleOutcome == BATTLE_WON) { - sub_813545C(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerWon.easyChat); + PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerWon.easyChat); } else { - sub_813545C(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerLost.easyChat); + PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerLost.easyChat); } } diff --git a/src/data/battle_tower/level_100_mons.h b/src/data/battle_tower/level_100_mons.h index fff34ff1f..4f2b711ee 100644 --- a/src/data/battle_tower/level_100_mons.h +++ b/src/data/battle_tower/level_100_mons.h @@ -2,7 +2,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = { { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0x42, .moves = { MOVE_SLASH, @@ -15,7 +15,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MIGHTYENA, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x41, .moves = { MOVE_BITE, @@ -28,7 +28,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BEAUTIFLY, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x41, .moves = { MOVE_GIGA_DRAIN, @@ -41,7 +41,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DUSTOX, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x41, .moves = { MOVE_PSYBEAM, @@ -54,7 +54,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LOMBRE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x03, .moves = { MOVE_ASTONISH, @@ -67,7 +67,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NUZLEAF, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x01, .moves = { MOVE_BULLET_SEED, @@ -80,7 +80,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWELLOW, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x42, .moves = { MOVE_AERIAL_ACE, @@ -93,7 +93,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_PELIPPER, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x02, .moves = { MOVE_SURF, @@ -106,7 +106,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x42, .moves = { MOVE_MACH_PUNCH, @@ -119,7 +119,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NINJASK, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0x41, .moves = { MOVE_SCRATCH, @@ -132,7 +132,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x01, .moves = { MOVE_BITE, @@ -145,7 +145,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAWILE, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x03, .moves = { MOVE_VICE_GRIP, @@ -158,7 +158,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NOSEPASS, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x01, .moves = { MOVE_ROCK_THROW, @@ -171,7 +171,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DELCATTY, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x42, .moves = { MOVE_DOUBLE_SLAP, @@ -184,7 +184,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x01, .moves = { MOVE_EMBER, @@ -197,7 +197,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_ORAN_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ORAN_BERRY, .teamFlags = 0x01, .moves = { MOVE_POISON_GAS, @@ -210,7 +210,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SANDSLASH, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0x03, .moves = { MOVE_SLASH, @@ -223,7 +223,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SPINDA, - .item = BATTLE_TOWER_ITEM_SILK_SCARF, + .heldItem = BATTLE_TOWER_ITEM_SILK_SCARF, .teamFlags = 0x42, .moves = { MOVE_UPROAR, @@ -236,7 +236,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x01, .moves = { MOVE_TICKLE, @@ -249,7 +249,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CACTURNE, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x01, .moves = { MOVE_POISON_STING, @@ -262,7 +262,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_JIGGLYPUFF, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x42, .moves = { MOVE_SING, @@ -275,7 +275,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MARILL, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x42, .moves = { MOVE_BUBBLE_BEAM, @@ -288,7 +288,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAGNETON, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0x01, .moves = { MOVE_THUNDER_SHOCK, @@ -301,7 +301,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CARVANHA, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x01, .moves = { MOVE_BITE, @@ -314,7 +314,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x03, .moves = { MOVE_THIEF, @@ -327,7 +327,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x02, .moves = { MOVE_EMBER, @@ -340,7 +340,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x42, .moves = { MOVE_SHOCK_WAVE, @@ -353,7 +353,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEALEO, - .item = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, + .heldItem = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, .teamFlags = 0x01, .moves = { MOVE_ICE_BALL, @@ -366,7 +366,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GRAVELER, - .item = BATTLE_TOWER_ITEM_HARD_STONE, + .heldItem = BATTLE_TOWER_ITEM_HARD_STONE, .teamFlags = 0x01, .moves = { MOVE_ROCK_THROW, @@ -379,7 +379,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHUPPET, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x03, .moves = { MOVE_NIGHT_SHADE, @@ -392,7 +392,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUVDISC, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_ATTRACT, @@ -405,7 +405,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LANTURN, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x0A, .moves = { MOVE_THUNDER_WAVE, @@ -418,7 +418,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CORSOLA, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_MIRROR_COAT, @@ -431,7 +431,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WAILMER, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x05, .moves = { MOVE_SURF, @@ -444,7 +444,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x05, .moves = { MOVE_TAKE_DOWN, @@ -457,7 +457,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DODRIO, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x05, .moves = { MOVE_FURY_ATTACK, @@ -470,7 +470,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x05, .moves = { MOVE_FURY_SWIPES, @@ -483,7 +483,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BELLOSSOM, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x0A, .moves = { MOVE_GIGA_DRAIN, @@ -496,7 +496,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TROPIUS, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x05, .moves = { MOVE_STOMP, @@ -509,7 +509,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SABLEYE, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x0A, .moves = { MOVE_NIGHT_SHADE, @@ -522,7 +522,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x03, .moves = { MOVE_SONIC_BOOM, @@ -535,7 +535,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x01, .moves = { MOVE_ACID, @@ -548,7 +548,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CLAYDOL, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0x05, .moves = { MOVE_ANCIENT_POWER, @@ -561,7 +561,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_PSYBEAM, @@ -574,7 +574,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CRAWDAUNT, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0x05, .moves = { MOVE_CRABHAMMER, @@ -587,7 +587,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEVIPER, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x01, .moves = { MOVE_POISON_TAIL, @@ -600,7 +600,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ZANGOOSE, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x05, .moves = { MOVE_FURY_CUTTER, @@ -613,7 +613,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x03, .moves = { MOVE_DRAGON_BREATH, @@ -626,7 +626,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ROSELIA, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x0A, .moves = { MOVE_LEECH_SEED, @@ -639,7 +639,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_VOLBEAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x09, .moves = { MOVE_SIGNAL_BEAM, @@ -652,7 +652,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ILLUMISE, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x09, .moves = { MOVE_CHARM, @@ -665,7 +665,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_MAGNET, + .heldItem = BATTLE_TOWER_ITEM_MAGNET, .teamFlags = 0x03, .moves = { MOVE_BITE, @@ -678,7 +678,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAWILE, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_CRUNCH, @@ -691,7 +691,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x05, .moves = { MOVE_ARM_THRUST, @@ -704,7 +704,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SKARMORY, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x01, .moves = { MOVE_STEEL_WING, @@ -717,7 +717,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TORKOAL, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x03, .moves = { MOVE_FIRE_SPIN, @@ -730,7 +730,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x05, .moves = { MOVE_THRASH, @@ -743,7 +743,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MIGHTYENA, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x05, .moves = { MOVE_CRUNCH, @@ -756,7 +756,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x06, .moves = { MOVE_SLASH, @@ -769,7 +769,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MASQUERAIN, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_TOXIC, @@ -782,7 +782,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x06, .moves = { MOVE_BULLET_SEED, @@ -795,7 +795,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x06, .moves = { MOVE_DOUBLE_KICK, @@ -808,7 +808,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x49, .moves = { MOVE_SURF, @@ -821,7 +821,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x49, .moves = { MOVE_DRAGON_BREATH, @@ -834,7 +834,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x49, .moves = { MOVE_SURF, @@ -847,7 +847,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CORSOLA, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x03, .moves = { MOVE_ANCIENT_POWER, @@ -860,7 +860,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x41, .moves = { MOVE_EARTHQUAKE, @@ -873,7 +873,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x06, .moves = { MOVE_MEGAHORN, @@ -886,7 +886,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GIRAFARIG, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x09, .moves = { MOVE_PSYCHIC, @@ -899,7 +899,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_XATU, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x09, .moves = { MOVE_PSYCHIC, @@ -912,7 +912,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DODRIO, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x03, .moves = { MOVE_DRILL_PECK, @@ -925,7 +925,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_VILEPLUME, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x89, .moves = { MOVE_POISON_POWDER, @@ -938,7 +938,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MEDICHAM, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x06, .moves = { MOVE_FOCUS_PUNCH, @@ -951,7 +951,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x06, .moves = { MOVE_SLASH, @@ -964,7 +964,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x4B, .moves = { MOVE_CONFUSE_RAY, @@ -977,7 +977,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHUPPET, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x43, .moves = { MOVE_GRUDGE, @@ -990,7 +990,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CASTFORM, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x82, .moves = { MOVE_WEATHER_BALL, @@ -1003,7 +1003,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x02, .moves = { MOVE_SURF, @@ -1016,7 +1016,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHARPEDO, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x01, .moves = { MOVE_CRUNCH, @@ -1029,7 +1029,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x06, .moves = { MOVE_EARTHQUAKE, @@ -1042,7 +1042,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TRAPINCH, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x09, .moves = { MOVE_TOXIC, @@ -1055,7 +1055,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUNATONE, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x43, .moves = { MOVE_PSYCHIC, @@ -1068,7 +1068,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SOLROCK, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x43, .moves = { MOVE_SOLAR_BEAM, @@ -1081,7 +1081,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BALTOY, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x43, .moves = { MOVE_PSYCHIC, @@ -1094,7 +1094,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CRAWDAUNT, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x06, .moves = { MOVE_CRABHAMMER, @@ -1107,7 +1107,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_ASPEAR_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ASPEAR_BERRY, .teamFlags = 0x06, .moves = { MOVE_EARTHQUAKE, @@ -1120,7 +1120,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEVIPER, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x09, .moves = { MOVE_POISON_TAIL, @@ -1133,7 +1133,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAGCARGO, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x89, .moves = { MOVE_FLAMETHROWER, @@ -1146,7 +1146,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_BLACK_BELT, + .heldItem = BATTLE_TOWER_ITEM_BLACK_BELT, .teamFlags = 0x09, .moves = { MOVE_KARATE_CHOP, @@ -1159,7 +1159,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWALOT, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x86, .moves = { MOVE_YAWN, @@ -1172,7 +1172,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0C, .moves = { MOVE_LEAF_BLADE, @@ -1185,7 +1185,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x0C, .moves = { MOVE_BLAZE_KICK, @@ -1198,7 +1198,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x4C, .moves = { MOVE_SURF, @@ -1211,7 +1211,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MIGHTYENA, - .item = BATTLE_TOWER_ITEM_BLACK_GLASSES, + .heldItem = BATTLE_TOWER_ITEM_BLACK_GLASSES, .teamFlags = 0x04, .moves = { MOVE_CRUNCH, @@ -1224,7 +1224,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x04, .moves = { MOVE_SLASH, @@ -1237,7 +1237,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BEAUTIFLY, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x08, .moves = { MOVE_GIGA_DRAIN, @@ -1250,7 +1250,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DUSTOX, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x08, .moves = { MOVE_PSYCHIC, @@ -1263,7 +1263,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x0C, .moves = { MOVE_FAKE_OUT, @@ -1276,7 +1276,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x0C, .moves = { MOVE_FRUSTRATION, @@ -1289,7 +1289,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWELLOW, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x88, .moves = { MOVE_FLY, @@ -1302,7 +1302,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_BLACK_GLASSES, + .heldItem = BATTLE_TOWER_ITEM_BLACK_GLASSES, .teamFlags = 0x4A, .moves = { MOVE_HYPNOSIS, @@ -1315,7 +1315,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x0C, .moves = { MOVE_DYNAMIC_PUNCH, @@ -1328,7 +1328,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_VIGOROTH, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x04, .moves = { MOVE_SLASH, @@ -1341,7 +1341,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NINJASK, - .item = BATTLE_TOWER_ITEM_SILVER_POWDER, + .heldItem = BATTLE_TOWER_ITEM_SILVER_POWDER, .teamFlags = 0x04, .moves = { MOVE_FURY_CUTTER, @@ -1354,7 +1354,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHEDINJA, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0xCA, .moves = { MOVE_CONFUSE_RAY, @@ -1367,7 +1367,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LOUDRED, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x04, .moves = { MOVE_HYPER_VOICE, @@ -1380,7 +1380,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x04, .moves = { MOVE_ARM_THRUST, @@ -1393,7 +1393,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x88, .moves = { MOVE_PSYCHIC, @@ -1406,7 +1406,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x88, .moves = { MOVE_CONFUSE_RAY, @@ -1419,7 +1419,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAWILE, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x04, .moves = { MOVE_CRUNCH, @@ -1432,7 +1432,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x45, .moves = { MOVE_METAL_CLAW, @@ -1445,7 +1445,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLEM, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0xC5, .moves = { MOVE_ROLLOUT, @@ -1458,7 +1458,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_MAGNET, + .heldItem = BATTLE_TOWER_ITEM_MAGNET, .teamFlags = 0x04, .moves = { MOVE_THUNDER, @@ -1471,7 +1471,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_VOLBEAT, - .item = BATTLE_TOWER_ITEM_SILVER_POWDER, + .heldItem = BATTLE_TOWER_ITEM_SILVER_POWDER, .teamFlags = 0x08, .moves = { MOVE_CONFUSE_RAY, @@ -1484,7 +1484,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ILLUMISE, - .item = BATTLE_TOWER_ITEM_SILVER_POWDER, + .heldItem = BATTLE_TOWER_ITEM_SILVER_POWDER, .teamFlags = 0x08, .moves = { MOVE_THUNDERBOLT, @@ -1497,7 +1497,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MASQUERAIN, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x88, .moves = { MOVE_GIGA_DRAIN, @@ -1510,7 +1510,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ROSELIA, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x08, .moves = { MOVE_PETAL_DANCE, @@ -1523,7 +1523,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DELCATTY, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x08, .moves = { MOVE_SING, @@ -1536,7 +1536,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEAKING, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x88, .moves = { MOVE_RAIN_DANCE, @@ -1549,7 +1549,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x8C, .moves = { MOVE_HYDRO_PUMP, @@ -1562,7 +1562,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWALOT, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x42, .moves = { MOVE_STOCKPILE, @@ -1575,7 +1575,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAGCARGO, - .item = BATTLE_TOWER_ITEM_ASPEAR_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ASPEAR_BERRY, .teamFlags = 0x41, .moves = { MOVE_ROCK_SLIDE, @@ -1588,7 +1588,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0xC3, .moves = { MOVE_SLUDGE_BOMB, @@ -1601,7 +1601,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SPINDA, - .item = BATTLE_TOWER_ITEM_SILK_SCARF, + .heldItem = BATTLE_TOWER_ITEM_SILK_SCARF, .teamFlags = 0x42, .moves = { MOVE_DIZZY_PUNCH, @@ -1614,7 +1614,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x03, .moves = { MOVE_DRAGON_CLAW, @@ -1627,7 +1627,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ZANGOOSE, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x03, .moves = { MOVE_CRUSH_CLAW, @@ -1640,7 +1640,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEVIPER, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x41, .moves = { MOVE_SWAGGER, @@ -1653,7 +1653,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x42, .moves = { MOVE_TOXIC, @@ -1666,7 +1666,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CACTURNE, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x41, .moves = { MOVE_NEEDLE_ARM, @@ -1679,7 +1679,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CLAYDOL, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x03, .moves = { MOVE_EARTHQUAKE, @@ -1692,7 +1692,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0xC1, .moves = { MOVE_SLUDGE_BOMB, @@ -1705,7 +1705,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WIGGLYTUFF, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0xC3, .moves = { MOVE_SING, @@ -1718,7 +1718,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_AZUMARILL, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0xC2, .moves = { MOVE_SURF, @@ -1731,7 +1731,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0xC3, .moves = { MOVE_THUNDERBOLT, @@ -1744,7 +1744,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x42, .moves = { MOVE_HYDRO_PUMP, @@ -1757,7 +1757,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x43, .moves = { MOVE_SKILL_SWAP, @@ -1770,7 +1770,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x43, .moves = { MOVE_CONFUSE_RAY, @@ -1783,7 +1783,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x41, .moves = { MOVE_SLASH, @@ -1796,7 +1796,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0xC2, .moves = { MOVE_FLAMETHROWER, @@ -1809,7 +1809,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_PIKACHU, - .item = BATTLE_TOWER_ITEM_LIGHT_BALL, + .heldItem = BATTLE_TOWER_ITEM_LIGHT_BALL, .teamFlags = 0xC2, .moves = { MOVE_THUNDER_WAVE, @@ -1822,7 +1822,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_VILEPLUME, - .item = BATTLE_TOWER_ITEM_ASPEAR_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ASPEAR_BERRY, .teamFlags = 0xC3, .moves = { MOVE_GIGA_DRAIN, @@ -1835,7 +1835,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DONPHAN, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x41, .moves = { MOVE_EARTHQUAKE, @@ -1848,7 +1848,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0xC3, .moves = { MOVE_CONFUSE_RAY, @@ -1861,7 +1861,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, + .heldItem = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, .teamFlags = 0x43, .moves = { MOVE_ICE_BEAM, @@ -1874,7 +1874,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RELICANTH, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x41, .moves = { MOVE_YAWN, @@ -1887,7 +1887,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x43, .moves = { MOVE_RAIN_DANCE, @@ -1900,7 +1900,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CRADILY, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x43, .moves = { MOVE_CONFUSE_RAY, @@ -1913,7 +1913,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ARMALDO, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x43, .moves = { MOVE_SLASH, @@ -1926,7 +1926,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x41, .moves = { MOVE_METAL_CLAW, @@ -1939,7 +1939,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x42, .moves = { MOVE_DRAGON_BREATH, @@ -1952,7 +1952,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MIGHTYENA, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x01, .moves = { MOVE_CRUNCH, @@ -1965,7 +1965,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x02, .moves = { MOVE_HYPER_BEAM, @@ -1978,7 +1978,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x03, .moves = { MOVE_SURF, @@ -1991,7 +1991,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_EXPLOUD, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x01, .moves = { MOVE_UPROAR, @@ -2004,7 +2004,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWELLOW, - .item = BATTLE_TOWER_ITEM_LANSAT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LANSAT_BERRY, .teamFlags = 0x02, .moves = { MOVE_FACADE, @@ -2017,7 +2017,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_PELIPPER, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x82, .moves = { MOVE_STOCKPILE, @@ -2030,7 +2030,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x01, .moves = { MOVE_DYNAMIC_PUNCH, @@ -2043,7 +2043,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHEDINJA, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x01, .moves = { MOVE_RETURN, @@ -2056,7 +2056,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_EXPLOUD, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x01, .moves = { MOVE_HYPER_BEAM, @@ -2069,7 +2069,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x01, .moves = { MOVE_CROSS_CHOP, @@ -2082,7 +2082,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x83, .moves = { MOVE_PSYCHIC, @@ -2095,7 +2095,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x81, .moves = { MOVE_CONFUSE_RAY, @@ -2108,7 +2108,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SABLEYE, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x83, .moves = { MOVE_TOXIC, @@ -2121,7 +2121,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAWILE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x02, .moves = { MOVE_CRUNCH, @@ -2134,7 +2134,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x01, .moves = { MOVE_DOUBLE_EDGE, @@ -2147,7 +2147,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLEM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x01, .moves = { MOVE_EARTHQUAKE, @@ -2160,7 +2160,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NOSEPASS, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x81, .moves = { MOVE_THUNDER_WAVE, @@ -2173,7 +2173,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x02, .moves = { MOVE_THUNDER, @@ -2186,7 +2186,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ROSELIA, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x82, .moves = { MOVE_GRASS_WHISTLE, @@ -2199,7 +2199,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DELCATTY, - .item = BATTLE_TOWER_ITEM_STARF_BERRY, + .heldItem = BATTLE_TOWER_ITEM_STARF_BERRY, .teamFlags = 0x02, .moves = { MOVE_ASSIST, @@ -2212,7 +2212,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TROPIUS, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0xC2, .moves = { MOVE_RAZOR_LEAF, @@ -2225,7 +2225,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWALOT, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x03, .moves = { MOVE_YAWN, @@ -2238,7 +2238,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_BLACK_BELT, + .heldItem = BATTLE_TOWER_ITEM_BLACK_BELT, .teamFlags = 0x01, .moves = { MOVE_CROSS_CHOP, @@ -2251,7 +2251,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x40, .moves = { MOVE_ERUPTION, @@ -2264,7 +2264,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MAGCARGO, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x03, .moves = { MOVE_FLAMETHROWER, @@ -2277,7 +2277,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WEEZING, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x81, .moves = { MOVE_WILL_O_WISP, @@ -2290,7 +2290,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SPINDA, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x82, .moves = { MOVE_TRICK, @@ -2303,7 +2303,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SKARMORY, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x01, .moves = { MOVE_DRILL_PECK, @@ -2316,7 +2316,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x02, .moves = { MOVE_SING, @@ -2329,7 +2329,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x82, .moves = { MOVE_PSYCHIC, @@ -2342,7 +2342,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x20, .moves = { MOVE_SWAGGER, @@ -2355,7 +2355,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CLAYDOL, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x20, .moves = { MOVE_COSMIC_POWER, @@ -2368,7 +2368,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x33, .moves = { MOVE_EARTHQUAKE, @@ -2381,7 +2381,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NOSEPASS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x20, .moves = { MOVE_ROCK_SLIDE, @@ -2394,7 +2394,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x33, .moves = { MOVE_SHADOW_PUNCH, @@ -2407,7 +2407,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SEAKING, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x20, .moves = { MOVE_HORN_DRILL, @@ -2420,7 +2420,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x73, .moves = { MOVE_EARTHQUAKE, @@ -2433,7 +2433,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LANTURN, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x13, .moves = { MOVE_THUNDERBOLT, @@ -2446,7 +2446,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WEEZING, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x33, .moves = { MOVE_SLUDGE_BOMB, @@ -2459,7 +2459,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x20, .moves = { MOVE_EARTHQUAKE, @@ -2472,7 +2472,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x51, .moves = { MOVE_DOUBLE_EDGE, @@ -2485,7 +2485,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x12, .moves = { MOVE_TRICK, @@ -2498,7 +2498,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHARPEDO, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x11, .moves = { MOVE_CRUNCH, @@ -2511,7 +2511,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x12, .moves = { MOVE_DOUBLE_EDGE, @@ -2524,7 +2524,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WAILORD, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x72, .moves = { MOVE_HYDRO_PUMP, @@ -2537,7 +2537,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x20, .moves = { MOVE_HYDRO_PUMP, @@ -2550,7 +2550,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SABLEYE, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x32, .moves = { MOVE_SHADOW_BALL, @@ -2563,7 +2563,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WOBBUFFET, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x20, .moves = { MOVE_ENCORE, @@ -2576,7 +2576,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x71, .moves = { MOVE_EARTHQUAKE, @@ -2589,7 +2589,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GLALIE, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x31, .moves = { MOVE_CRUNCH, @@ -2602,7 +2602,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x8C, .moves = { MOVE_LEAF_BLADE, @@ -2615,7 +2615,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x8C, .moves = { MOVE_BLAZE_KICK, @@ -2628,7 +2628,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x8C, .moves = { MOVE_SURF, @@ -2641,7 +2641,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x1A, .moves = { MOVE_PSYCHIC, @@ -2654,7 +2654,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x15, .moves = { MOVE_SPORE, @@ -2667,7 +2667,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x58, .moves = { MOVE_PSYCHIC, @@ -2680,7 +2680,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x15, .moves = { MOVE_CROSS_CHOP, @@ -2693,7 +2693,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x55, .moves = { MOVE_HYPER_BEAM, @@ -2706,7 +2706,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x58, .moves = { MOVE_SLUDGE_BOMB, @@ -2719,7 +2719,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x5D, .moves = { MOVE_CROSS_CHOP, @@ -2732,7 +2732,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x1A, .moves = { MOVE_THUNDERBOLT, @@ -2745,7 +2745,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x60, .moves = { MOVE_THUNDERBOLT, @@ -2758,7 +2758,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x64, .moves = { MOVE_SLUDGE_BOMB, @@ -2771,7 +2771,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x1C, .moves = { MOVE_DRAGON_CLAW, @@ -2784,7 +2784,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x5C, .moves = { MOVE_SURF, @@ -2797,7 +2797,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x4A, .moves = { MOVE_CONFUSE_RAY, @@ -2810,7 +2810,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x5A, .moves = { MOVE_THUNDERBOLT, @@ -2823,7 +2823,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x55, .moves = { MOVE_SURF, @@ -2836,7 +2836,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x5D, .moves = { MOVE_MEGAHORN, @@ -2849,7 +2849,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x26, .moves = { MOVE_SURF, @@ -2862,7 +2862,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x5B, .moves = { MOVE_SURF, @@ -2875,7 +2875,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x0D, .moves = { MOVE_DRAGON_CLAW, @@ -2888,7 +2888,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x3D, .moves = { MOVE_METEOR_MASH, @@ -2901,7 +2901,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x3C, .moves = { MOVE_EARTHQUAKE, @@ -2914,7 +2914,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x3C, .moves = { MOVE_ICE_BEAM, @@ -2927,7 +2927,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x3C, .moves = { MOVE_METAL_CLAW, @@ -2940,7 +2940,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x0E, .moves = { MOVE_MIST_BALL, @@ -2953,7 +2953,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x0D, .moves = { MOVE_LUSTER_PURGE, @@ -2966,7 +2966,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x1A, .moves = { MOVE_SURF, @@ -2979,7 +2979,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x15, .moves = { MOVE_YAWN, @@ -2992,7 +2992,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x8C, .moves = { MOVE_GIGA_DRAIN, @@ -3005,7 +3005,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x8C, .moves = { MOVE_BLAZE_KICK, @@ -3018,7 +3018,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x8C, .moves = { MOVE_MUDDY_WATER, @@ -3031,7 +3031,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0A, .moves = { MOVE_PSYCHIC, @@ -3044,7 +3044,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x05, .moves = { MOVE_SPORE, @@ -3057,7 +3057,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x58, .moves = { MOVE_PSYCHIC, @@ -3070,7 +3070,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x04, .moves = { MOVE_CROSS_CHOP, @@ -3083,7 +3083,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x44, .moves = { MOVE_HYPER_BEAM, @@ -3096,7 +3096,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x48, .moves = { MOVE_TOXIC, @@ -3109,7 +3109,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x5D, .moves = { MOVE_CROSS_CHOP, @@ -3122,7 +3122,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x0A, .moves = { MOVE_THUNDER, @@ -3135,7 +3135,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x60, .moves = { MOVE_THUNDERBOLT, @@ -3148,7 +3148,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x64, .moves = { MOVE_SLUDGE_BOMB, @@ -3161,7 +3161,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x1C, .moves = { MOVE_DRAGON_CLAW, @@ -3174,7 +3174,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x5C, .moves = { MOVE_BLIZZARD, @@ -3187,7 +3187,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_DODRIO, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x5A, .moves = { MOVE_DRILL_PECK, @@ -3200,7 +3200,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x4A, .moves = { MOVE_THUNDERBOLT, @@ -3213,7 +3213,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x45, .moves = { MOVE_HYDRO_PUMP, @@ -3226,7 +3226,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x5D, .moves = { MOVE_MEGAHORN, @@ -3239,7 +3239,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x26, .moves = { MOVE_SURF, @@ -3252,7 +3252,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x5C, .moves = { MOVE_HYDRO_PUMP, @@ -3265,7 +3265,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x1D, .moves = { MOVE_DRAGON_CLAW, @@ -3278,7 +3278,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x3D, .moves = { MOVE_METEOR_MASH, @@ -3291,7 +3291,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x3C, .moves = { MOVE_EARTHQUAKE, @@ -3304,7 +3304,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x3C, .moves = { MOVE_ICE_BEAM, @@ -3317,7 +3317,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x3C, .moves = { MOVE_METAL_CLAW, @@ -3330,7 +3330,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x1E, .moves = { MOVE_MIST_BALL, @@ -3343,7 +3343,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x1D, .moves = { MOVE_LUSTER_PURGE, @@ -3356,7 +3356,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x1A, .moves = { MOVE_HYDRO_PUMP, @@ -3369,7 +3369,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x15, .moves = { MOVE_YAWN, @@ -3382,7 +3382,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x8C, .moves = { MOVE_LEAF_BLADE, @@ -3395,7 +3395,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0x8C, .moves = { MOVE_FOCUS_PUNCH, @@ -3408,7 +3408,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x8C, .moves = { MOVE_SURF, @@ -3421,7 +3421,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x0A, .moves = { MOVE_PSYCHIC, @@ -3434,7 +3434,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x05, .moves = { MOVE_SPORE, @@ -3447,7 +3447,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x58, .moves = { MOVE_PSYCHIC, @@ -3460,7 +3460,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x05, .moves = { MOVE_REVENGE, @@ -3473,7 +3473,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x0A, .moves = { MOVE_RAIN_DANCE, @@ -3486,7 +3486,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x48, .moves = { MOVE_SLUDGE_BOMB, @@ -3499,7 +3499,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x5D, .moves = { MOVE_CROSS_CHOP, @@ -3512,7 +3512,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x08, .moves = { MOVE_THUNDERBOLT, @@ -3525,7 +3525,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x60, .moves = { MOVE_THUNDER, @@ -3538,7 +3538,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x64, .moves = { MOVE_SLUDGE_BOMB, @@ -3551,7 +3551,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x0C, .moves = { MOVE_DRAGON_CLAW, @@ -3564,7 +3564,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x4C, .moves = { MOVE_SURF, @@ -3577,7 +3577,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x4A, .moves = { MOVE_LEECH_SEED, @@ -3590,7 +3590,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SKARMORY, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x4B, .moves = { MOVE_DRILL_PECK, @@ -3603,7 +3603,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x49, .moves = { MOVE_SURF, @@ -3616,7 +3616,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x5D, .moves = { MOVE_MEGAHORN, @@ -3629,7 +3629,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x26, .moves = { MOVE_SURF, @@ -3642,7 +3642,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x5C, .moves = { MOVE_SURF, @@ -3655,7 +3655,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x1D, .moves = { MOVE_DRAGON_CLAW, @@ -3668,7 +3668,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x3D, .moves = { MOVE_METEOR_MASH, @@ -3681,7 +3681,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x3C, .moves = { MOVE_EARTHQUAKE, @@ -3694,7 +3694,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x3C, .moves = { MOVE_ICE_BEAM, @@ -3707,7 +3707,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x3C, .moves = { MOVE_METAL_CLAW, @@ -3720,7 +3720,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x1E, .moves = { MOVE_MIST_BALL, @@ -3733,7 +3733,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0x1D, .moves = { MOVE_LUSTER_PURGE, @@ -3746,7 +3746,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x1A, .moves = { MOVE_SURF, @@ -3759,7 +3759,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0x0A, .moves = { MOVE_DRAGON_CLAW, @@ -3772,7 +3772,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x9C, .moves = { MOVE_LEAF_BLADE, @@ -3785,7 +3785,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x9C, .moves = { MOVE_BLAZE_KICK, @@ -3798,7 +3798,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x9C, .moves = { MOVE_SURF, @@ -3811,7 +3811,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SHEDINJA, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x20, .moves = { MOVE_CONFUSE_RAY, @@ -3824,7 +3824,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x1D, .moves = { MOVE_METEOR_MASH, @@ -3837,7 +3837,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x58, .moves = { MOVE_PSYCHIC, @@ -3850,7 +3850,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x1E, .moves = { MOVE_MIST_BALL, @@ -3863,7 +3863,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x1D, .moves = { MOVE_LUSTER_PURGE, @@ -3876,7 +3876,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x1D, .moves = { MOVE_DRAGON_CLAW, @@ -3889,7 +3889,7 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x5D, .moves = { MOVE_CROSS_CHOP, diff --git a/src/data/battle_tower/level_50_mons.h b/src/data/battle_tower/level_50_mons.h index 8e1463a86..c61f840af 100644 --- a/src/data/battle_tower/level_50_mons.h +++ b/src/data/battle_tower/level_50_mons.h @@ -2,7 +2,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = { { .species = SPECIES_PIKACHU, - .item = BATTLE_TOWER_ITEM_ORAN_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ORAN_BERRY, .teamFlags = 0x42, .moves = { MOVE_QUICK_ATTACK, @@ -15,7 +15,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BEAUTIFLY, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x41, .moves = { MOVE_ABSORB, @@ -28,7 +28,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWELLOW, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x07, .moves = { MOVE_PECK, @@ -41,7 +41,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x0B, .moves = { MOVE_HAIL, @@ -54,7 +54,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SEAKING, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x07, .moves = { MOVE_PECK, @@ -67,7 +67,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TORCHIC, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x42, .moves = { MOVE_FIRE_SPIN, @@ -80,7 +80,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MASQUERAIN, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x41, .moves = { MOVE_STUN_SPORE, @@ -93,7 +93,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ILLUMISE, - .item = BATTLE_TOWER_ITEM_NONE, + .heldItem = BATTLE_TOWER_ITEM_NONE, .teamFlags = 0x41, .moves = { MOVE_FLATTER, @@ -106,7 +106,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DELCATTY, - .item = BATTLE_TOWER_ITEM_SILK_SCARF, + .heldItem = BATTLE_TOWER_ITEM_SILK_SCARF, .teamFlags = 0x42, .moves = { MOVE_ATTRACT, @@ -119,7 +119,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x0B, .moves = { MOVE_TAIL_WHIP, @@ -132,7 +132,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MIGHTYENA, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x05, .moves = { MOVE_BITE, @@ -145,7 +145,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_BLACK_GLASSES, + .heldItem = BATTLE_TOWER_ITEM_BLACK_GLASSES, .teamFlags = 0x05, .moves = { MOVE_FAINT_ATTACK, @@ -158,7 +158,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHOKE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x05, .moves = { MOVE_LEER, @@ -171,7 +171,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x05, .moves = { MOVE_STRENGTH, @@ -184,7 +184,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CACTURNE, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x0B, .moves = { MOVE_POISON_STING, @@ -197,7 +197,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ZIGZAGOON, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x0A, .moves = { MOVE_FLAIL, @@ -210,7 +210,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DODRIO, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x03, .moves = { MOVE_PURSUIT, @@ -223,7 +223,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x0B, .moves = { MOVE_WATER_GUN, @@ -236,7 +236,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NINJASK, - .item = BATTLE_TOWER_ITEM_SILVER_POWDER, + .heldItem = BATTLE_TOWER_ITEM_SILVER_POWDER, .teamFlags = 0x41, .moves = { MOVE_SAND_ATTACK, @@ -249,7 +249,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x01, .moves = { MOVE_PROTECT, @@ -262,7 +262,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x07, .moves = { MOVE_DIG, @@ -275,7 +275,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SPINDA, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x4A, .moves = { MOVE_TEETER_DANCE, @@ -288,7 +288,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SEVIPER, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x09, .moves = { MOVE_SCREECH, @@ -301,7 +301,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x49, .moves = { MOVE_SAND_ATTACK, @@ -314,7 +314,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_AZUMARILL, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x42, .moves = { MOVE_BUBBLE_BEAM, @@ -327,7 +327,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ZANGOOSE, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0x07, .moves = { MOVE_STRENGTH, @@ -340,7 +340,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MEDICHAM, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x07, .moves = { MOVE_REVERSAL, @@ -353,7 +353,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ROSELIA, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x0A, .moves = { MOVE_GROWTH, @@ -366,7 +366,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWALOT, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x0B, .moves = { MOVE_STOCKPILE, @@ -379,7 +379,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MAGNETON, - .item = BATTLE_TOWER_ITEM_MAGNET, + .heldItem = BATTLE_TOWER_ITEM_MAGNET, .teamFlags = 0x0B, .moves = { MOVE_SUPERSONIC, @@ -392,7 +392,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x09, .moves = { MOVE_CONFUSION, @@ -405,7 +405,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RELICANTH, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x01, .moves = { MOVE_SURF, @@ -418,7 +418,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0x03, .moves = { MOVE_CONFUSE_RAY, @@ -431,7 +431,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHARPEDO, - .item = BATTLE_TOWER_ITEM_BLACK_GLASSES, + .heldItem = BATTLE_TOWER_ITEM_BLACK_GLASSES, .teamFlags = 0x05, .moves = { MOVE_BITE, @@ -444,7 +444,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GIRAFARIG, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x03, .moves = { MOVE_STRENGTH, @@ -457,7 +457,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_PELIPPER, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0B, .moves = { MOVE_MIST, @@ -470,7 +470,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SABLEYE, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x09, .moves = { MOVE_SHADOW_BALL, @@ -483,7 +483,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUNATONE, - .item = BATTLE_TOWER_ITEM_HARD_STONE, + .heldItem = BATTLE_TOWER_ITEM_HARD_STONE, .teamFlags = 0x0B, .moves = { MOVE_COSMIC_POWER, @@ -496,7 +496,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_NONE, + .heldItem = BATTLE_TOWER_ITEM_NONE, .teamFlags = 0x0B, .moves = { MOVE_THIEF, @@ -509,7 +509,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0B, .moves = { MOVE_ODOR_SLEUTH, @@ -522,7 +522,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x0B, .moves = { MOVE_CUT, @@ -535,7 +535,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WAILORD, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x03, .moves = { MOVE_WATER_SPOUT, @@ -548,7 +548,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WEEZING, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x05, .moves = { MOVE_SMOG, @@ -561,7 +561,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KADABRA, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x0B, .moves = { MOVE_FUTURE_SIGHT, @@ -574,7 +574,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_MAGNET, + .heldItem = BATTLE_TOWER_ITEM_MAGNET, .teamFlags = 0x07, .moves = { MOVE_THUNDER_WAVE, @@ -587,7 +587,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_ASPEAR_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ASPEAR_BERRY, .teamFlags = 0x03, .moves = { MOVE_QUICK_ATTACK, @@ -600,7 +600,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_XATU, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x03, .moves = { MOVE_NIGHT_SHADE, @@ -613,7 +613,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LOUDRED, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x05, .moves = { MOVE_UPROAR, @@ -626,7 +626,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SOLROCK, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x03, .moves = { MOVE_ROCK_THROW, @@ -639,7 +639,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CLAYDOL, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x03, .moves = { MOVE_SANDSTORM, @@ -652,7 +652,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CRAWDAUNT, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x03, .moves = { MOVE_WATER_PULSE, @@ -665,7 +665,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLBAT, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x09, .moves = { MOVE_CONFUSE_RAY, @@ -678,7 +678,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BELLOSSOM, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x0A, .moves = { MOVE_SOLAR_BEAM, @@ -691,7 +691,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DONPHAN, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x05, .moves = { MOVE_ROCK_SMASH, @@ -704,7 +704,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NOSEPASS, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x0B, .moves = { MOVE_SANDSTORM, @@ -717,7 +717,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_PINSIR, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x05, .moves = { MOVE_SWORDS_DANCE, @@ -730,7 +730,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x0B, .moves = { MOVE_DISABLE, @@ -743,7 +743,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0x07, .moves = { MOVE_TORMENT, @@ -756,7 +756,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSTOX, - .item = BATTLE_TOWER_ITEM_SILVER_POWDER, + .heldItem = BATTLE_TOWER_ITEM_SILVER_POWDER, .teamFlags = 0x01, .moves = { MOVE_CONFUSION, @@ -769,7 +769,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHUPPET, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x03, .moves = { MOVE_WILL_O_WISP, @@ -782,7 +782,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SEAKING, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x07, .moves = { MOVE_RAIN_DANCE, @@ -795,7 +795,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SKARMORY, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x07, .moves = { MOVE_STEEL_WING, @@ -808,7 +808,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TORKOAL, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x43, .moves = { MOVE_FLAMETHROWER, @@ -821,7 +821,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLEM, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0x05, .moves = { MOVE_MAGNITUDE, @@ -834,7 +834,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x41, .moves = { MOVE_REFLECT, @@ -847,7 +847,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SANDSLASH, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x07, .moves = { MOVE_SANDSTORM, @@ -860,7 +860,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WOBBUFFET, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0B, .moves = { MOVE_COUNTER, @@ -873,7 +873,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x05, .moves = { MOVE_CONSTRICT, @@ -886,7 +886,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TROPIUS, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x05, .moves = { MOVE_SUNNY_DAY, @@ -899,7 +899,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MAWILE, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x43, .moves = { MOVE_IRON_DEFENSE, @@ -912,7 +912,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0x09, .moves = { MOVE_SLUDGE, @@ -925,7 +925,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MAGCARGO, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x0D, .moves = { MOVE_FLAMETHROWER, @@ -938,7 +938,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x07, .moves = { MOVE_HEADBUTT, @@ -951,7 +951,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_ASPEAR_BERRY, + .heldItem = BATTLE_TOWER_ITEM_ASPEAR_BERRY, .teamFlags = 0x05, .moves = { MOVE_LIGHT_SCREEN, @@ -964,7 +964,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x09, .moves = { MOVE_MEAN_LOOK, @@ -977,7 +977,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_VILEPLUME, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x0A, .moves = { MOVE_TOXIC, @@ -990,7 +990,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x05, .moves = { MOVE_BITE, @@ -1003,7 +1003,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CORSOLA, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x0A, .moves = { MOVE_RECOVER, @@ -1016,7 +1016,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x0B, .moves = { MOVE_RAPID_SPIN, @@ -1029,7 +1029,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_EXPLOUD, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x41, .moves = { MOVE_HYPER_BEAM, @@ -1042,7 +1042,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x0B, .moves = { MOVE_PSYBEAM, @@ -1055,7 +1055,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x05, .moves = { MOVE_HORN_ATTACK, @@ -1068,7 +1068,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CASTFORM, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0B, .moves = { MOVE_WEATHER_BALL, @@ -1081,7 +1081,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_VIGOROTH, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x05, .moves = { MOVE_FOCUS_PUNCH, @@ -1094,7 +1094,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSKULL, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x09, .moves = { MOVE_TOXIC, @@ -1107,7 +1107,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LANTURN, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x07, .moves = { MOVE_FLAIL, @@ -1120,7 +1120,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x05, .moves = { MOVE_STRENGTH, @@ -1133,7 +1133,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x43, .moves = { MOVE_AGILITY, @@ -1146,7 +1146,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x41, .moves = { MOVE_RAIN_DANCE, @@ -1159,7 +1159,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x45, .moves = { MOVE_EARTHQUAKE, @@ -1172,7 +1172,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0xC7, .moves = { MOVE_SWORDS_DANCE, @@ -1185,7 +1185,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWELLOW, - .item = BATTLE_TOWER_ITEM_SHARP_BEAK, + .heldItem = BATTLE_TOWER_ITEM_SHARP_BEAK, .teamFlags = 0x0F, .moves = { MOVE_DOUBLE_TEAM, @@ -1198,7 +1198,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_BLACK_BELT, + .heldItem = BATTLE_TOWER_ITEM_BLACK_BELT, .teamFlags = 0x05, .moves = { MOVE_STRENGTH, @@ -1211,7 +1211,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, + .heldItem = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, .teamFlags = 0x41, .moves = { MOVE_PROTECT, @@ -1224,7 +1224,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_MIRACLE_SEED, + .heldItem = BATTLE_TOWER_ITEM_MIRACLE_SEED, .teamFlags = 0x41, .moves = { MOVE_LEAF_BLADE, @@ -1237,7 +1237,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x41, .moves = { MOVE_BLAZE_KICK, @@ -1250,7 +1250,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x43, .moves = { MOVE_DRAGON_CLAW, @@ -1263,7 +1263,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_BLACK_BELT, + .heldItem = BATTLE_TOWER_ITEM_BLACK_BELT, .teamFlags = 0x43, .moves = { MOVE_BRICK_BREAK, @@ -1276,7 +1276,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SABLEYE, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x49, .moves = { MOVE_SHADOW_BALL, @@ -1289,7 +1289,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ZANGOOSE, - .item = BATTLE_TOWER_ITEM_BLACK_GLASSES, + .heldItem = BATTLE_TOWER_ITEM_BLACK_GLASSES, .teamFlags = 0x0F, .moves = { MOVE_FACADE, @@ -1302,7 +1302,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LINOONE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x0F, .moves = { MOVE_IRON_TAIL, @@ -1315,7 +1315,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0x07, .moves = { MOVE_MUD_SLAP, @@ -1328,7 +1328,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SOLROCK, - .item = BATTLE_TOWER_ITEM_HARD_STONE, + .heldItem = BATTLE_TOWER_ITEM_HARD_STONE, .teamFlags = 0x43, .moves = { MOVE_EARTHQUAKE, @@ -1341,7 +1341,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x03, .moves = { MOVE_RECOVER, @@ -1354,7 +1354,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CACTURNE, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x0F, .moves = { MOVE_INGRAIN, @@ -1367,7 +1367,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x05, .moves = { MOVE_FRUSTRATION, @@ -1380,7 +1380,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_MAGNET, + .heldItem = BATTLE_TOWER_ITEM_MAGNET, .teamFlags = 0x0F, .moves = { MOVE_THUNDER, @@ -1393,7 +1393,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xC3, .moves = { MOVE_THUNDERBOLT, @@ -1406,7 +1406,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_PINSIR, - .item = BATTLE_TOWER_ITEM_SOFT_SAND, + .heldItem = BATTLE_TOWER_ITEM_SOFT_SAND, .teamFlags = 0x8D, .moves = { MOVE_GUILLOTINE, @@ -1419,7 +1419,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_METANG, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x05, .moves = { MOVE_EARTHQUAKE, @@ -1432,7 +1432,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CLAYDOL, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x43, .moves = { MOVE_EARTHQUAKE, @@ -1445,7 +1445,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MASQUERAIN, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x0A, .moves = { MOVE_TOXIC, @@ -1458,7 +1458,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RELICANTH, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0xC5, .moves = { MOVE_ROCK_TOMB, @@ -1471,7 +1471,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0D, .moves = { MOVE_SURF, @@ -1484,7 +1484,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WAILORD, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x0B, .moves = { MOVE_WATER_SPOUT, @@ -1497,7 +1497,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GIRAFARIG, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0x4F, .moves = { MOVE_DOUBLE_TEAM, @@ -1510,7 +1510,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MEDICHAM, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x4B, .moves = { MOVE_CALM_MIND, @@ -1523,7 +1523,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TROPIUS, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0xC7, .moves = { MOVE_EARTHQUAKE, @@ -1536,7 +1536,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NINJASK, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x05, .moves = { MOVE_DOUBLE_TEAM, @@ -1549,7 +1549,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x0D, .moves = { MOVE_EARTHQUAKE, @@ -1562,7 +1562,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHARPEDO, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x05, .moves = { MOVE_CRUNCH, @@ -1575,7 +1575,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WIGGLYTUFF, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0E, .moves = { MOVE_PROTECT, @@ -1588,7 +1588,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SEVIPER, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x05, .moves = { MOVE_SLUDGE_BOMB, @@ -1601,7 +1601,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CRADILY, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0xC1, .moves = { MOVE_ROCK_TOMB, @@ -1614,7 +1614,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ARMALDO, - .item = BATTLE_TOWER_ITEM_RAWST_BERRY, + .heldItem = BATTLE_TOWER_ITEM_RAWST_BERRY, .teamFlags = 0xC1, .moves = { MOVE_EARTHQUAKE, @@ -1627,7 +1627,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MAGNETON, - .item = BATTLE_TOWER_ITEM_PERSIM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PERSIM_BERRY, .teamFlags = 0x0D, .moves = { MOVE_ZAP_CANNON, @@ -1640,7 +1640,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LANTURN, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x06, .moves = { MOVE_THUNDER, @@ -1653,7 +1653,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWALOT, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x8B, .moves = { MOVE_SLUDGE_BOMB, @@ -1666,7 +1666,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SKARMORY, - .item = BATTLE_TOWER_ITEM_METAL_COAT, + .heldItem = BATTLE_TOWER_ITEM_METAL_COAT, .teamFlags = 0x81, .moves = { MOVE_STEEL_WING, @@ -1679,7 +1679,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DONPHAN, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x0D, .moves = { MOVE_EARTHQUAKE, @@ -1692,7 +1692,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x41, .moves = { MOVE_FACADE, @@ -1705,7 +1705,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BANETTE, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x83, .moves = { MOVE_SHADOW_BALL, @@ -1718,7 +1718,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SANDSLASH, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x0F, .moves = { MOVE_SANDSTORM, @@ -1731,7 +1731,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CRAWDAUNT, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x05, .moves = { MOVE_GUILLOTINE, @@ -1744,7 +1744,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_TWISTED_SPOON, + .heldItem = BATTLE_TOWER_ITEM_TWISTED_SPOON, .teamFlags = 0x8B, .moves = { MOVE_MAGIC_COAT, @@ -1757,7 +1757,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x45, .moves = { MOVE_IRON_TAIL, @@ -1770,7 +1770,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x8B, .moves = { MOVE_PSYCHIC, @@ -1783,7 +1783,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x41, .moves = { MOVE_SHADOW_BALL, @@ -1796,7 +1796,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TORKOAL, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x09, .moves = { MOVE_FLAMETHROWER, @@ -1809,7 +1809,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x09, .moves = { MOVE_SCREECH, @@ -1822,7 +1822,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x0B, .moves = { MOVE_IRON_TAIL, @@ -1835,7 +1835,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_POISON_BARB, + .heldItem = BATTLE_TOWER_ITEM_POISON_BARB, .teamFlags = 0x05, .moves = { MOVE_SLUDGE_BOMB, @@ -1848,7 +1848,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WEEZING, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x05, .moves = { MOVE_EXPLOSION, @@ -1861,7 +1861,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x4E, .moves = { MOVE_THUNDERBOLT, @@ -1874,7 +1874,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0x09, .moves = { MOVE_DOUBLE_TEAM, @@ -1887,7 +1887,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_EXPLOUD, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x05, .moves = { MOVE_BLIZZARD, @@ -1900,7 +1900,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_XATU, - .item = BATTLE_TOWER_ITEM_WHITE_HERB, + .heldItem = BATTLE_TOWER_ITEM_WHITE_HERB, .teamFlags = 0x43, .moves = { MOVE_PSYCHIC, @@ -1913,7 +1913,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLEM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x05, .moves = { MOVE_EXPLOSION, @@ -1926,7 +1926,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x83, .moves = { MOVE_SURF, @@ -1939,7 +1939,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_CHARCOAL, + .heldItem = BATTLE_TOWER_ITEM_CHARCOAL, .teamFlags = 0x4A, .moves = { MOVE_FLAMETHROWER, @@ -1952,7 +1952,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x13, .moves = { MOVE_DOUBLE_TEAM, @@ -1965,7 +1965,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x03, .moves = { MOVE_CURSE, @@ -1978,7 +1978,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_CHERI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHERI_BERRY, .teamFlags = 0x03, .moves = { MOVE_THUNDER, @@ -1991,7 +1991,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x21, .moves = { MOVE_BELLY_DRUM, @@ -2004,7 +2004,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0xC3, .moves = { MOVE_FAINT_ATTACK, @@ -2017,7 +2017,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALTARIA, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x83, .moves = { MOVE_DRAGON_DANCE, @@ -2030,7 +2030,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_BLACK_BELT, + .heldItem = BATTLE_TOWER_ITEM_BLACK_BELT, .teamFlags = 0x11, .moves = { MOVE_CROSS_CHOP, @@ -2043,7 +2043,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_DRAGON_FANG, + .heldItem = BATTLE_TOWER_ITEM_DRAGON_FANG, .teamFlags = 0x43, .moves = { MOVE_CRUNCH, @@ -2056,7 +2056,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x33, .moves = { MOVE_COUNTER, @@ -2069,7 +2069,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GLALIE, - .item = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, + .heldItem = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, .teamFlags = 0x81, .moves = { MOVE_BLIZZARD, @@ -2082,7 +2082,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HUNTAIL, - .item = BATTLE_TOWER_ITEM_MYSTIC_WATER, + .heldItem = BATTLE_TOWER_ITEM_MYSTIC_WATER, .teamFlags = 0xA1, .moves = { MOVE_RAIN_DANCE, @@ -2095,7 +2095,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0xD3, .moves = { MOVE_SURF, @@ -2108,7 +2108,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOREBYSS, - .item = BATTLE_TOWER_ITEM_PECHA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PECHA_BERRY, .teamFlags = 0x83, .moves = { MOVE_PSYCHIC, @@ -2121,7 +2121,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x53, .moves = { MOVE_LEAF_BLADE, @@ -2134,7 +2134,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x53, .moves = { MOVE_EARTHQUAKE, @@ -2147,7 +2147,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_MENTAL_HERB, + .heldItem = BATTLE_TOWER_ITEM_MENTAL_HERB, .teamFlags = 0x41, .moves = { MOVE_DOUBLE_EDGE, @@ -2160,7 +2160,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CRADILY, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xE1, .moves = { MOVE_STOCKPILE, @@ -2173,7 +2173,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ARMALDO, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0xC1, .moves = { MOVE_EARTHQUAKE, @@ -2186,7 +2186,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x82, .moves = { MOVE_FOCUS_PUNCH, @@ -2199,7 +2199,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x83, .moves = { MOVE_RAIN_DANCE, @@ -2212,7 +2212,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x03, .moves = { MOVE_TORMENT, @@ -2225,7 +2225,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TROPIUS, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0xC3, .moves = { MOVE_SUNNY_DAY, @@ -2238,7 +2238,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_MACHO_BRACE, + .heldItem = BATTLE_TOWER_ITEM_MACHO_BRACE, .teamFlags = 0x23, .moves = { MOVE_TRICK, @@ -2251,7 +2251,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TORKOAL, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x81, .moves = { MOVE_IRON_DEFENSE, @@ -2264,7 +2264,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_NONE, + .heldItem = BATTLE_TOWER_ITEM_NONE, .teamFlags = 0x03, .moves = { MOVE_THUNDERBOLT, @@ -2277,7 +2277,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_PINSIR, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x61, .moves = { MOVE_GUILLOTINE, @@ -2290,7 +2290,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x93, .moves = { MOVE_LIGHT_SCREEN, @@ -2303,7 +2303,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x51, .moves = { MOVE_MEGAHORN, @@ -2316,7 +2316,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, + .heldItem = BATTLE_TOWER_ITEM_NEVER_MELT_ICE, .teamFlags = 0x83, .moves = { MOVE_BLIZZARD, @@ -2329,7 +2329,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x13, .moves = { MOVE_PSYCHIC, @@ -2342,7 +2342,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x93, .moves = { MOVE_SURF, @@ -2355,7 +2355,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x11, .moves = { MOVE_REST, @@ -2368,7 +2368,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x11, .moves = { MOVE_REST, @@ -2381,7 +2381,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x91, .moves = { MOVE_ROCK_TOMB, @@ -2394,7 +2394,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DUSCLOPS, - .item = BATTLE_TOWER_ITEM_SPELL_TAG, + .heldItem = BATTLE_TOWER_ITEM_SPELL_TAG, .teamFlags = 0x20, .moves = { MOVE_SHADOW_BALL, @@ -2407,7 +2407,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SEAKING, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0xB2, .moves = { MOVE_HORN_DRILL, @@ -2420,7 +2420,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CAMERUPT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x00, .moves = { MOVE_EARTHQUAKE, @@ -2433,7 +2433,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LANTURN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x82, .moves = { MOVE_THUNDERBOLT, @@ -2446,7 +2446,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WEEZING, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x20, .moves = { MOVE_SLUDGE_BOMB, @@ -2459,7 +2459,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WHISCASH, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x41, .moves = { MOVE_EARTHQUAKE, @@ -2472,7 +2472,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_AGGRON, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x11, .moves = { MOVE_DOUBLE_EDGE, @@ -2485,7 +2485,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CACTURNE, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x63, .moves = { MOVE_DYNAMIC_PUNCH, @@ -2498,7 +2498,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHARPEDO, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x01, .moves = { MOVE_CRUNCH, @@ -2511,7 +2511,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ABSOL, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x82, .moves = { MOVE_DOUBLE_EDGE, @@ -2524,7 +2524,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WAILORD, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x23, .moves = { MOVE_HYDRO_PUMP, @@ -2537,7 +2537,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_TENTACRUEL, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x21, .moves = { MOVE_HYDRO_PUMP, @@ -2550,7 +2550,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0xA2, .moves = { MOVE_RAIN_DANCE, @@ -2563,7 +2563,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WOBBUFFET, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x23, .moves = { MOVE_ENCORE, @@ -2576,7 +2576,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RHYDON, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x21, .moves = { MOVE_EARTHQUAKE, @@ -2589,7 +2589,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GLALIE, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x21, .moves = { MOVE_CRUNCH, @@ -2602,7 +2602,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x13, .moves = { MOVE_LEAF_BLADE, @@ -2615,7 +2615,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x17, .moves = { MOVE_BLAZE_KICK, @@ -2628,7 +2628,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x17, .moves = { MOVE_SURF, @@ -2641,7 +2641,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x19, .moves = { MOVE_PSYCHIC, @@ -2654,7 +2654,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0xF6, .moves = { MOVE_SPORE, @@ -2667,7 +2667,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_GANLON_BERRY, + .heldItem = BATTLE_TOWER_ITEM_GANLON_BERRY, .teamFlags = 0x1B, .moves = { MOVE_PSYCHIC, @@ -2680,7 +2680,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHIFTRY, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x89, .moves = { MOVE_FAINT_ATTACK, @@ -2693,7 +2693,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x85, .moves = { MOVE_CROSS_CHOP, @@ -2706,7 +2706,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x49, .moves = { MOVE_ATTRACT, @@ -2719,7 +2719,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x15, .moves = { MOVE_CROSS_CHOP, @@ -2732,7 +2732,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x0B, .moves = { MOVE_THUNDERBOLT, @@ -2745,7 +2745,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x27, .moves = { MOVE_THUNDERBOLT, @@ -2758,7 +2758,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x05, .moves = { MOVE_SLUDGE_BOMB, @@ -2771,7 +2771,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x4D, .moves = { MOVE_DRAGON_CLAW, @@ -2784,7 +2784,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x1B, .moves = { MOVE_SURF, @@ -2797,7 +2797,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_DODRIO, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x2B, .moves = { MOVE_DRILL_PECK, @@ -2810,7 +2810,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x0A, .moves = { MOVE_THUNDERBOLT, @@ -2823,7 +2823,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x0A, .moves = { MOVE_SURF, @@ -2836,7 +2836,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x54, .moves = { MOVE_MEGAHORN, @@ -2849,7 +2849,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x06, .moves = { MOVE_SURF, @@ -2862,7 +2862,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x1D, .moves = { MOVE_SURF, @@ -2875,7 +2875,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x9C, .moves = { MOVE_DRAGON_CLAW, @@ -2888,7 +2888,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x15, .moves = { MOVE_METEOR_MASH, @@ -2901,7 +2901,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xB5, .moves = { MOVE_EARTHQUAKE, @@ -2914,7 +2914,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x96, .moves = { MOVE_ICE_BEAM, @@ -2927,7 +2927,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x94, .moves = { MOVE_METAL_CLAW, @@ -2940,7 +2940,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x96, .moves = { MOVE_MIST_BALL, @@ -2953,7 +2953,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x95, .moves = { MOVE_LUSTER_PURGE, @@ -2966,7 +2966,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x96, .moves = { MOVE_SURF, @@ -2979,7 +2979,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x05, .moves = { MOVE_HYPER_BEAM, @@ -2992,7 +2992,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x1F, .moves = { MOVE_GIGA_DRAIN, @@ -3005,7 +3005,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x17, .moves = { MOVE_BLAZE_KICK, @@ -3018,7 +3018,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x17, .moves = { MOVE_MUDDY_WATER, @@ -3031,7 +3031,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x7B, .moves = { MOVE_PSYCHIC, @@ -3044,7 +3044,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x56, .moves = { MOVE_SPORE, @@ -3057,7 +3057,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x0A, .moves = { MOVE_PSYCHIC, @@ -3070,7 +3070,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_FOCUS_BAND, + .heldItem = BATTLE_TOWER_ITEM_FOCUS_BAND, .teamFlags = 0x05, .moves = { MOVE_CROSS_CHOP, @@ -3083,7 +3083,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GYARADOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x0C, .moves = { MOVE_HYPER_BEAM, @@ -3096,7 +3096,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x49, .moves = { MOVE_TOXIC, @@ -3109,7 +3109,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x15, .moves = { MOVE_CROSS_CHOP, @@ -3122,7 +3122,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x63, .moves = { MOVE_THUNDER, @@ -3135,7 +3135,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x07, .moves = { MOVE_THUNDERBOLT, @@ -3148,7 +3148,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x45, .moves = { MOVE_SLUDGE_BOMB, @@ -3161,7 +3161,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x4D, .moves = { MOVE_DRAGON_CLAW, @@ -3174,7 +3174,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x1B, .moves = { MOVE_LIGHT_SCREEN, @@ -3187,7 +3187,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_NINETALES, - .item = BATTLE_TOWER_ITEM_SITRUS_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SITRUS_BERRY, .teamFlags = 0x0A, .moves = { MOVE_CONFUSE_RAY, @@ -3200,7 +3200,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLEM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x25, .moves = { MOVE_EARTHQUAKE, @@ -3213,7 +3213,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x27, .moves = { MOVE_HYDRO_PUMP, @@ -3226,7 +3226,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x55, .moves = { MOVE_MEGAHORN, @@ -3239,7 +3239,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x36, .moves = { MOVE_SURF, @@ -3252,7 +3252,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x5C, .moves = { MOVE_HYDRO_PUMP, @@ -3265,7 +3265,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x9D, .moves = { MOVE_DRAGON_CLAW, @@ -3278,7 +3278,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x15, .moves = { MOVE_METEOR_MASH, @@ -3291,7 +3291,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x95, .moves = { MOVE_EARTHQUAKE, @@ -3304,7 +3304,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x96, .moves = { MOVE_BLIZZARD, @@ -3317,7 +3317,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x94, .moves = { MOVE_METAL_CLAW, @@ -3330,7 +3330,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x96, .moves = { MOVE_MIST_BALL, @@ -3343,7 +3343,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x95, .moves = { MOVE_LUSTER_PURGE, @@ -3356,7 +3356,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0xD6, .moves = { MOVE_SURF, @@ -3369,7 +3369,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KECLEON, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x69, .moves = { MOVE_TRICK, @@ -3382,7 +3382,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x5F, .moves = { MOVE_LEAF_BLADE, @@ -3395,7 +3395,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x7F, .moves = { MOVE_FOCUS_PUNCH, @@ -3408,7 +3408,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x57, .moves = { MOVE_IRON_TAIL, @@ -3421,7 +3421,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GARDEVOIR, - .item = BATTLE_TOWER_ITEM_CHESTO_BERRY, + .heldItem = BATTLE_TOWER_ITEM_CHESTO_BERRY, .teamFlags = 0x3B, .moves = { MOVE_SHADOW_BALL, @@ -3434,7 +3434,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BRELOOM, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x56, .moves = { MOVE_SPORE, @@ -3447,7 +3447,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ALAKAZAM, - .item = BATTLE_TOWER_ITEM_CHOICE_BAND, + .heldItem = BATTLE_TOWER_ITEM_CHOICE_BAND, .teamFlags = 0x1A, .moves = { MOVE_PSYCHIC, @@ -3460,7 +3460,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HARIYAMA, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x65, .moves = { MOVE_REVENGE, @@ -3473,7 +3473,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x54, .moves = { MOVE_RAIN_DANCE, @@ -3486,7 +3486,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_CROBAT, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0x4B, .moves = { MOVE_SLUDGE_BOMB, @@ -3499,7 +3499,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x75, .moves = { MOVE_CROSS_CHOP, @@ -3512,7 +3512,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MANECTRIC, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x0A, .moves = { MOVE_THUNDERBOLT, @@ -3525,7 +3525,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_ELECTRODE, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x64, .moves = { MOVE_THUNDER, @@ -3538,7 +3538,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MUK, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x49, .moves = { MOVE_SLUDGE_BOMB, @@ -3551,7 +3551,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_FLYGON, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xCD, .moves = { MOVE_PROTECT, @@ -3564,7 +3564,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x5B, .moves = { MOVE_SURF, @@ -3577,7 +3577,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LUDICOLO, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0x1A, .moves = { MOVE_RAIN_DANCE, @@ -3590,7 +3590,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_RAICHU, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x4A, .moves = { MOVE_THUNDER, @@ -3603,7 +3603,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GOLDUCK, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x0A, .moves = { MOVE_SURF, @@ -3616,7 +3616,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_HERACROSS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0x15, .moves = { MOVE_MEGAHORN, @@ -3629,7 +3629,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_WALREIN, - .item = BATTLE_TOWER_ITEM_LEPPA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LEPPA_BERRY, .teamFlags = 0x26, .moves = { MOVE_SURF, @@ -3642,7 +3642,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_KINGDRA, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x4D, .moves = { MOVE_HYDRO_PUMP, @@ -3655,7 +3655,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SALAMENCE, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x9C, .moves = { MOVE_DRAGON_CLAW, @@ -3668,7 +3668,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_LIECHI_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LIECHI_BERRY, .teamFlags = 0xB5, .moves = { MOVE_METEOR_MASH, @@ -3681,7 +3681,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGIROCK, - .item = BATTLE_TOWER_ITEM_APICOT_BERRY, + .heldItem = BATTLE_TOWER_ITEM_APICOT_BERRY, .teamFlags = 0x95, .moves = { MOVE_EARTHQUAKE, @@ -3694,7 +3694,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGICE, - .item = BATTLE_TOWER_ITEM_LAX_INCENSE, + .heldItem = BATTLE_TOWER_ITEM_LAX_INCENSE, .teamFlags = 0x96, .moves = { MOVE_ICE_BEAM, @@ -3707,7 +3707,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_REGISTEEL, - .item = BATTLE_TOWER_ITEM_LEFTOVERS, + .heldItem = BATTLE_TOWER_ITEM_LEFTOVERS, .teamFlags = 0xB4, .moves = { MOVE_CURSE, @@ -3720,7 +3720,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x92, .moves = { MOVE_MIST_BALL, @@ -3733,7 +3733,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0x91, .moves = { MOVE_LUSTER_PURGE, @@ -3746,7 +3746,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MILOTIC, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xB2, .moves = { MOVE_SURF, @@ -3759,7 +3759,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SLAKING, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0x65, .moves = { MOVE_YAWN, @@ -3772,7 +3772,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SCEPTILE, - .item = BATTLE_TOWER_ITEM_SHELL_BELL, + .heldItem = BATTLE_TOWER_ITEM_SHELL_BELL, .teamFlags = 0xDF, .moves = { MOVE_LEAF_BLADE, @@ -3785,7 +3785,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_BLAZIKEN, - .item = BATTLE_TOWER_ITEM_SALAC_BERRY, + .heldItem = BATTLE_TOWER_ITEM_SALAC_BERRY, .teamFlags = 0xD7, .moves = { MOVE_BLAZE_KICK, @@ -3798,7 +3798,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SWAMPERT, - .item = BATTLE_TOWER_ITEM_PETAYA_BERRY, + .heldItem = BATTLE_TOWER_ITEM_PETAYA_BERRY, .teamFlags = 0x5F, .moves = { MOVE_SURF, @@ -3811,7 +3811,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_SHEDINJA, - .item = BATTLE_TOWER_ITEM_BRIGHT_POWDER, + .heldItem = BATTLE_TOWER_ITEM_BRIGHT_POWDER, .teamFlags = 0xDB, .moves = { MOVE_CONFUSE_RAY, @@ -3824,7 +3824,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_METAGROSS, - .item = BATTLE_TOWER_ITEM_QUICK_CLAW, + .heldItem = BATTLE_TOWER_ITEM_QUICK_CLAW, .teamFlags = 0x94, .moves = { MOVE_METEOR_MASH, @@ -3837,7 +3837,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_GRUMPIG, - .item = BATTLE_TOWER_ITEM_MACHO_BRACE, + .heldItem = BATTLE_TOWER_ITEM_MACHO_BRACE, .teamFlags = 0x4B, .moves = { MOVE_PSYCHIC, @@ -3850,7 +3850,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIAS, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x92, .moves = { MOVE_MIST_BALL, @@ -3863,7 +3863,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_LATIOS, - .item = BATTLE_TOWER_ITEM_KINGS_ROCK, + .heldItem = BATTLE_TOWER_ITEM_KINGS_ROCK, .teamFlags = 0x91, .moves = { MOVE_LUSTER_PURGE, @@ -3876,7 +3876,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_STARMIE, - .item = BATTLE_TOWER_ITEM_LUM_BERRY, + .heldItem = BATTLE_TOWER_ITEM_LUM_BERRY, .teamFlags = 0x1A, .moves = { MOVE_SURF, @@ -3889,7 +3889,7 @@ const struct BattleTowerPokemon gBattleTowerLevel50Mons[] = }, { .species = SPECIES_MACHAMP, - .item = BATTLE_TOWER_ITEM_SCOPE_LENS, + .heldItem = BATTLE_TOWER_ITEM_SCOPE_LENS, .teamFlags = 0x14, .moves = { MOVE_CROSS_CHOP, diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c index 953871c8b..5acdc3859 100644 --- a/src/de_rom_8040FE0.c +++ b/src/de_rom_8040FE0.c @@ -94,7 +94,7 @@ u8 *de_sub_8041024(s32 arg0, u32 arg1) { case 0x800: trainerClass = de_sub_81364F8(); - nameIndex = sub_8135FD8(); + nameIndex = GetEReaderTrainerNameIndex(); if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F) { return de_sub_8040FE0(FEMALE); @@ -196,7 +196,7 @@ _08041086:\n\ bl de_sub_81364F8\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ - bl sub_8135FD8\n\ + bl GetEReaderTrainerNameIndex\n\ b _08041070\n\ _08041094:\n\ movs r0, 0x1\n\ diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index 9cc24fc62..429f43766 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -44,10 +44,10 @@ u8 sub_814A4B8(void) { gSaveBlock2.battleTower.var_4AE[0] = 3; gSaveBlock2.battleTower.var_4AE[1] = 3; - gSaveBlock2.battleTower.curStreakChallengesCompleted[0] = gBattleCommunication[0] + 1; - gSaveBlock2.battleTower.curStreakChallengesCompleted[1] = gBattleCommunication[0] + 1; - gSaveBlock2.battleTower.curChallengeWins[0] = 1; - gSaveBlock2.battleTower.curChallengeWins[1] = 1; + gSaveBlock2.battleTower.curStreakChallengesNum[0] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curStreakChallengesNum[1] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curChallengeBattleNum[0] = 1; + gSaveBlock2.battleTower.curChallengeBattleNum[1] = 1; CloseMenu(); return 1; } diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index 0fb3a21cd..69434710f 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -421,7 +421,7 @@ bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) { u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; memcpy(&gSaveBlock2.battleTower.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.battleTower.ereaderTrainer)); - sub_813601C(); + ValidateEReaderTrainer(); StringExpandPlaceholders(gStringVar4, gOtherText_NewTrainerInHoenn); ctx->data[2] = 2; return FALSE; diff --git a/src/field/choose_party.c b/src/field/choose_party.c index fd90a9199..adb210e7b 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -24,7 +24,7 @@ extern u8 gUnknown_020384F0; extern struct UnknownPokemonStruct2 gUnknown_02023A00[]; extern u8 gUnknown_0202E8F6; extern struct Pokemon gUnknown_030042FC[]; -extern const u16 gBattleTowerBanlist[]; +extern const u16 gBattleTowerBannedSpecies[]; EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0}; @@ -182,9 +182,9 @@ static bool8 IsMonAllowedInBattleTower(struct Pokemon *pkmn) // Check if the pkmn is in the ban list species = GetMonData(pkmn, MON_DATA_SPECIES); - while (gBattleTowerBanlist[i] != 0xFFFF) + while (gBattleTowerBannedSpecies[i] != 0xFFFF) { - if (gBattleTowerBanlist[i] == species) + if (gBattleTowerBannedSpecies[i] == species) return FALSE; i++; } diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 36362d098..ea0c2bd6a 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -1789,7 +1789,7 @@ u16 sub_810F404(void) void sub_810F414(void) { - sub_8135FF4(gStringVar1); + SetEReaderTrainerName(gStringVar1); } const u8 gUnknown_083F83E0[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6}; diff --git a/src/field/tv.c b/src/field/tv.c index fcbd734a9..87fc03065 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -123,7 +123,6 @@ void ClearTVShowData(void) bool8 sub_80BF1B4(u8); void sub_80BF20C(void); -extern u16 sub_8135D3C(u8); extern u8 gScriptContestCategory; extern u8 gScriptContestRank; extern u8 gUnknown_03004316[11]; @@ -677,7 +676,7 @@ void sub_80BE320(void) StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.battleTower.defeatedByTrainerName); bravoTrainerTower->species = gSaveBlock2.battleTower.firstMonSpecies; bravoTrainerTower->defeatedSpecies = gSaveBlock2.battleTower.defeatedBySpecies; - bravoTrainerTower->var16 = sub_8135D3C(gSaveBlock2.battleTower.lastStreakLevelType); + bravoTrainerTower->var16 = GetCurrentBattleTowerWinStreak(gSaveBlock2.battleTower.lastStreakLevelType); bravoTrainerTower->var1c = gSaveBlock2.battleTower.battleOutcome; if (gSaveBlock2.battleTower.lastStreakLevelType == 0) bravoTrainerTower->btLevel = 50; |