ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed TrainerMonItemDefaultMoves

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-04 21:16:47 -04:00
parent c201cae2ee
commit 1ef56f6ae1
9 changed files with 62 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/trainers.h
View File

@ -375,7 +375,6 @@
// party. Some trainer parties also specify held items and custom moves for each
// Pokémon.
#define F_TRAINER_PARTY_CUSTOM_MOVESET (1 << 0)
#define F_TRAINER_PARTY_HELD_ITEM (1 << 1)
#define F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED (1 << 3)
// Trainer party defines

10
include/data.h
View File

@ -59,14 +59,6 @@ struct TrainerMonNoItemDefaultMoves
u16 species;
};
struct TrainerMonItemDefaultMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
};
struct TrainerMonNoItemCustomMoves
{
u16 iv;
@ -77,14 +69,12 @@ struct TrainerMonNoItemCustomMoves
#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0
#define NO_ITEM_CUSTOM_MOVES(party) { .NoItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET
#define ITEM_DEFAULT_MOVES(party) { .ItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_HELD_ITEM
#define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
union TrainerMonPtr
{
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonCustomized *EverythingCustomized;
};

14
src/battle_main.c
View File

@ -1895,11 +1895,6 @@ static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i)
buffer = (const u8 *) &trainer->party.NoItemCustomMoves[i];
n = sizeof(*trainer->party.NoItemCustomMoves);
}
else if (trainer->partyFlags == F_TRAINER_PARTY_HELD_ITEM)
{
buffer = (const u8 *) &trainer->party.ItemDefaultMoves[i];
n = sizeof(*trainer->party.ItemDefaultMoves);
}
else if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
{
buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
@ -2012,15 +2007,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
}
break;
}
case F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemDefaultMoves *partyData = trainer->party.ItemDefaultMoves;
fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255;
CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
break;
}
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;

6
src/battle_script_commands.c
View File

@ -7351,12 +7351,6 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
}
break;
case F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves;
lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
}
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *party = gTrainers[trainerId].party.EverythingCustomized;

8
src/battle_setup.c
View File

@ -782,14 +782,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
sum += party[i].lvl;
}
break;
case F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemDefaultMoves *party;
party = gTrainers[opponentId].party.ItemDefaultMoves;
for (i = 0; i < count; i++)
sum += party[i].lvl;
}
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *party;

9
src/battle_tower.c
View File

@ -3076,15 +3076,6 @@ static void FillPartnerParty(u16 trainerId)
}
break;
}
case F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.ItemDefaultMoves;
CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID);
SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
break;
}
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;

62
src/data/trainer_parties.h
View File

@ -1448,7 +1448,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = {
static const struct TrainerMonCustomized sParty_Cindy1[] = {
{
.iv = 0,
.lvl = 7,
@ -1502,7 +1502,7 @@ static const struct TrainerMonCustomized sParty_Cindy2[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = {
static const struct TrainerMonCustomized sParty_Brianna[] = {
{
.iv = 150,
.lvl = 40,
@ -1511,7 +1511,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = {
static const struct TrainerMonCustomized sParty_Naomi[] = {
{
.iv = 100,
.lvl = 45,
@ -1520,7 +1520,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = {
static const struct TrainerMonCustomized sParty_Cindy3[] = {
{
.iv = 10,
.lvl = 27,
@ -1529,7 +1529,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = {
static const struct TrainerMonCustomized sParty_Cindy4[] = {
{
.iv = 20,
.lvl = 30,
@ -1538,7 +1538,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = {
static const struct TrainerMonCustomized sParty_Cindy5[] = {
{
.iv = 30,
.lvl = 33,
@ -1706,7 +1706,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = {
static const struct TrainerMonCustomized sParty_Winston1[] = {
{
.iv = 0,
.lvl = 7,
@ -1728,7 +1728,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Garret[] = {
static const struct TrainerMonCustomized sParty_Garret[] = {
{
.iv = 0,
.lvl = 45,
@ -1737,7 +1737,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Garret[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = {
static const struct TrainerMonCustomized sParty_Winston2[] = {
{
.iv = 0,
.lvl = 27,
@ -1746,7 +1746,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = {
static const struct TrainerMonCustomized sParty_Winston3[] = {
{
.iv = 0,
.lvl = 30,
@ -1755,7 +1755,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = {
static const struct TrainerMonCustomized sParty_Winston4[] = {
{
.iv = 0,
.lvl = 33,
@ -2241,7 +2241,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Nob5[] = {
static const struct TrainerMonCustomized sParty_Nob5[] = {
{
.iv = 140,
.lvl = 33,
@ -2838,7 +2838,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Jeffrey5[] = {
static const struct TrainerMonCustomized sParty_Jeffrey5[] = {
{
.iv = 40,
.lvl = 38,
@ -3866,7 +3866,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg5[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Victor[] = {
static const struct TrainerMonCustomized sParty_Victor[] = {
{
.iv = 25,
.lvl = 16,
@ -3881,7 +3881,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Victor[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Miguel1[] = {
static const struct TrainerMonCustomized sParty_Miguel1[] = {
{
.iv = 0,
.lvl = 15,
@ -3935,7 +3935,7 @@ static const struct TrainerMonCustomized sParty_Colton[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Miguel2[] = {
static const struct TrainerMonCustomized sParty_Miguel2[] = {
{
.iv = 0,
.lvl = 29,
@ -3944,7 +3944,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Miguel2[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Miguel3[] = {
static const struct TrainerMonCustomized sParty_Miguel3[] = {
{
.iv = 0,
.lvl = 32,
@ -3953,7 +3953,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Miguel3[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Miguel4[] = {
static const struct TrainerMonCustomized sParty_Miguel4[] = {
{
.iv = 0,
.lvl = 35,
@ -3962,7 +3962,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Miguel4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Miguel5[] = {
static const struct TrainerMonCustomized sParty_Miguel5[] = {
{
.iv = 0,
.lvl = 38,
@ -3971,7 +3971,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Miguel5[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Victoria[] = {
static const struct TrainerMonCustomized sParty_Victoria[] = {
{
.iv = 50,
.lvl = 17,
@ -3980,7 +3980,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Victoria[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Vanessa[] = {
static const struct TrainerMonCustomized sParty_Vanessa[] = {
{
.iv = 0,
.lvl = 30,
@ -3989,7 +3989,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Vanessa[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Bethany[] = {
static const struct TrainerMonCustomized sParty_Bethany[] = {
{
.iv = 100,
.lvl = 35,
@ -4010,7 +4010,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Bethany[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Isabel1[] = {
static const struct TrainerMonCustomized sParty_Isabel1[] = {
{
.iv = 0,
.lvl = 14,
@ -4025,7 +4025,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Isabel1[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Isabel2[] = {
static const struct TrainerMonCustomized sParty_Isabel2[] = {
{
.iv = 10,
.lvl = 26,
@ -4040,7 +4040,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Isabel2[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Isabel3[] = {
static const struct TrainerMonCustomized sParty_Isabel3[] = {
{
.iv = 20,
.lvl = 29,
@ -4055,7 +4055,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Isabel3[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Isabel4[] = {
static const struct TrainerMonCustomized sParty_Isabel4[] = {
{
.iv = 30,
.lvl = 32,
@ -4070,7 +4070,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Isabel4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Isabel5[] = {
static const struct TrainerMonCustomized sParty_Isabel5[] = {
{
.iv = 40,
.lvl = 35,
@ -5161,7 +5161,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas4[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Nicolas5[] = {
static const struct TrainerMonCustomized sParty_Nicolas5[] = {
{
.iv = 140,
.lvl = 49,
@ -9403,7 +9403,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chris[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Dawson[] = {
static const struct TrainerMonCustomized sParty_Dawson[] = {
{
.iv = 0,
.lvl = 8,
@ -9418,7 +9418,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Dawson[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Sarah[] = {
static const struct TrainerMonCustomized sParty_Sarah[] = {
{
.iv = 0,
.lvl = 8,
@ -9462,7 +9462,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chandler[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_Kaleb[] = {
static const struct TrainerMonCustomized sParty_Kaleb[] = {
{
.iv = 0,
.lvl = 14,

62
src/data/trainers.h
View File

@ -1378,7 +1378,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Cindy1),
.party = EVERYTHING_CUSTOMIZED(sParty_Cindy1),
},
[TRAINER_DAPHNE] =
@ -1426,7 +1426,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Brianna),
.party = EVERYTHING_CUSTOMIZED(sParty_Brianna),
},
[TRAINER_NAOMI] =
@ -1438,7 +1438,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Naomi),
.party = EVERYTHING_CUSTOMIZED(sParty_Naomi),
},
[TRAINER_CINDY_3] =
@ -1450,7 +1450,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Cindy3),
.party = EVERYTHING_CUSTOMIZED(sParty_Cindy3),
},
[TRAINER_CINDY_4] =
@ -1462,7 +1462,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Cindy4),
.party = EVERYTHING_CUSTOMIZED(sParty_Cindy4),
},
[TRAINER_CINDY_5] =
@ -1474,7 +1474,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Cindy5),
.party = EVERYTHING_CUSTOMIZED(sParty_Cindy5),
},
[TRAINER_CINDY_6] =
@ -1642,7 +1642,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Winston1),
.party = EVERYTHING_CUSTOMIZED(sParty_Winston1),
},
[TRAINER_MOLLIE] =
@ -1666,7 +1666,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Garret),
.party = EVERYTHING_CUSTOMIZED(sParty_Garret),
},
[TRAINER_WINSTON_2] =
@ -1678,7 +1678,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Winston2),
.party = EVERYTHING_CUSTOMIZED(sParty_Winston2),
},
[TRAINER_WINSTON_3] =
@ -1690,7 +1690,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Winston3),
.party = EVERYTHING_CUSTOMIZED(sParty_Winston3),
},
[TRAINER_WINSTON_4] =
@ -1702,7 +1702,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Winston4),
.party = EVERYTHING_CUSTOMIZED(sParty_Winston4),
},
[TRAINER_WINSTON_5] =
@ -2254,7 +2254,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Nob5),
.party = EVERYTHING_CUSTOMIZED(sParty_Nob5),
},
[TRAINER_YUJI] =
@ -2782,7 +2782,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Jeffrey5),
.party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey5),
},
[TRAINER_EDWARD] =
@ -3514,7 +3514,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Victor),
.party = EVERYTHING_CUSTOMIZED(sParty_Victor),
},
[TRAINER_MIGUEL_1] =
@ -3526,7 +3526,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Miguel1),
.party = EVERYTHING_CUSTOMIZED(sParty_Miguel1),
},
[TRAINER_COLTON] =
@ -3550,7 +3550,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Miguel2),
.party = EVERYTHING_CUSTOMIZED(sParty_Miguel2),
},
[TRAINER_MIGUEL_3] =
@ -3562,7 +3562,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Miguel3),
.party = EVERYTHING_CUSTOMIZED(sParty_Miguel3),
},
[TRAINER_MIGUEL_4] =
@ -3574,7 +3574,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Miguel4),
.party = EVERYTHING_CUSTOMIZED(sParty_Miguel4),
},
[TRAINER_MIGUEL_5] =
@ -3586,7 +3586,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Miguel5),
.party = EVERYTHING_CUSTOMIZED(sParty_Miguel5),
},
[TRAINER_VICTORIA] =
@ -3598,7 +3598,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
.party = ITEM_DEFAULT_MOVES(sParty_Victoria),
.party = EVERYTHING_CUSTOMIZED(sParty_Victoria),
},
[TRAINER_VANESSA] =
@ -3610,7 +3610,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Vanessa),
.party = EVERYTHING_CUSTOMIZED(sParty_Vanessa),
},
[TRAINER_BETHANY] =
@ -3622,7 +3622,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Bethany),
.party = EVERYTHING_CUSTOMIZED(sParty_Bethany),
},
[TRAINER_ISABEL_1] =
@ -3634,7 +3634,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Isabel1),
.party = EVERYTHING_CUSTOMIZED(sParty_Isabel1),
},
[TRAINER_ISABEL_2] =
@ -3646,7 +3646,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Isabel2),
.party = EVERYTHING_CUSTOMIZED(sParty_Isabel2),
},
[TRAINER_ISABEL_3] =
@ -3658,7 +3658,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Isabel3),
.party = EVERYTHING_CUSTOMIZED(sParty_Isabel3),
},
[TRAINER_ISABEL_4] =
@ -3670,7 +3670,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Isabel4),
.party = EVERYTHING_CUSTOMIZED(sParty_Isabel4),
},
[TRAINER_ISABEL_5] =
@ -3682,7 +3682,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Isabel5),
.party = EVERYTHING_CUSTOMIZED(sParty_Isabel5),
},
[TRAINER_TIMOTHY_1] =
@ -4762,7 +4762,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Nicolas5),
.party = EVERYTHING_CUSTOMIZED(sParty_Nicolas5),
},
[TRAINER_AARON] =
@ -8338,7 +8338,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Dawson),
.party = EVERYTHING_CUSTOMIZED(sParty_Dawson),
},
[TRAINER_SARAH] =
@ -8350,7 +8350,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Sarah),
.party = EVERYTHING_CUSTOMIZED(sParty_Sarah),
},
[TRAINER_DARIAN] =
@ -8398,7 +8398,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Kaleb),
.party = EVERYTHING_CUSTOMIZED(sParty_Kaleb),
},
[TRAINER_JOSEPH] =

3
src/match_call.c
View File

@ -1806,9 +1806,6 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr)
case F_TRAINER_PARTY_CUSTOM_MOVESET:
speciesName = gSpeciesNames[party.NoItemCustomMoves[monId].species];
break;
case F_TRAINER_PARTY_HELD_ITEM:
speciesName = gSpeciesNames[party.ItemDefaultMoves[monId].species];
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
speciesName = gSpeciesNames[party.EverythingCustomized[monId].species];
break;