summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvblm12 <vblm12@gmail.com>2018-07-20 21:32:31 -0500
committervblm12 <vblm12@gmail.com>2018-07-20 21:32:31 -0500
commit56746748402b691a6fa4fb45a2091dac31d92f7d (patch)
tree96764c7b22c73e13ee58b0bf248034780a810075 /src
parent68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (diff)
Rename OPPONENT_ to TRAINER_ to match pokeemerald.
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_setup.c120
-rw-r--r--src/data/trainers_de.h1388
-rw-r--r--src/data/trainers_en.h1388
3 files changed, 1448 insertions, 1448 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index e8a3ef451..c1d486bd1 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -160,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
{
{
- {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
+ {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5},
MAP_GROUP(ROUTE118),
MAP_NUM(ROUTE118),
},
{
- {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
+ {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5},
MAP_GROUP(ROUTE111),
MAP_NUM(ROUTE111),
},
{
- {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
+ {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5},
MAP_GROUP(ROUTE109),
MAP_NUM(ROUTE109),
},
{
- {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
+ {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5},
MAP_GROUP(ROUTE109),
MAP_NUM(ROUTE109),
},
{
- {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
+ {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5},
MAP_GROUP(ROUTE124),
MAP_NUM(ROUTE124),
},
{
- {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
+ {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5},
MAP_GROUP(ROUTE111),
MAP_NUM(ROUTE111),
},
{
- {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
+ {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5},
MAP_GROUP(ROUTE111),
MAP_NUM(ROUTE111),
},
{
- {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
+ {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5},
MAP_GROUP(MT_PYRE_6F),
MAP_NUM(MT_PYRE_6F),
},
{
- {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
+ {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6},
MAP_GROUP(ROUTE104),
MAP_NUM(ROUTE104),
},
{
- {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
+ {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5},
MAP_GROUP(ROUTE121),
MAP_NUM(ROUTE121),
},
{
- {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
+ {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5},
MAP_GROUP(ROUTE104),
MAP_NUM(ROUTE104),
},
{
- {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
+ {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5},
MAP_GROUP(ROUTE114),
MAP_NUM(ROUTE114),
},
{
- {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
+ {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5},
MAP_GROUP(ROUTE107),
MAP_NUM(ROUTE107),
},
{
- {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
+ {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5},
MAP_GROUP(ROUTE115),
MAP_NUM(ROUTE115),
},
{
- {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
+ {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5},
MAP_GROUP(ROUTE118),
MAP_NUM(ROUTE118),
},
{
- {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
+ {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5},
MAP_GROUP(ROUTE114),
MAP_NUM(ROUTE114),
},
{
- {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
+ {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5},
MAP_GROUP(JAGGED_PASS),
MAP_NUM(JAGGED_PASS),
},
{
- {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
+ {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5},
MAP_GROUP(METEOR_FALLS_1F_2R),
MAP_NUM(METEOR_FALLS_1F_2R),
},
{
- {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
+ {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5},
MAP_GROUP(ROUTE120),
MAP_NUM(ROUTE120),
},
{
- {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
+ {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5},
MAP_GROUP(ROUTE123),
MAP_NUM(ROUTE123),
},
{
- {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
+ {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5},
MAP_GROUP(ROUTE123),
MAP_NUM(ROUTE123),
},
{
- {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
+ {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5},
MAP_GROUP(ROUTE121),
MAP_NUM(ROUTE121),
},
{
- {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
+ {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5},
MAP_GROUP(ROUTE116),
MAP_NUM(ROUTE116),
},
{
- {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
+ {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5},
MAP_GROUP(ROUTE116),
MAP_NUM(ROUTE116),
},
{
- {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
+ {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5},
MAP_GROUP(ROUTE117),
MAP_NUM(ROUTE117),
},
{
- {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
+ {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5},
MAP_GROUP(ROUTE110),
MAP_NUM(ROUTE110),
},
{
- {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
+ {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5},
MAP_GROUP(ROUTE103),
MAP_NUM(ROUTE103),
},
{
- {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
+ {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5},
MAP_GROUP(ROUTE115),
MAP_NUM(ROUTE115),
},
{
- {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
+ {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5},
MAP_GROUP(MT_CHIMNEY),
MAP_NUM(MT_CHIMNEY),
},
{
- {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
+ {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5},
MAP_GROUP(ROUTE102),
MAP_NUM(ROUTE102),
},
{
- {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
+ {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5},
MAP_GROUP(ROUTE106),
MAP_NUM(ROUTE106),
},
{
- {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
+ {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5},
MAP_GROUP(ROUTE110),
MAP_NUM(ROUTE110),
},
{
- {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
+ {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5},
MAP_GROUP(ROUTE110),
MAP_NUM(ROUTE110),
},
{
- {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
+ {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5},
MAP_GROUP(ROUTE128),
MAP_NUM(ROUTE128),
},
{
- {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
+ {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5},
MAP_GROUP(ROUTE128),
MAP_NUM(ROUTE128),
},
{
- {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
+ {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5},
MAP_GROUP(ROUTE117),
MAP_NUM(ROUTE117),
},
{
- {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
+ {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5},
MAP_GROUP(ROUTE117),
MAP_NUM(ROUTE117),
},
{
- {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
+ {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5},
MAP_GROUP(METEOR_FALLS_1F_2R),
MAP_NUM(METEOR_FALLS_1F_2R),
},
{
- {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
+ {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5},
MAP_GROUP(ROUTE120),
MAP_NUM(ROUTE120),
},
{
- {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
+ {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5},
MAP_GROUP(ROUTE113),
MAP_NUM(ROUTE113),
},
{
- {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
+ {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5},
MAP_GROUP(ROUTE115),
MAP_NUM(ROUTE115),
},
{
- {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
+ {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5},
MAP_GROUP(ROUTE113),
MAP_NUM(ROUTE113),
},
{
- {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
+ {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5},
MAP_GROUP(ROUTE124),
MAP_NUM(ROUTE124),
},
{
- {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
+ {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5},
MAP_GROUP(JAGGED_PASS),
MAP_NUM(JAGGED_PASS),
},
{
- {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
+ {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6},
MAP_GROUP(ROUTE103),
MAP_NUM(ROUTE103),
},
{
- {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
+ {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5},
MAP_GROUP(ROUTE125),
MAP_NUM(ROUTE125),
},
{
- {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
+ {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5},
MAP_GROUP(ROUTE110),
MAP_NUM(ROUTE110),
},
{
- {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
+ {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5},
MAP_GROUP(ROUTE117),
MAP_NUM(ROUTE117),
},
{
- {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
+ {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5},
MAP_GROUP(ROUTE117),
MAP_NUM(ROUTE117),
},
{
- {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
+ {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5},
MAP_GROUP(ROUTE119),
MAP_NUM(ROUTE119),
},
{
- {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
+ {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5},
MAP_GROUP(ROUTE119),
MAP_NUM(ROUTE119),
},
{
- {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
+ {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5},
MAP_GROUP(ROUTE104),
MAP_NUM(ROUTE104),
},
{
- {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
+ {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5},
MAP_GROUP(PETALBURG_WOODS),
MAP_NUM(PETALBURG_WOODS),
},
{
- {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
+ {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5},
MAP_GROUP(ROUTE112),
MAP_NUM(ROUTE112),
},
{
- {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
+ {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5},
MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F),
MAP_NUM(ABANDONED_SHIP_ROOMS2_1F),
},
{
- {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
+ {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE},
MAP_GROUP(VICTORY_ROAD_1F),
MAP_NUM(VICTORY_ROAD_1F),
},
@@ -809,13 +809,13 @@ static u8 GetTrainerBattleTransition(void)
if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR)
{
- if (gTrainerBattleOpponent == OPPONENT_SIDNEY)
+ if (gTrainerBattleOpponent == TRAINER_SIDNEY)
return B_TRANSITION_SYDNEY;
- if (gTrainerBattleOpponent == OPPONENT_PHOEBE)
+ if (gTrainerBattleOpponent == TRAINER_PHOEBE)
return B_TRANSITION_PHOEBE;
- if (gTrainerBattleOpponent == OPPONENT_GLACIA)
+ if (gTrainerBattleOpponent == TRAINER_GLACIA)
return B_TRANSITION_GLACIA;
- if (gTrainerBattleOpponent == OPPONENT_DRAKE)
+ if (gTrainerBattleOpponent == TRAINER_DRAKE)
return B_TRANSITION_DRAKE;
return B_TRANSITION_STEVEN;
}
diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h
index c7a0e7744..7344347e1 100644
--- a/src/data/trainers_de.h
+++ b/src/data/trainers_de.h
@@ -1,5 +1,5 @@
const struct Trainer gTrainers[] = {
- [OPPONENT_NONE] =
+ [TRAINER_NONE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = {
.party = NULL
},
- [OPPONENT_ARCHIE_1] =
+ [TRAINER_ARCHIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie1
},
- [OPPONENT_GRUNT_1] =
+ [TRAINER_GRUNT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt1
},
- [OPPONENT_GRUNT_2] =
+ [TRAINER_GRUNT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt2
},
- [OPPONENT_GRUNT_3] =
+ [TRAINER_GRUNT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt3
},
- [OPPONENT_GRUNT_4] =
+ [TRAINER_GRUNT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt4
},
- [OPPONENT_GRUNT_5] =
+ [TRAINER_GRUNT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt5
},
- [OPPONENT_GRUNT_6] =
+ [TRAINER_GRUNT_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt6
},
- [OPPONENT_GRUNT_7] =
+ [TRAINER_GRUNT_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt7
},
- [OPPONENT_GRUNT_8] =
+ [TRAINER_GRUNT_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt8
},
- [OPPONENT_GRUNT_9] =
+ [TRAINER_GRUNT_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt9
},
- [OPPONENT_GRUNT_10] =
+ [TRAINER_GRUNT_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt10
},
- [OPPONENT_GRUNT_11] =
+ [TRAINER_GRUNT_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt11
},
- [OPPONENT_GRUNT_12] =
+ [TRAINER_GRUNT_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt12
},
- [OPPONENT_GRUNT_13] =
+ [TRAINER_GRUNT_13] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt13
},
- [OPPONENT_GRUNT_14] =
+ [TRAINER_GRUNT_14] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt14
},
- [OPPONENT_GRUNT_15] =
+ [TRAINER_GRUNT_15] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt15
},
- [OPPONENT_GRUNT_16] =
+ [TRAINER_GRUNT_16] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt16
},
- [OPPONENT_GRUNT_17] =
+ [TRAINER_GRUNT_17] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt17
},
- [OPPONENT_GRUNT_18] =
+ [TRAINER_GRUNT_18] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt18
},
- [OPPONENT_GRUNT_19] =
+ [TRAINER_GRUNT_19] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt19
},
- [OPPONENT_GRUNT_20] =
+ [TRAINER_GRUNT_20] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt20
},
- [OPPONENT_GRUNT_21] =
+ [TRAINER_GRUNT_21] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt21
},
- [OPPONENT_GRUNT_22] =
+ [TRAINER_GRUNT_22] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt22
},
- [OPPONENT_GRUNT_23] =
+ [TRAINER_GRUNT_23] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt23
},
- [OPPONENT_GRUNT_24] =
+ [TRAINER_GRUNT_24] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt24
},
- [OPPONENT_GRUNT_25] =
+ [TRAINER_GRUNT_25] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt25
},
- [OPPONENT_GRUNT_26] =
+ [TRAINER_GRUNT_26] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt26
},
- [OPPONENT_GRUNT_27] =
+ [TRAINER_GRUNT_27] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt27
},
- [OPPONENT_ANONYMOUS_1] =
+ [TRAINER_ANONYMOUS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous1
},
- [OPPONENT_MATT_1] =
+ [TRAINER_MATT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matt1
},
- [OPPONENT_MATT_2] =
+ [TRAINER_MATT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matt2
},
- [OPPONENT_SHELLY_1] =
+ [TRAINER_SHELLY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelly1
},
- [OPPONENT_SHELLY_2] =
+ [TRAINER_SHELLY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelly2
},
- [OPPONENT_ARCHIE_2] =
+ [TRAINER_ARCHIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie2
},
- [OPPONENT_ARCHIE_3] =
+ [TRAINER_ARCHIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie3
},
- [OPPONENT_DAISY] =
+ [TRAINER_DAISY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Daisy
},
- [OPPONENT_ROSE_1] =
+ [TRAINER_ROSE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose1
},
- [OPPONENT_LILY] =
+ [TRAINER_LILY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lily
},
- [OPPONENT_VIOLET] =
+ [TRAINER_VIOLET] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Violet
},
- [OPPONENT_ROSE_2] =
+ [TRAINER_ROSE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose2
},
- [OPPONENT_ROSE_3] =
+ [TRAINER_ROSE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose3
},
- [OPPONENT_ROSE_4] =
+ [TRAINER_ROSE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose4
},
- [OPPONENT_ROSE_5] =
+ [TRAINER_ROSE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose5
},
- [OPPONENT_DUSTY_1] =
+ [TRAINER_DUSTY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty1
},
- [OPPONENT_CHIP] =
+ [TRAINER_CHIP] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chip
},
- [OPPONENT_FOSTER] =
+ [TRAINER_FOSTER] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Foster
},
- [OPPONENT_DUSTY_2] =
+ [TRAINER_DUSTY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty2
},
- [OPPONENT_DUSTY_3] =
+ [TRAINER_DUSTY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty3
},
- [OPPONENT_DUSTY_4] =
+ [TRAINER_DUSTY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty4
},
- [OPPONENT_DUSTY_5] =
+ [TRAINER_DUSTY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty5
},
- [OPPONENT_GABBY_AND_TY_1] =
+ [TRAINER_GABBY_AND_TY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy1
},
- [OPPONENT_GABBY_AND_TY_2] =
+ [TRAINER_GABBY_AND_TY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy2
},
- [OPPONENT_GABBY_AND_TY_3] =
+ [TRAINER_GABBY_AND_TY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy3
},
- [OPPONENT_GABBY_AND_TY_4] =
+ [TRAINER_GABBY_AND_TY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy4
},
- [OPPONENT_GABBY_AND_TY_5] =
+ [TRAINER_GABBY_AND_TY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy5
},
- [OPPONENT_GABBY_AND_TY_6] =
+ [TRAINER_GABBY_AND_TY_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy6
},
- [OPPONENT_LOLA_1] =
+ [TRAINER_LOLA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola1
},
- [OPPONENT_CARMEN] =
+ [TRAINER_CARMEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carmen
},
- [OPPONENT_GWEN] =
+ [TRAINER_GWEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gwen
},
- [OPPONENT_LOLA_2] =
+ [TRAINER_LOLA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola2
},
- [OPPONENT_LOLA_3] =
+ [TRAINER_LOLA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola3
},
- [OPPONENT_LOLA_4] =
+ [TRAINER_LOLA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola4
},
- [OPPONENT_LOLA_5] =
+ [TRAINER_LOLA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola5
},
- [OPPONENT_RICKY_1] =
+ [TRAINER_RICKY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky1
},
- [OPPONENT_SIMON] =
+ [TRAINER_SIMON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Simon
},
- [OPPONENT_CHARLIE] =
+ [TRAINER_CHARLIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Charlie
},
- [OPPONENT_RICKY_2] =
+ [TRAINER_RICKY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky2
},
- [OPPONENT_RICKY_3] =
+ [TRAINER_RICKY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky3
},
- [OPPONENT_RICKY_4] =
+ [TRAINER_RICKY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky4
},
- [OPPONENT_RICKY_5] =
+ [TRAINER_RICKY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky5
},
- [OPPONENT_RANDALL] =
+ [TRAINER_RANDALL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Randall
},
- [OPPONENT_PARKER] =
+ [TRAINER_PARKER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Parker
},
- [OPPONENT_GEORGE] =
+ [TRAINER_GEORGE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_George
},
- [OPPONENT_BERKE] =
+ [TRAINER_BERKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Berke
},
- [OPPONENT_CLYDE] =
+ [TRAINER_CLYDE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clyde
},
- [OPPONENT_VINCENT] =
+ [TRAINER_VINCENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vincent
},
- [OPPONENT_LEROY] =
+ [TRAINER_LEROY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Leroy
},
- [OPPONENT_WILTON_1] =
+ [TRAINER_WILTON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton1
},
- [OPPONENT_EDGAR] =
+ [TRAINER_EDGAR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edgar
},
- [OPPONENT_ALBERT] =
+ [TRAINER_ALBERT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Albert
},
- [OPPONENT_SAMUEL] =
+ [TRAINER_SAMUEL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Samuel
},
- [OPPONENT_VITO] =
+ [TRAINER_VITO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vito
},
- [OPPONENT_OWEN] =
+ [TRAINER_OWEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Owen
},
- [OPPONENT_WILTON_2] =
+ [TRAINER_WILTON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton2
},
- [OPPONENT_WILTON_3] =
+ [TRAINER_WILTON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton3
},
- [OPPONENT_WILTON_4] =
+ [TRAINER_WILTON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton4
},
- [OPPONENT_WILTON_5] =
+ [TRAINER_WILTON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton5
},
- [OPPONENT_WARREN] =
+ [TRAINER_WARREN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Warren
},
- [OPPONENT_MARY] =
+ [TRAINER_MARY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mary
},
- [OPPONENT_LORI] =
+ [TRAINER_LORI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lori
},
- [OPPONENT_JODY] =
+ [TRAINER_JODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jody
},
- [OPPONENT_WENDY] =
+ [TRAINER_WENDY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wendy
},
- [OPPONENT_ELAINE] =
+ [TRAINER_ELAINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elaine
},
- [OPPONENT_BROOKE_1] =
+ [TRAINER_BROOKE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke1
},
- [OPPONENT_JENNIFER] =
+ [TRAINER_JENNIFER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jennifer
},
- [OPPONENT_HOPE] =
+ [TRAINER_HOPE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hope
},
- [OPPONENT_SHANNON] =
+ [TRAINER_SHANNON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shannon
},
- [OPPONENT_MICHELLE] =
+ [TRAINER_MICHELLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Michelle
},
- [OPPONENT_CAROLINE] =
+ [TRAINER_CAROLINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Caroline
},
- [OPPONENT_JULIE] =
+ [TRAINER_JULIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Julie
},
- [OPPONENT_BROOKE_2] =
+ [TRAINER_BROOKE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke2
},
- [OPPONENT_BROOKE_3] =
+ [TRAINER_BROOKE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke3
},
- [OPPONENT_BROOKE_4] =
+ [TRAINER_BROOKE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke4
},
- [OPPONENT_BROOKE_5] =
+ [TRAINER_BROOKE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke5
},
- [OPPONENT_PATRICIA] =
+ [TRAINER_PATRICIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Patricia
},
- [OPPONENT_KINDRA] =
+ [TRAINER_KINDRA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kindra
},
- [OPPONENT_TAMMY] =
+ [TRAINER_TAMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tammy
},
- [OPPONENT_VALERIE_1] =
+ [TRAINER_VALERIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie1
},
- [OPPONENT_TASHA] =
+ [TRAINER_TASHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tasha
},
- [OPPONENT_VALERIE_2] =
+ [TRAINER_VALERIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie2
},
- [OPPONENT_VALERIE_3] =
+ [TRAINER_VALERIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie3
},
- [OPPONENT_VALERIE_4] =
+ [TRAINER_VALERIE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie4
},
- [OPPONENT_VALERIE_5] =
+ [TRAINER_VALERIE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie5
},
- [OPPONENT_CINDY_1] =
+ [TRAINER_CINDY_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy1
},
- [OPPONENT_ANONYMOUS_2] =
+ [TRAINER_ANONYMOUS_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous2
},
- [OPPONENT_BRIANNA_1] =
+ [TRAINER_BRIANNA_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brianna1
},
- [OPPONENT_CINDY_2] =
+ [TRAINER_CINDY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy2
},
- [OPPONENT_BRIANNA_2] =
+ [TRAINER_BRIANNA_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brianna2
},
- [OPPONENT_ANETTE] =
+ [TRAINER_ANETTE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anette
},
- [OPPONENT_CINDY_3] =
+ [TRAINER_CINDY_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy3
},
- [OPPONENT_CINDY_4] =
+ [TRAINER_CINDY_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy4
},
- [OPPONENT_CINDY_5] =
+ [TRAINER_CINDY_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy5
},
- [OPPONENT_CINDY_6] =
+ [TRAINER_CINDY_6] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy6
},
- [OPPONENT_MELISSA] =
+ [TRAINER_MELISSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Melissa
},
- [OPPONENT_SHEILA] =
+ [TRAINER_SHEILA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sheila
},
- [OPPONENT_SHIRLEY] =
+ [TRAINER_SHIRLEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shirley
},
- [OPPONENT_JESSICA_1] =
+ [TRAINER_JESSICA_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica1
},
- [OPPONENT_CONNIE] =
+ [TRAINER_CONNIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Connie
},
- [OPPONENT_BRIDGET] =
+ [TRAINER_BRIDGET] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bridget
},
- [OPPONENT_OLIVIA] =
+ [TRAINER_OLIVIA] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Olivia
},
- [OPPONENT_TIFFANY] =
+ [TRAINER_TIFFANY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tiffany
},
- [OPPONENT_JESSICA_2] =
+ [TRAINER_JESSICA_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica2
},
- [OPPONENT_JESSICA_3] =
+ [TRAINER_JESSICA_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica3
},
- [OPPONENT_JESSICA_4] =
+ [TRAINER_JESSICA_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica4
},
- [OPPONENT_JESSICA_5] =
+ [TRAINER_JESSICA_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica5
},
- [OPPONENT_WINSTON_1] =
+ [TRAINER_WINSTON_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston1
},
- [OPPONENT_ANONYMOUS_3] =
+ [TRAINER_ANONYMOUS_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous3
},
- [OPPONENT_GARRET] =
+ [TRAINER_GARRET] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Garret
},
- [OPPONENT_WINSTON_2] =
+ [TRAINER_WINSTON_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston2
},
- [OPPONENT_WINSTON_3] =
+ [TRAINER_WINSTON_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston3
},
- [OPPONENT_WINSTON_4] =
+ [TRAINER_WINSTON_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston4
},
- [OPPONENT_WINSTON_5] =
+ [TRAINER_WINSTON_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston5
},
- [OPPONENT_STEVE_1] =
+ [TRAINER_STEVE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve1
},
- [OPPONENT_CHRIS] =
+ [TRAINER_CHRIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chris
},
- [OPPONENT_MARK] =
+ [TRAINER_MARK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mark
},
- [OPPONENT_KENN] =
+ [TRAINER_KENN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kenn
},
- [OPPONENT_STEVE_2] =
+ [TRAINER_STEVE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve2
},
- [OPPONENT_STEVE_3] =
+ [TRAINER_STEVE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve3
},
- [OPPONENT_STEVE_4] =
+ [TRAINER_STEVE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve4
},
- [OPPONENT_STEVE_5] =
+ [TRAINER_STEVE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve5
},
- [OPPONENT_LUIS] =
+ [TRAINER_LUIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Luis
},
- [OPPONENT_AUSTIN] =
+ [TRAINER_AUSTIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Austin
},
- [OPPONENT_DOUGLAS] =
+ [TRAINER_DOUGLAS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Douglas
},
- [OPPONENT_DARRIN] =
+ [TRAINER_DARRIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Darrin
},
- [OPPONENT_TONY_1] =
+ [TRAINER_TONY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony1
},
- [OPPONENT_JEROME] =
+ [TRAINER_JEROME] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerome
},
- [OPPONENT_MATTHEW] =
+ [TRAINER_MATTHEW] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matthew
},
- [OPPONENT_DAVID] =
+ [TRAINER_DAVID] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_David
},
- [OPPONENT_SPENCER] =
+ [TRAINER_SPENCER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Spencer
},
- [OPPONENT_ROLAND] =
+ [TRAINER_ROLAND] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roland
},
- [OPPONENT_CODY] =
+ [TRAINER_CODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cody
},
- [OPPONENT_STAN] =
+ [TRAINER_STAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Stan
},
- [OPPONENT_BARRY] =
+ [TRAINER_BARRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Barry
},
- [OPPONENT_DEAN] =
+ [TRAINER_DEAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dean
},
- [OPPONENT_RODNEY] =
+ [TRAINER_RODNEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rodney
},
- [OPPONENT_RICHARD] =
+ [TRAINER_RICHARD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Richard
},
- [OPPONENT_HERMAN] =
+ [TRAINER_HERMAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Herman
},
- [OPPONENT_ANONYMOUS_4] =
+ [TRAINER_ANONYMOUS_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous4
},
- [OPPONENT_GILBERT] =
+ [TRAINER_GILBERT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gilbert
},
- [OPPONENT_FRANKLIN] =
+ [TRAINER_FRANKLIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Franklin
},
- [OPPONENT_DANNY] =
+ [TRAINER_DANNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Danny
},
- [OPPONENT_JACK] =
+ [TRAINER_JACK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jack
},
- [OPPONENT_DUDLEY] =
+ [TRAINER_DUDLEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dudley
},
- [OPPONENT_CHAD] =
+ [TRAINER_CHAD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chad
},
- [OPPONENT_TONY_2] =
+ [TRAINER_TONY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony2
},
- [OPPONENT_TONY_3] =
+ [TRAINER_TONY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony3
},
- [OPPONENT_TONY_4] =
+ [TRAINER_TONY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony4
},
- [OPPONENT_TONY_5] =
+ [TRAINER_TONY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony5
},
- [OPPONENT_HIDEKI] =
+ [TRAINER_HIDEKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideki
},
- [OPPONENT_HITOSHI] =
+ [TRAINER_HITOSHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hitoshi
},
- [OPPONENT_KIYO] =
+ [TRAINER_KIYO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kiyo
},
- [OPPONENT_KOICHI] =
+ [TRAINER_KOICHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Koichi
},
- [OPPONENT_NOB_1] =
+ [TRAINER_NOB_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob1
},
- [OPPONENT_NOB_2] =
+ [TRAINER_NOB_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob2
},
- [OPPONENT_NOB_3] =
+ [TRAINER_NOB_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob3
},
- [OPPONENT_NOB_4] =
+ [TRAINER_NOB_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob4
},
- [OPPONENT_NOB_5] =
+ [TRAINER_NOB_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob5
},
- [OPPONENT_YUJI] =
+ [TRAINER_YUJI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Yuji
},
- [OPPONENT_DAISUKE] =
+ [TRAINER_DAISUKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Daisuke
},
- [OPPONENT_ATSUSHI] =
+ [TRAINER_ATSUSHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Atsushi
},
- [OPPONENT_KIRK] =
+ [TRAINER_KIRK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kirk
},
- [OPPONENT_SCOTT] =
+ [TRAINER_SCOTT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Scott
},
- [OPPONENT_HARVEY] =
+ [TRAINER_HARVEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Harvey
},
- [OPPONENT_SHAWN] =
+ [TRAINER_SHAWN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shawn
},
- [OPPONENT_RANDY] =
+ [TRAINER_RANDY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Randy
},
- [OPPONENT_DALTON_1] =
+ [TRAINER_DALTON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton1
},
- [OPPONENT_DALTON_2] =
+ [TRAINER_DALTON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton2
},
- [OPPONENT_DALTON_3] =
+ [TRAINER_DALTON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton3
},
- [OPPONENT_DALTON_4] =
+ [TRAINER_DALTON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton4
},
- [OPPONENT_DALTON_5] =
+ [TRAINER_DALTON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton5
},
- [OPPONENT_COLE] =
+ [TRAINER_COLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cole
},
- [OPPONENT_FLINT] =
+ [TRAINER_FLINT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Flint
},
- [OPPONENT_AXLE] =
+ [TRAINER_AXLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Axle
},
- [OPPONENT_JAKE] =
+ [TRAINER_JAKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jake
},
- [OPPONENT_ANDY] =
+ [TRAINER_ANDY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andy
},
- [OPPONENT_BERNIE_1] =
+ [TRAINER_BERNIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie1
},
- [OPPONENT_BERNIE_2] =
+ [TRAINER_BERNIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie2
},
- [OPPONENT_BERNIE_3] =
+ [TRAINER_BERNIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie3
},
- [OPPONENT_BERNIE_4] =
+ [TRAINER_BERNIE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie4
},
- [OPPONENT_BERNIE_5] =
+ [TRAINER_BERNIE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie5
},
- [OPPONENT_DREW] =
+ [TRAINER_DREW] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Drew
},
- [OPPONENT_CLIFF] =
+ [TRAINER_CLIFF] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cliff
},
- [OPPONENT_LARRY] =
+ [TRAINER_LARRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Larry
},
- [OPPONENT_SHANE] =
+ [TRAINER_SHANE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shane
},
- [OPPONENT_JUSTIN] =
+ [TRAINER_JUSTIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Justin
},
- [OPPONENT_ETHAN_1] =
+ [TRAINER_ETHAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan1
},
- [OPPONENT_JEFF] =
+ [TRAINER_JEFF] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jeff
},
- [OPPONENT_TRAVIS] =
+ [TRAINER_TRAVIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Travis
},
- [OPPONENT_ETHAN_2] =
+ [TRAINER_ETHAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan2
},
- [OPPONENT_ETHAN_3] =
+ [TRAINER_ETHAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan3
},
- [OPPONENT_ETHAN_4] =
+ [TRAINER_ETHAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan4
},
- [OPPONENT_ETHAN_5] =
+ [TRAINER_ETHAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan5
},
- [OPPONENT_BRENT] =
+ [TRAINER_BRENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brent
},
- [OPPONENT_DONALD] =
+ [TRAINER_DONALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Donald
},
- [OPPONENT_TAYLOR] =
+ [TRAINER_TAYLOR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Taylor
},
- [OPPONENT_BRANDON_1] =
+ [TRAINER_BRANDON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon1
},
- [OPPONENT_DEREK] =
+ [TRAINER_DEREK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Derek
},
- [OPPONENT_BRANDON_2] =
+ [TRAINER_BRANDON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon2
},
- [OPPONENT_BRANDON_3] =
+ [TRAINER_BRANDON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon3
},
- [OPPONENT_BRANDON_4] =
+ [TRAINER_BRANDON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon4
},
- [OPPONENT_BRANDON_5] =
+ [TRAINER_BRANDON_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon5
},
- [OPPONENT_EDWARD] =
+ [TRAINER_EDWARD] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edward
},
- [OPPONENT_PRESTON] =
+ [TRAINER_PRESTON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Preston
},
- [OPPONENT_VIRGIL] =
+ [TRAINER_VIRGIL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Virgil
},
- [OPPONENT_FRITZ] =
+ [TRAINER_FRITZ] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Fritz
},
- [OPPONENT_WILLIAM] =
+ [TRAINER_WILLIAM] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_William
},
- [OPPONENT_JOSHUA] =
+ [TRAINER_JOSHUA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Joshua
},
- [OPPONENT_CAMERON_1] =
+ [TRAINER_CAMERON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron1
},
- [OPPONENT_CAMERON_2] =
+ [TRAINER_CAMERON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron2
},
- [OPPONENT_CAMERON_3] =
+ [TRAINER_CAMERON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron3
},
- [OPPONENT_CAMERON_4] =
+ [TRAINER_CAMERON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron4
},
- [OPPONENT_CAMERON_5] =
+ [TRAINER_CAMERON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron5
},
- [OPPONENT_JACLYN] =
+ [TRAINER_JACLYN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jaclyn
},
- [OPPONENT_HANNAH] =
+ [TRAINER_HANNAH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hannah
},
- [OPPONENT_SAMANTHA] =
+ [TRAINER_SAMANTHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Samantha
},
- [OPPONENT_MAURA] =
+ [TRAINER_MAURA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maura
},
- [OPPONENT_KAYLA] =
+ [TRAINER_KAYLA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kayla
},
- [OPPONENT_ALEXIS] =
+ [TRAINER_ALEXIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexis
},
- [OPPONENT_JACKI_1] =
+ [TRAINER_JACKI_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki1
},
- [OPPONENT_JACKI_2] =
+ [TRAINER_JACKI_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki2
},
- [OPPONENT_JACKI_3] =
+ [TRAINER_JACKI_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki3
},
- [OPPONENT_JACKI_4] =
+ [TRAINER_JACKI_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki4
},
- [OPPONENT_JACKI_5] =
+ [TRAINER_JACKI_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki5
},
- [OPPONENT_WALTER_1] =
+ [TRAINER_WALTER_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter1
},
- [OPPONENT_TUCKER] =
+ [TRAINER_TUCKER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tucker
},
- [OPPONENT_THOMAS] =
+ [TRAINER_THOMAS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Thomas
},
- [OPPONENT_WALTER_2] =
+ [TRAINER_WALTER_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter2
},
- [OPPONENT_WALTER_3] =
+ [TRAINER_WALTER_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter3
},
- [OPPONENT_WALTER_4] =
+ [TRAINER_WALTER_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter4
},
- [OPPONENT_WALTER_5] =
+ [TRAINER_WALTER_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter5
},
- [OPPONENT_SIDNEY] =
+ [TRAINER_SIDNEY] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sidney
},
- [OPPONENT_PHOEBE] =
+ [TRAINER_PHOEBE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phoebe
},
- [OPPONENT_GLACIA] =
+ [TRAINER_GLACIA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Glacia
},
- [OPPONENT_DRAKE] =
+ [TRAINER_DRAKE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Drake
},
- [OPPONENT_ROXANNE] =
+ [TRAINER_ROXANNE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roxanne
},
- [OPPONENT_BRAWLY] =
+ [TRAINER_BRAWLY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brawly
},
- [OPPONENT_WATTSON] =
+ [TRAINER_WATTSON] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wattson
},
- [OPPONENT_FLANNERY] =
+ [TRAINER_FLANNERY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Flannery
},
- [OPPONENT_NORMAN] =
+ [TRAINER_NORMAN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Norman
},
- [OPPONENT_WINONA] =
+ [TRAINER_WINONA] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winona
},
- [OPPONENT_TATE_AND_LIZA] =
+ [TRAINER_TATE_AND_LIZA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_TateAndLiza
},
- [OPPONENT_WALLACE] =
+ [TRAINER_WALLACE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wallace
},
- [OPPONENT_JERRY_1] =
+ [TRAINER_JERRY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry1
},
- [OPPONENT_TED] =
+ [TRAINER_TED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ted
},
- [OPPONENT_PAUL] =
+ [TRAINER_PAUL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Paul
},
- [OPPONENT_JERRY_2] =
+ [TRAINER_JERRY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry2
},
- [OPPONENT_JERRY_3] =
+ [TRAINER_JERRY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry3
},
- [OPPONENT_JERRY_4] =
+ [TRAINER_JERRY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry4
},
- [OPPONENT_JERRY_5] =
+ [TRAINER_JERRY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry5
},
- [OPPONENT_KAREN_1] =
+ [TRAINER_KAREN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen1
},
- [OPPONENT_GEORGIA] =
+ [TRAINER_GEORGIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Georgia
},
- [OPPONENT_KAREN_2] =
+ [TRAINER_KAREN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen2
},
- [OPPONENT_KAREN_3] =
+ [TRAINER_KAREN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen3
},
- [OPPONENT_KAREN_4] =
+ [TRAINER_KAREN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen4
},
- [OPPONENT_KAREN_5] =
+ [TRAINER_KAREN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen5
},
- [OPPONENT_KATE_AND_JOY] =
+ [TRAINER_KATE_AND_JOY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_KateAndJoy
},
- [OPPONENT_ANNA_AND_MEG_1] =
+ [TRAINER_ANNA_AND_MEG_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg1
},
- [OPPONENT_ANNA_AND_MEG_2] =
+ [TRAINER_ANNA_AND_MEG_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg2
},
- [OPPONENT_ANNA_AND_MEG_3] =
+ [TRAINER_ANNA_AND_MEG_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg3
},
- [OPPONENT_ANNA_AND_MEG_4] =
+ [TRAINER_ANNA_AND_MEG_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg4
},
- [OPPONENT_ANNA_AND_MEG_5] =
+ [TRAINER_ANNA_AND_MEG_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg5
},
- [OPPONENT_VICTOR] =
+ [TRAINER_VICTOR] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Victor
},
- [OPPONENT_MIGUEL_1] =
+ [TRAINER_MIGUEL_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel1
},
- [OPPONENT_COLTON] =
+ [TRAINER_COLTON] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Colton
},
- [OPPONENT_MIGUEL_2] =
+ [TRAINER_MIGUEL_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel2
},
- [OPPONENT_MIGUEL_3] =
+ [TRAINER_MIGUEL_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel3
},
- [OPPONENT_MIGUEL_4] =
+ [TRAINER_MIGUEL_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel4
},
- [OPPONENT_MIGUEL_5] =
+ [TRAINER_MIGUEL_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel5
},
- [OPPONENT_VICTORIA] =
+ [TRAINER_VICTORIA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Victoria
},
- [OPPONENT_VANESSA] =
+ [TRAINER_VANESSA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vanessa
},
- [OPPONENT_MARISSA] =
+ [TRAINER_MARISSA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Marissa
},
- [OPPONENT_ISABEL_1] =
+ [TRAINER_ISABEL_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel1
},
- [OPPONENT_ISABEL_2] =
+ [TRAINER_ISABEL_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel2
},
- [OPPONENT_ISABEL_3] =
+ [TRAINER_ISABEL_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel3
},
- [OPPONENT_ISABEL_4] =
+ [TRAINER_ISABEL_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel4
},
- [OPPONENT_ISABEL_5] =
+ [TRAINER_ISABEL_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel5
},
- [OPPONENT_TIMOTHY_1] =
+ [TRAINER_TIMOTHY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy1
},
- [OPPONENT_TIMOTHY_2] =
+ [TRAINER_TIMOTHY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy2
},
- [OPPONENT_TIMOTHY_3] =
+ [TRAINER_TIMOTHY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy3
},
- [OPPONENT_TIMOTHY_4] =
+ [TRAINER_TIMOTHY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy4
},
- [OPPONENT_TIMOTHY_5] =
+ [TRAINER_TIMOTHY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy5
},
- [OPPONENT_VICKY] =
+ [TRAINER_VICKY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vicky
},
- [OPPONENT_SHELBY_1] =
+ [TRAINER_SHELBY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby1
},
- [OPPONENT_SHELBY_2] =
+ [TRAINER_SHELBY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby2
},
- [OPPONENT_SHELBY_3] =
+ [TRAINER_SHELBY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby3
},
- [OPPONENT_SHELBY_4] =
+ [TRAINER_SHELBY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby4
},
- [OPPONENT_SHELBY_5] =
+ [TRAINER_SHELBY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby5
},
- [OPPONENT_CALVIN_1] =
+ [TRAINER_CALVIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin1
},
- [OPPONENT_BILLY] =
+ [TRAINER_BILLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Billy
},
- [OPPONENT_JOSH] =
+ [TRAINER_JOSH] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Josh
},
- [OPPONENT_TOMMY] =
+ [TRAINER_TOMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tommy
},
- [OPPONENT_JOEY] =
+ [TRAINER_JOEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Joey
},
- [OPPONENT_BEN] =
+ [TRAINER_BEN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ben
},
- [OPPONENT_ANONYMOUS_5] =
+ [TRAINER_ANONYMOUS_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous5
},
- [OPPONENT_KEVIN] =
+ [TRAINER_KEVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kevin
},
- [OPPONENT_NEAL] =
+ [TRAINER_NEAL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Neal
},
- [OPPONENT_DILLON] =
+ [TRAINER_DILLON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dillon
},
- [OPPONENT_CALVIN_2] =
+ [TRAINER_CALVIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin2
},
- [OPPONENT_CALVIN_3] =
+ [TRAINER_CALVIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin3
},
- [OPPONENT_CALVIN_4] =
+ [TRAINER_CALVIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin4
},
- [OPPONENT_CALVIN_5] =
+ [TRAINER_CALVIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin5
},
- [OPPONENT_EDDIE] =
+ [TRAINER_EDDIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Eddie
},
- [OPPONENT_ALLEN] =
+ [TRAINER_ALLEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Allen
},
- [OPPONENT_TIMMY] =
+ [TRAINER_TIMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timmy
},
- [OPPONENT_STEVEN] =
+ [TRAINER_STEVEN] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steven
},
- [OPPONENT_ANDREW] =
+ [TRAINER_ANDREW] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andrew
},
- [OPPONENT_IVAN] =
+ [TRAINER_IVAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ivan
},
- [OPPONENT_CLAUDE] =
+ [TRAINER_CLAUDE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Claude
},
- [OPPONENT_ELLIOT_1] =
+ [TRAINER_ELLIOT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot1
},
- [OPPONENT_NED] =
+ [TRAINER_NED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ned
},
- [OPPONENT_DALE] =
+ [TRAINER_DALE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dale
},
- [OPPONENT_NOLAN] =
+ [TRAINER_NOLAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nolan
},
- [OPPONENT_BARNY] =
+ [TRAINER_BARNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Barny
},
- [OPPONENT_WADE] =
+ [TRAINER_WADE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wade
},
- [OPPONENT_CARTER] =
+ [TRAINER_CARTER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carter
},
- [OPPONENT_ELLIOT_2] =
+ [TRAINER_ELLIOT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot2
},
- [OPPONENT_ELLIOT_3] =
+ [TRAINER_ELLIOT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot3
},
- [OPPONENT_ELLIOT_4] =
+ [TRAINER_ELLIOT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot4
},
- [OPPONENT_ELLIOT_5] =
+ [TRAINER_ELLIOT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot5
},
- [OPPONENT_RONALD] =
+ [TRAINER_RONALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ronald
},
- [OPPONENT_JACOB] =
+ [TRAINER_JACOB] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacob
},
- [OPPONENT_ANTHONY] =
+ [TRAINER_ANTHONY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anthony
},
- [OPPONENT_BENJAMIN_1] =
+ [TRAINER_BENJAMIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin1
},
- [OPPONENT_BENJAMIN_2] =
+ [TRAINER_BENJAMIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin2
},
- [OPPONENT_BENJAMIN_3] =
+ [TRAINER_BENJAMIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin3
},
- [OPPONENT_BENJAMIN_4] =
+ [TRAINER_BENJAMIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin4
},
- [OPPONENT_BENJAMIN_5] =
+ [TRAINER_BENJAMIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin5
},
- [OPPONENT_ABIGAIL_1] =
+ [TRAINER_ABIGAIL_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail1
},
- [OPPONENT_JASMINE] =
+ [TRAINER_JASMINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jasmine
},
- [OPPONENT_ABIGAIL_2] =
+ [TRAINER_ABIGAIL_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail2
},
- [OPPONENT_ABIGAIL_3] =
+ [TRAINER_ABIGAIL_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail3
},
- [OPPONENT_ABIGAIL_4] =
+ [TRAINER_ABIGAIL_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail4
},
- [OPPONENT_ABIGAIL_5] =
+ [TRAINER_ABIGAIL_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail5
},
- [OPPONENT_DYLAN_1] =
+ [TRAINER_DYLAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan1
},
- [OPPONENT_DYLAN_2] =
+ [TRAINER_DYLAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan2
},
- [OPPONENT_DYLAN_3] =
+ [TRAINER_DYLAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan3
},
- [OPPONENT_DYLAN_4] =
+ [TRAINER_DYLAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan4
},
- [OPPONENT_DYLAN_5] =
+ [TRAINER_DYLAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan5
},
- [OPPONENT_MARIA_1] =
+ [TRAINER_MARIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria1
},
- [OPPONENT_MARIA_2] =
+ [TRAINER_MARIA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria2
},
- [OPPONENT_MARIA_3] =
+ [TRAINER_MARIA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria3
},
- [OPPONENT_MARIA_4] =
+ [TRAINER_MARIA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria4
},
- [OPPONENT_MARIA_5] =
+ [TRAINER_MARIA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria5
},
- [OPPONENT_CALEB] =
+ [TRAINER_CALEB] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Caleb
},
- [OPPONENT_ANONYMOUS_6] =
+ [TRAINER_ANONYMOUS_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous6
},
- [OPPONENT_ISAIAH_1] =
+ [TRAINER_ISAIAH_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah1
},
- [OPPONENT_ANONYMOUS_7] =
+ [TRAINER_ANONYMOUS_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous7
},
- [OPPONENT_CHASE] =
+ [TRAINER_CHASE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chase
},
- [OPPONENT_ISAIAH_2] =
+ [TRAINER_ISAIAH_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah2
},
- [OPPONENT_ISAIAH_3] =
+ [TRAINER_ISAIAH_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah3
},
- [OPPONENT_ISAIAH_4] =
+ [TRAINER_ISAIAH_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah4
},
- [OPPONENT_ISAIAH_5] =
+ [TRAINER_ISAIAH_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah5
},
- [OPPONENT_ANONYMOUS_8] =
+ [TRAINER_ANONYMOUS_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous8
},
- [OPPONENT_CONNOR] =
+ [TRAINER_CONNOR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Connor
},
- [OPPONENT_ANONYMOUS_9] =
+ [TRAINER_ANONYMOUS_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous9
},
- [OPPONENT_KATELYN_1] =
+ [TRAINER_KATELYN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn1
},
- [OPPONENT_ALLISON] =
+ [TRAINER_ALLISON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Allison
},
- [OPPONENT_KATELYN_2] =
+ [TRAINER_KATELYN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn2
},
- [OPPONENT_KATELYN_3] =
+ [TRAINER_KATELYN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn3
},
- [OPPONENT_KATELYN_4] =
+ [TRAINER_KATELYN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn4
},
- [OPPONENT_KATELYN_5] =
+ [TRAINER_KATELYN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn5
},
- [OPPONENT_NICOLAS_1] =
+ [TRAINER_NICOLAS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas1
},
- [OPPONENT_NICOLAS_2] =
+ [TRAINER_NICOLAS_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas2
},
- [OPPONENT_NICOLAS_3] =
+ [TRAINER_NICOLAS_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas3
},
- [OPPONENT_NICOLAS_4] =
+ [TRAINER_NICOLAS_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas4
},
- [OPPONENT_NICOLAS_5] =
+ [TRAINER_NICOLAS_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas5
},
- [OPPONENT_AARON] =
+ [TRAINER_AARON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Aaron
},
- [OPPONENT_PERRY] =
+ [TRAINER_PERRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Perry
},
- [OPPONENT_HUGH] =
+ [TRAINER_HUGH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hugh
},
- [OPPONENT_PHIL] =
+ [TRAINER_PHIL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phil
},
- [OPPONENT_JARED] =
+ [TRAINER_JARED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jared
},
- [OPPONENT_ANONYMOUS_10] =
+ [TRAINER_ANONYMOUS_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous10
},
- [OPPONENT_TANNER] =
+ [TRAINER_TANNER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tanner
},
- [OPPONENT_WILL] =
+ [TRAINER_WILL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Will
},
- [OPPONENT_COLIN] =
+ [TRAINER_COLIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Colin
},
- [OPPONENT_ROBERT_1] =
+ [TRAINER_ROBERT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert1
},
- [OPPONENT_BENNY] =
+ [TRAINER_BENNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benny
},
- [OPPONENT_CHESTER] =
+ [TRAINER_CHESTER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chester
},
- [OPPONENT_ROBERT_2] =
+ [TRAINER_ROBERT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert2
},
- [OPPONENT_ROBERT_3] =
+ [TRAINER_ROBERT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert3
},
- [OPPONENT_ROBERT_4] =
+ [TRAINER_ROBERT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert4
},
- [OPPONENT_ROBERT_5] =
+ [TRAINER_ROBERT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert5
},
- [OPPONENT_ALEX] =
+ [TRAINER_ALEX] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alex
},
- [OPPONENT_BECK] =
+ [TRAINER_BECK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beck
},
- [OPPONENT_YASU] =
+ [TRAINER_YASU] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Yasu
},
- [OPPONENT_TAKASHI] =
+ [TRAINER_TAKASHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Takashi
},
- [OPPONENT_MAKOTO] =
+ [TRAINER_MAKOTO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Makoto
},
- [OPPONENT_HIDEO_1] =
+ [TRAINER_HIDEO_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideo1
},
- [OPPONENT_LAO_1] =
+ [TRAINER_LAO_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao1
},
- [OPPONENT_LUNG] =
+ [TRAINER_LUNG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lung
},
- [OPPONENT_LAO_2] =
+ [TRAINER_LAO_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao2
},
- [OPPONENT_LAO_3] =
+ [TRAINER_LAO_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao3
},
- [OPPONENT_LAO_4] =
+ [TRAINER_LAO_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao4
},
- [OPPONENT_LAO_5] =
+ [TRAINER_LAO_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao5
},
- [OPPONENT_TESSA] =
+ [TRAINER_TESSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tessa
},
- [OPPONENT_LAURA] =
+ [TRAINER_LAURA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Laura
},
- [OPPONENT_CYNDY_1] =
+ [TRAINER_CYNDY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy1
},
- [OPPONENT_CORA] =
+ [TRAINER_CORA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cora
},
- [OPPONENT_JILL] =
+ [TRAINER_JILL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jill
},
- [OPPONENT_CYNDY_2] =
+ [TRAINER_CYNDY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy2
},
- [OPPONENT_CYNDY_3] =
+ [TRAINER_CYNDY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy3
},
- [OPPONENT_CYNDY_4] =
+ [TRAINER_CYNDY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy4
},
- [OPPONENT_CYNDY_5] =
+ [TRAINER_CYNDY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy5
},
- [OPPONENT_MADELINE_1] =
+ [TRAINER_MADELINE_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline1
},
- [OPPONENT_CLARISSA] =
+ [TRAINER_CLARISSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clarissa
},
- [OPPONENT_ANGELICA] =
+ [TRAINER_ANGELICA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Angelica
},
- [OPPONENT_MADELINE_2] =
+ [TRAINER_MADELINE_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline2
},
- [OPPONENT_MADELINE_3] =
+ [TRAINER_MADELINE_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline3
},
- [OPPONENT_MADELINE_4] =
+ [TRAINER_MADELINE_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline4
},
- [OPPONENT_MADELINE_5] =
+ [TRAINER_MADELINE_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline5
},
- [OPPONENT_BEVERLY] =
+ [TRAINER_BEVERLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beverly
},
- [OPPONENT_DAWN] =
+ [TRAINER_DAWN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dawn
},
- [OPPONENT_NICOLE] =
+ [TRAINER_NICOLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicole
},
- [OPPONENT_DENISE] =
+ [TRAINER_DENISE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Denise
},
- [OPPONENT_BETH] =
+ [TRAINER_BETH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beth
},
- [OPPONENT_TARA] =
+ [TRAINER_TARA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tara
},
- [OPPONENT_MISSY] =
+ [TRAINER_MISSY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Missy
},
- [OPPONENT_ALICE] =
+ [TRAINER_ALICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alice
},
- [OPPONENT_JENNY_1] =
+ [TRAINER_JENNY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny1
},
- [OPPONENT_GRACE] =
+ [TRAINER_GRACE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grace
},
- [OPPONENT_TANYA] =
+ [TRAINER_TANYA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tanya
},
- [OPPONENT_SHARON] =
+ [TRAINER_SHARON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sharon
},
- [OPPONENT_NIKKI] =
+ [TRAINER_NIKKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nikki
},
- [OPPONENT_BRENDA] =
+ [TRAINER_BRENDA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brenda
},
- [OPPONENT_KATIE] =
+ [TRAINER_KATIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katie
},
- [OPPONENT_SUSIE] =
+ [TRAINER_SUSIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Susie
},
- [OPPONENT_KARA] =
+ [TRAINER_KARA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kara
},
- [OPPONENT_DANA] =
+ [TRAINER_DANA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dana
},
- [OPPONENT_ERIN] =
+ [TRAINER_ERIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Erin
},
- [OPPONENT_DEBRA] =
+ [TRAINER_DEBRA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Debra
},
- [OPPONENT_LINDA] =
+ [TRAINER_LINDA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Linda
},
- [OPPONENT_KAYLEE] =
+ [TRAINER_KAYLEE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kaylee
},
- [OPPONENT_LAUREL] =
+ [TRAINER_LAUREL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Laurel
},
- [OPPONENT_DARCY] =
+ [TRAINER_DARCY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Darcy
},
- [OPPONENT_JENNY_2] =
+ [TRAINER_JENNY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny2
},
- [OPPONENT_JENNY_3] =
+ [TRAINER_JENNY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny3
},
- [OPPONENT_JENNY_4] =
+ [TRAINER_JENNY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny4
},
- [OPPONENT_JENNY_5] =
+ [TRAINER_JENNY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny5
},
- [OPPONENT_HEIDI] =
+ [TRAINER_HEIDI] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Heidi
},
- [OPPONENT_BECKY] =
+ [TRAINER_BECKY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Becky
},
- [OPPONENT_CAROL] =
+ [TRAINER_CAROL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carol
},
- [OPPONENT_NANCY] =
+ [TRAINER_NANCY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nancy
},
- [OPPONENT_MARTHA] =
+ [TRAINER_MARTHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Martha
},
- [OPPONENT_DIANA_1] =
+ [TRAINER_DIANA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana1
},
- [OPPONENT_NINA] =
+ [TRAINER_NINA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nina
},
- [OPPONENT_IRENE] =
+ [TRAINER_IRENE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Irene
},
- [OPPONENT_DIANA_2] =
+ [TRAINER_DIANA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana2
},
- [OPPONENT_DIANA_3] =
+ [TRAINER_DIANA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana3
},
- [OPPONENT_DIANA_4] =
+ [TRAINER_DIANA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana4
},
- [OPPONENT_DIANA_5] =
+ [TRAINER_DIANA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana5
},
- [OPPONENT_AMY_AND_LIV_1] =
+ [TRAINER_AMY_AND_LIV_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv1
},
- [OPPONENT_AMY_AND_LIV_2] =
+ [TRAINER_AMY_AND_LIV_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv2
},
- [OPPONENT_GINA_AND_MIA_1] =
+ [TRAINER_GINA_AND_MIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GinaAndMia1
},
- [OPPONENT_MIU_AND_YUKI] =
+ [TRAINER_MIU_AND_YUKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_MiuAndYuki
},
- [OPPONENT_AMY_AND_LIV_3] =
+ [TRAINER_AMY_AND_LIV_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv3
},
- [OPPONENT_GINA_AND_MIA_2] =
+ [TRAINER_GINA_AND_MIA_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GinaAndMia2
},
- [OPPONENT_AMY_AND_LIV_4] =
+ [TRAINER_AMY_AND_LIV_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv4
},
- [OPPONENT_AMY_AND_LIV_5] =
+ [TRAINER_AMY_AND_LIV_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv5
},
- [OPPONENT_AMY_AND_LIV_6] =
+ [TRAINER_AMY_AND_LIV_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv6
},
- [OPPONENT_HUEY] =
+ [TRAINER_HUEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Huey
},
- [OPPONENT_EDMOND] =
+ [TRAINER_EDMOND] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edmond
},
- [OPPONENT_ERNEST_1] =
+ [TRAINER_ERNEST_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest1
},
- [OPPONENT_DWAYNE] =
+ [TRAINER_DWAYNE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dwayne
},
- [OPPONENT_PHILLIP] =
+ [TRAINER_PHILLIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phillip
},
- [OPPONENT_LEONARD] =
+ [TRAINER_LEONARD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Leonard
},
- [OPPONENT_DUNCAN] =
+ [TRAINER_DUNCAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Duncan
},
- [OPPONENT_ERNEST_2] =
+ [TRAINER_ERNEST_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest2
},
- [OPPONENT_ERNEST_3] =
+ [TRAINER_ERNEST_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest3
},
- [OPPONENT_ERNEST_4] =
+ [TRAINER_ERNEST_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest4
},
- [OPPONENT_ERNEST_5] =
+ [TRAINER_ERNEST_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest5
},
- [OPPONENT_ANONYMOUS_11] =
+ [TRAINER_ANONYMOUS_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous11
},
- [OPPONENT_ANONYMOUS_12] =
+ [TRAINER_ANONYMOUS_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous12
},
- [OPPONENT_ANONYMOUS_13] =
+ [TRAINER_ANONYMOUS_13] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous13
},
- [OPPONENT_SONNY] =
+ [TRAINER_SONNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sonny
},
- [OPPONENT_DONOVAN] =
+ [TRAINER_DONOVAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Donovan
},
- [OPPONENT_GERALD] =
+ [TRAINER_GERALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gerald
},
- [OPPONENT_KELVIN] =
+ [TRAINER_KELVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kelvin
},
- [OPPONENT_KODY] =
+ [TRAINER_KODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kody
},
- [OPPONENT_TEVIN] =
+ [TRAINER_TEVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tevin
},
- [OPPONENT_DAMON] =
+ [TRAINER_DAMON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Damon
},
- [OPPONENT_PABLO] =
+ [TRAINER_PABLO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Pablo
},
- [OPPONENT_EDWIN_1] =
+ [TRAINER_EDWIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin1
},
- [OPPONENT_HECTOR_1] =
+ [TRAINER_HECTOR_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hector1
},
- [OPPONENT_HECTOR_2] =
+ [TRAINER_HECTOR_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hector2
},
- [OPPONENT_EDWIN_2] =
+ [TRAINER_EDWIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin2
},
- [OPPONENT_EDWIN_3] =
+ [TRAINER_EDWIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin3
},
- [OPPONENT_EDWIN_4] =
+ [TRAINER_EDWIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin4
},
- [OPPONENT_EDWIN_5] =
+ [TRAINER_EDWIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin5
},
- [OPPONENT_WALLY_1] =
+ [TRAINER_WALLY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally1
},
- [OPPONENT_BRENDAN_1] =
+ [TRAINER_BRENDAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan1
},
- [OPPONENT_BRENDAN_2] =
+ [TRAINER_BRENDAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan2
},
- [OPPONENT_BRENDAN_3] =
+ [TRAINER_BRENDAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan3
},
- [OPPONENT_BRENDAN_4] =
+ [TRAINER_BRENDAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan4
},
- [OPPONENT_BRENDAN_5] =
+ [TRAINER_BRENDAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan5
},
- [OPPONENT_BRENDAN_6] =
+ [TRAINER_BRENDAN_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan6
},
- [OPPONENT_BRENDAN_7] =
+ [TRAINER_BRENDAN_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan7
},
- [OPPONENT_BRENDAN_8] =
+ [TRAINER_BRENDAN_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan8
},
- [OPPONENT_BRENDAN_9] =
+ [TRAINER_BRENDAN_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan9
},
- [OPPONENT_MAY_1] =
+ [TRAINER_MAY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May1
},
- [OPPONENT_MAY_2] =
+ [TRAINER_MAY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May2
},
- [OPPONENT_MAY_3] =
+ [TRAINER_MAY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May3
},
- [OPPONENT_MAY_4] =
+ [TRAINER_MAY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May4
},
- [OPPONENT_MAY_5] =
+ [TRAINER_MAY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May5
},
- [OPPONENT_MAY_6] =
+ [TRAINER_MAY_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May6
},
- [OPPONENT_MAY_7] =
+ [TRAINER_MAY_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May7
},
- [OPPONENT_MAY_8] =
+ [TRAINER_MAY_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May8
},
- [OPPONENT_MAY_9] =
+ [TRAINER_MAY_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May9
},
- [OPPONENT_ISAAC_1] =
+ [TRAINER_ISAAC_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac1
},
- [OPPONENT_RILEY] =
+ [TRAINER_RILEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Riley
},
- [OPPONENT_AIDAN] =
+ [TRAINER_AIDAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Aidan
},
- [OPPONENT_ISAAC_2] =
+ [TRAINER_ISAAC_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac2
},
- [OPPONENT_ISAAC_3] =
+ [TRAINER_ISAAC_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac3
},
- [OPPONENT_ISAAC_4] =
+ [TRAINER_ISAAC_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac4
},
- [OPPONENT_ISAAC_5] =
+ [TRAINER_ISAAC_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac5
},
- [OPPONENT_LYDIA_1] =
+ [TRAINER_LYDIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia1
},
- [OPPONENT_ALEXIA] =
+ [TRAINER_ALEXIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexia
},
- [OPPONENT_DANIELLE] =
+ [TRAINER_DANIELLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Danielle
},
- [OPPONENT_LYDIA_2] =
+ [TRAINER_LYDIA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia2
},
- [OPPONENT_LYDIA_3] =
+ [TRAINER_LYDIA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia3
},
- [OPPONENT_LYDIA_4] =
+ [TRAINER_LYDIA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia4
},
- [OPPONENT_LYDIA_5] =
+ [TRAINER_LYDIA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia5
},
- [OPPONENT_JACKSON_1] =
+ [TRAINER_JACKSON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson1
},
- [OPPONENT_CARLOS] =
+ [TRAINER_CARLOS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carlos
},
- [OPPONENT_SEBASTIAN] =
+ [TRAINER_SEBASTIAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sebastian
},
- [OPPONENT_JACKSON_2] =
+ [TRAINER_JACKSON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson2
},
- [OPPONENT_JACKSON_3] =
+ [TRAINER_JACKSON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson3
},
- [OPPONENT_JACKSON_4] =
+ [TRAINER_JACKSON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson4
},
- [OPPONENT_JACKSON_5] =
+ [TRAINER_JACKSON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson5
},
- [OPPONENT_CATHERINE_1] =
+ [TRAINER_CATHERINE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine1
},
- [OPPONENT_JENNA] =
+ [TRAINER_JENNA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenna
},
- [OPPONENT_SOPHIA] =
+ [TRAINER_SOPHIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sophia
},
- [OPPONENT_CATHERINE_2] =
+ [TRAINER_CATHERINE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine2
},
- [OPPONENT_CATHERINE_3] =
+ [TRAINER_CATHERINE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine3
},
- [OPPONENT_CATHERINE_4] =
+ [TRAINER_CATHERINE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine4
},
- [OPPONENT_CATHERINE_5] =
+ [TRAINER_CATHERINE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine5
},
- [OPPONENT_MAXIE_1] =
+ [TRAINER_MAXIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie1
},
- [OPPONENT_GRUNT_28] =
+ [TRAINER_GRUNT_28] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt28
},
- [OPPONENT_GRUNT_29] =
+ [TRAINER_GRUNT_29] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt29
},
- [OPPONENT_GRUNT_30] =
+ [TRAINER_GRUNT_30] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt30
},
- [OPPONENT_GRUNT_31] =
+ [TRAINER_GRUNT_31] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt31
},
- [OPPONENT_GRUNT_32] =
+ [TRAINER_GRUNT_32] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt32
},
- [OPPONENT_GRUNT_33] =
+ [TRAINER_GRUNT_33] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt33
},
- [OPPONENT_GRUNT_34] =
+ [TRAINER_GRUNT_34] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt34
},
- [OPPONENT_GRUNT_35] =
+ [TRAINER_GRUNT_35] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt35
},
- [OPPONENT_GRUNT_36] =
+ [TRAINER_GRUNT_36] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt36
},
- [OPPONENT_GRUNT_37] =
+ [TRAINER_GRUNT_37] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt37
},
- [OPPONENT_GRUNT_38] =
+ [TRAINER_GRUNT_38] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt38
},
- [OPPONENT_GRUNT_39] =
+ [TRAINER_GRUNT_39] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt39
},
- [OPPONENT_GRUNT_40] =
+ [TRAINER_GRUNT_40] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt40
},
- [OPPONENT_GRUNT_41] =
+ [TRAINER_GRUNT_41] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt41
},
- [OPPONENT_GRUNT_42] =
+ [TRAINER_GRUNT_42] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt42
},
- [OPPONENT_GRUNT_43] =
+ [TRAINER_GRUNT_43] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt43
},
- [OPPONENT_GRUNT_44] =
+ [TRAINER_GRUNT_44] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt44
},
- [OPPONENT_GRUNT_45] =
+ [TRAINER_GRUNT_45] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt45
},
- [OPPONENT_GRUNT_46] =
+ [TRAINER_GRUNT_46] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt46
},
- [OPPONENT_GRUNT_47] =
+ [TRAINER_GRUNT_47] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt47
},
- [OPPONENT_GRUNT_48] =
+ [TRAINER_GRUNT_48] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt48
},
- [OPPONENT_GRUNT_49] =
+ [TRAINER_GRUNT_49] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt49
},
- [OPPONENT_GRUNT_50] =
+ [TRAINER_GRUNT_50] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt50
},
- [OPPONENT_GRUNT_51] =
+ [TRAINER_GRUNT_51] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt51
},
- [OPPONENT_GRUNT_52] =
+ [TRAINER_GRUNT_52] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt52
},
- [OPPONENT_GRUNT_53] =
+ [TRAINER_GRUNT_53] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt53
},
- [OPPONENT_GRUNT_54] =
+ [TRAINER_GRUNT_54] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt54
},
- [OPPONENT_ANONYMOUS_14] =
+ [TRAINER_ANONYMOUS_14] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous14
},
- [OPPONENT_ANONYMOUS_15] =
+ [TRAINER_ANONYMOUS_15] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous15
},
- [OPPONENT_TABITHA_1] =
+ [TRAINER_TABITHA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tabitha1
},
- [OPPONENT_TABITHA_2] =
+ [TRAINER_TABITHA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tabitha2
},
- [OPPONENT_ANONYMOUS_16] =
+ [TRAINER_ANONYMOUS_16] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous16
},
- [OPPONENT_COURTNEY_1] =
+ [TRAINER_COURTNEY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Courtney1
},
- [OPPONENT_COURTNEY_2] =
+ [TRAINER_COURTNEY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Courtney2
},
- [OPPONENT_MAXIE_2] =
+ [TRAINER_MAXIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie2
},
- [OPPONENT_MAXIE_3] =
+ [TRAINER_MAXIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie3
},
- [OPPONENT_TIANA] =
+ [TRAINER_TIANA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tiana
},
- [OPPONENT_HALEY_1] =
+ [TRAINER_HALEY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley1
},
- [OPPONENT_JANICE] =
+ [TRAINER_JANICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Janice
},
- [OPPONENT_VIVI] =
+ [TRAINER_VIVI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vivi
},
- [OPPONENT_HALEY_2] =
+ [TRAINER_HALEY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley2
},
- [OPPONENT_HALEY_3] =
+ [TRAINER_HALEY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley3
},
- [OPPONENT_HALEY_4] =
+ [TRAINER_HALEY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley4
},
- [OPPONENT_HALEY_5] =
+ [TRAINER_HALEY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley5
},
- [OPPONENT_SALLY] =
+ [TRAINER_SALLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sally
},
- [OPPONENT_ROBIN] =
+ [TRAINER_ROBIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robin
},
- [OPPONENT_ANDREA] =
+ [TRAINER_ANDREA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andrea
},
- [OPPONENT_CRISSY] =
+ [TRAINER_CRISSY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Crissy
},
- [OPPONENT_RICK] =
+ [TRAINER_RICK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rick
},
- [OPPONENT_LYLE] =
+ [TRAINER_LYLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lyle
},
- [OPPONENT_JOSE] =
+ [TRAINER_JOSE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jose
},
- [OPPONENT_DOUG] =
+ [TRAINER_DOUG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Doug
},
- [OPPONENT_GREG] =
+ [TRAINER_GREG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Greg
},
- [OPPONENT_KENT] =
+ [TRAINER_KENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kent
},
- [OPPONENT_JAMES_1] =
+ [TRAINER_JAMES_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James1
},
- [OPPONENT_JAMES_2] =
+ [TRAINER_JAMES_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James2
},
- [OPPONENT_JAMES_3] =
+ [TRAINER_JAMES_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James3
},
- [OPPONENT_JAMES_4] =
+ [TRAINER_JAMES_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James4
},
- [OPPONENT_JAMES_5] =
+ [TRAINER_JAMES_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James5
},
- [OPPONENT_BRICE] =
+ [TRAINER_BRICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brice
},
- [OPPONENT_TRENT_1] =
+ [TRAINER_TRENT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent1
},
- [OPPONENT_LENNY] =
+ [TRAINER_LENNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lenny
},
- [OPPONENT_LUCAS_1] =
+ [TRAINER_LUCAS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lucas1
},
- [OPPONENT_ALAN] =
+ [TRAINER_ALAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alan
},
- [OPPONENT_CLARK] =
+ [TRAINER_CLARK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clark
},
- [OPPONENT_ERIC] =
+ [TRAINER_ERIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Eric
},
- [OPPONENT_LUCAS_2] =
+ [TRAINER_LUCAS_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lucas2
},
- [OPPONENT_MIKE_1] =
+ [TRAINER_MIKE_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mike1
},
- [OPPONENT_MIKE_2] =
+ [TRAINER_MIKE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mike2
},
- [OPPONENT_TRENT_2] =
+ [TRAINER_TRENT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent2
},
- [OPPONENT_TRENT_3] =
+ [TRAINER_TRENT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent3
},
- [OPPONENT_TRENT_4] =
+ [TRAINER_TRENT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent4
},
- [OPPONENT_TRENT_5] =
+ [TRAINER_TRENT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent5
},
- [OPPONENT_DEZ_AND_LUKE] =
+ [TRAINER_DEZ_AND_LUKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_DezAndLuke
},
- [OPPONENT_LEA_AND_JED] =
+ [TRAINER_LEA_AND_JED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LeaAndJed
},
- [OPPONENT_LOIS_AND_HAL_1] =
+ [TRAINER_LOIS_AND_HAL_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal1
},
- [OPPONENT_LOIS_AND_HAL_2] =
+ [TRAINER_LOIS_AND_HAL_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal2
},
- [OPPONENT_LOIS_AND_HAL_3] =
+ [TRAINER_LOIS_AND_HAL_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal3
},
- [OPPONENT_LOIS_AND_HAL_4] =
+ [TRAINER_LOIS_AND_HAL_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal4
},
- [OPPONENT_LOIS_AND_HAL_5] =
+ [TRAINER_LOIS_AND_HAL_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal5
},
- [OPPONENT_JOHANNA] =
+ [TRAINER_JOHANNA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Johanna
},
- [OPPONENT_ZANE] =
+ [TRAINER_ZANE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Zane
},
- [OPPONENT_VIVIAN] =
+ [TRAINER_VIVIAN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vivian
},
- [OPPONENT_SADIE] =
+ [TRAINER_SADIE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sadie
},
- [OPPONENT_HIDEO_2] =
+ [TRAINER_HIDEO_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideo2
},
- [OPPONENT_KEIGO] =
+ [TRAINER_KEIGO] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Keigo
},
- [OPPONENT_TSUNAO] =
+ [TRAINER_TSUNAO] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tsunao
},
- [OPPONENT_TERRELL] =
+ [TRAINER_TERRELL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Terrell
},
- [OPPONENT_KYLEE] =
+ [TRAINER_KYLEE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kylee
},
- [OPPONENT_WALLY_2] =
+ [TRAINER_WALLY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally2
},
- [OPPONENT_WALLY_3] =
+ [TRAINER_WALLY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally3
},
- [OPPONENT_WALLY_4] =
+ [TRAINER_WALLY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally4
},
- [OPPONENT_WALLY_5] =
+ [TRAINER_WALLY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally5
},
- [OPPONENT_WALLY_6] =
+ [TRAINER_WALLY_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally6
},
- [OPPONENT_BRENDAN_10] =
+ [TRAINER_BRENDAN_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan10
},
- [OPPONENT_BRENDAN_11] =
+ [TRAINER_BRENDAN_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan11
},
- [OPPONENT_BRENDAN_12] =
+ [TRAINER_BRENDAN_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan12
},
- [OPPONENT_MAY_10] =
+ [TRAINER_MAY_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May10
},
- [OPPONENT_MAY_11] =
+ [TRAINER_MAY_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May11
},
- [OPPONENT_MAY_12] =
+ [TRAINER_MAY_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May12
},
- [OPPONENT_JONAH] =
+ [TRAINER_JONAH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jonah
},
- [OPPONENT_HENRY] =
+ [TRAINER_HENRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Henry
},
- [OPPONENT_ROGER] =
+ [TRAINER_ROGER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roger
},
- [OPPONENT_ALEXA] =
+ [TRAINER_ALEXA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexa
},
- [OPPONENT_RUBEN] =
+ [TRAINER_RUBEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ruben
},
- [OPPONENT_KOJI] =
+ [TRAINER_KOJI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Koji
},
- [OPPONENT_WAYNE] =
+ [TRAINER_WAYNE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wayne
},
- [OPPONENT_BYRON] =
+ [TRAINER_BYRON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Byron
},
- [OPPONENT_REED] =
+ [TRAINER_REED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Reed
},
- [OPPONENT_TISHA] =
+ [TRAINER_TISHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tisha
},
- [OPPONENT_TORI_AND_TIA] =
+ [TRAINER_TORI_AND_TIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_ToriAndTia
},
- [OPPONENT_KIM_AND_IRIS] =
+ [TRAINER_KIM_AND_IRIS] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_KimAndIris
},
- [OPPONENT_TYRA_AND_IVY] =
+ [TRAINER_TYRA_AND_IVY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_TyraAndIvy
},
- [OPPONENT_MEL_AND_PAUL] =
+ [TRAINER_MEL_AND_PAUL] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_MelAndPaul
},
- [OPPONENT_JOHN_AND_JAY_1] =
+ [TRAINER_JOHN_AND_JAY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay1
},
- [OPPONENT_JOHN_AND_JAY_2] =
+ [TRAINER_JOHN_AND_JAY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay2
},
- [OPPONENT_JOHN_AND_JAY_3] =
+ [TRAINER_JOHN_AND_JAY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay3
},
- [OPPONENT_JOHN_AND_JAY_4] =
+ [TRAINER_JOHN_AND_JAY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay4
},
- [OPPONENT_JOHN_AND_JAY_5] =
+ [TRAINER_JOHN_AND_JAY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay5
},
- [OPPONENT_RELI_AND_IAN] =
+ [TRAINER_RELI_AND_IAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_ReliAndIan
},
- [OPPONENT_RITA_AND_SAM_1] =
+ [TRAINER_RITA_AND_SAM_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam1
},
- [OPPONENT_RITA_AND_SAM_2] =
+ [TRAINER_RITA_AND_SAM_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam2
},
- [OPPONENT_RITA_AND_SAM_3] =
+ [TRAINER_RITA_AND_SAM_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam3
},
- [OPPONENT_RITA_AND_SAM_4] =
+ [TRAINER_RITA_AND_SAM_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam4
},
- [OPPONENT_RITA_AND_SAM_5] =
+ [TRAINER_RITA_AND_SAM_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam5
},
- [OPPONENT_LISA_AND_RAY] =
+ [TRAINER_LISA_AND_RAY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LisaAndRay
},
- [OPPONENT_EUGENE] =
+ [TRAINER_EUGENE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h
index fbcdd5a4e..7f522dd93 100644
--- a/src/data/trainers_en.h
+++ b/src/data/trainers_en.h
@@ -1,5 +1,5 @@
const struct Trainer gTrainers[] = {
- [OPPONENT_NONE] =
+ [TRAINER_NONE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = {
.party = NULL
},
- [OPPONENT_ARCHIE_1] =
+ [TRAINER_ARCHIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie1
},
- [OPPONENT_GRUNT_1] =
+ [TRAINER_GRUNT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt1
},
- [OPPONENT_GRUNT_2] =
+ [TRAINER_GRUNT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt2
},
- [OPPONENT_GRUNT_3] =
+ [TRAINER_GRUNT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt3
},
- [OPPONENT_GRUNT_4] =
+ [TRAINER_GRUNT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt4
},
- [OPPONENT_GRUNT_5] =
+ [TRAINER_GRUNT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt5
},
- [OPPONENT_GRUNT_6] =
+ [TRAINER_GRUNT_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt6
},
- [OPPONENT_GRUNT_7] =
+ [TRAINER_GRUNT_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt7
},
- [OPPONENT_GRUNT_8] =
+ [TRAINER_GRUNT_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt8
},
- [OPPONENT_GRUNT_9] =
+ [TRAINER_GRUNT_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt9
},
- [OPPONENT_GRUNT_10] =
+ [TRAINER_GRUNT_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt10
},
- [OPPONENT_GRUNT_11] =
+ [TRAINER_GRUNT_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt11
},
- [OPPONENT_GRUNT_12] =
+ [TRAINER_GRUNT_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt12
},
- [OPPONENT_GRUNT_13] =
+ [TRAINER_GRUNT_13] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt13
},
- [OPPONENT_GRUNT_14] =
+ [TRAINER_GRUNT_14] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt14
},
- [OPPONENT_GRUNT_15] =
+ [TRAINER_GRUNT_15] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt15
},
- [OPPONENT_GRUNT_16] =
+ [TRAINER_GRUNT_16] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt16
},
- [OPPONENT_GRUNT_17] =
+ [TRAINER_GRUNT_17] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt17
},
- [OPPONENT_GRUNT_18] =
+ [TRAINER_GRUNT_18] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt18
},
- [OPPONENT_GRUNT_19] =
+ [TRAINER_GRUNT_19] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt19
},
- [OPPONENT_GRUNT_20] =
+ [TRAINER_GRUNT_20] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt20
},
- [OPPONENT_GRUNT_21] =
+ [TRAINER_GRUNT_21] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt21
},
- [OPPONENT_GRUNT_22] =
+ [TRAINER_GRUNT_22] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt22
},
- [OPPONENT_GRUNT_23] =
+ [TRAINER_GRUNT_23] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt23
},
- [OPPONENT_GRUNT_24] =
+ [TRAINER_GRUNT_24] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt24
},
- [OPPONENT_GRUNT_25] =
+ [TRAINER_GRUNT_25] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt25
},
- [OPPONENT_GRUNT_26] =
+ [TRAINER_GRUNT_26] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt26
},
- [OPPONENT_GRUNT_27] =
+ [TRAINER_GRUNT_27] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt27
},
- [OPPONENT_ANONYMOUS_1] =
+ [TRAINER_ANONYMOUS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous1
},
- [OPPONENT_MATT_1] =
+ [TRAINER_MATT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matt1
},
- [OPPONENT_MATT_2] =
+ [TRAINER_MATT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matt2
},
- [OPPONENT_SHELLY_1] =
+ [TRAINER_SHELLY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelly1
},
- [OPPONENT_SHELLY_2] =
+ [TRAINER_SHELLY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelly2
},
- [OPPONENT_ARCHIE_2] =
+ [TRAINER_ARCHIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie2
},
- [OPPONENT_ARCHIE_3] =
+ [TRAINER_ARCHIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Archie3
},
- [OPPONENT_DAISY] =
+ [TRAINER_DAISY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Daisy
},
- [OPPONENT_ROSE_1] =
+ [TRAINER_ROSE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose1
},
- [OPPONENT_LILY] =
+ [TRAINER_LILY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lily
},
- [OPPONENT_VIOLET] =
+ [TRAINER_VIOLET] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Violet
},
- [OPPONENT_ROSE_2] =
+ [TRAINER_ROSE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose2
},
- [OPPONENT_ROSE_3] =
+ [TRAINER_ROSE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose3
},
- [OPPONENT_ROSE_4] =
+ [TRAINER_ROSE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose4
},
- [OPPONENT_ROSE_5] =
+ [TRAINER_ROSE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rose5
},
- [OPPONENT_DUSTY_1] =
+ [TRAINER_DUSTY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty1
},
- [OPPONENT_CHIP] =
+ [TRAINER_CHIP] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chip
},
- [OPPONENT_FOSTER] =
+ [TRAINER_FOSTER] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Foster
},
- [OPPONENT_DUSTY_2] =
+ [TRAINER_DUSTY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty2
},
- [OPPONENT_DUSTY_3] =
+ [TRAINER_DUSTY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty3
},
- [OPPONENT_DUSTY_4] =
+ [TRAINER_DUSTY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty4
},
- [OPPONENT_DUSTY_5] =
+ [TRAINER_DUSTY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dusty5
},
- [OPPONENT_GABBY_AND_TY_1] =
+ [TRAINER_GABBY_AND_TY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy1
},
- [OPPONENT_GABBY_AND_TY_2] =
+ [TRAINER_GABBY_AND_TY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy2
},
- [OPPONENT_GABBY_AND_TY_3] =
+ [TRAINER_GABBY_AND_TY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy3
},
- [OPPONENT_GABBY_AND_TY_4] =
+ [TRAINER_GABBY_AND_TY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy4
},
- [OPPONENT_GABBY_AND_TY_5] =
+ [TRAINER_GABBY_AND_TY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy5
},
- [OPPONENT_GABBY_AND_TY_6] =
+ [TRAINER_GABBY_AND_TY_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GabbyAndTy6
},
- [OPPONENT_LOLA_1] =
+ [TRAINER_LOLA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola1
},
- [OPPONENT_CARMEN] =
+ [TRAINER_CARMEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carmen
},
- [OPPONENT_GWEN] =
+ [TRAINER_GWEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gwen
},
- [OPPONENT_LOLA_2] =
+ [TRAINER_LOLA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola2
},
- [OPPONENT_LOLA_3] =
+ [TRAINER_LOLA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola3
},
- [OPPONENT_LOLA_4] =
+ [TRAINER_LOLA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola4
},
- [OPPONENT_LOLA_5] =
+ [TRAINER_LOLA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
@@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lola5
},
- [OPPONENT_RICKY_1] =
+ [TRAINER_RICKY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky1
},
- [OPPONENT_SIMON] =
+ [TRAINER_SIMON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Simon
},
- [OPPONENT_CHARLIE] =
+ [TRAINER_CHARLIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Charlie
},
- [OPPONENT_RICKY_2] =
+ [TRAINER_RICKY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky2
},
- [OPPONENT_RICKY_3] =
+ [TRAINER_RICKY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky3
},
- [OPPONENT_RICKY_4] =
+ [TRAINER_RICKY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky4
},
- [OPPONENT_RICKY_5] =
+ [TRAINER_RICKY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
@@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ricky5
},
- [OPPONENT_RANDALL] =
+ [TRAINER_RANDALL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Randall
},
- [OPPONENT_PARKER] =
+ [TRAINER_PARKER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Parker
},
- [OPPONENT_GEORGE] =
+ [TRAINER_GEORGE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_George
},
- [OPPONENT_BERKE] =
+ [TRAINER_BERKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Berke
},
- [OPPONENT_CLYDE] =
+ [TRAINER_CLYDE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clyde
},
- [OPPONENT_VINCENT] =
+ [TRAINER_VINCENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vincent
},
- [OPPONENT_LEROY] =
+ [TRAINER_LEROY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Leroy
},
- [OPPONENT_WILTON_1] =
+ [TRAINER_WILTON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton1
},
- [OPPONENT_EDGAR] =
+ [TRAINER_EDGAR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edgar
},
- [OPPONENT_ALBERT] =
+ [TRAINER_ALBERT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Albert
},
- [OPPONENT_SAMUEL] =
+ [TRAINER_SAMUEL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Samuel
},
- [OPPONENT_VITO] =
+ [TRAINER_VITO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vito
},
- [OPPONENT_OWEN] =
+ [TRAINER_OWEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Owen
},
- [OPPONENT_WILTON_2] =
+ [TRAINER_WILTON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton2
},
- [OPPONENT_WILTON_3] =
+ [TRAINER_WILTON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton3
},
- [OPPONENT_WILTON_4] =
+ [TRAINER_WILTON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton4
},
- [OPPONENT_WILTON_5] =
+ [TRAINER_WILTON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wilton5
},
- [OPPONENT_WARREN] =
+ [TRAINER_WARREN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Warren
},
- [OPPONENT_MARY] =
+ [TRAINER_MARY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mary
},
- [OPPONENT_LORI] =
+ [TRAINER_LORI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lori
},
- [OPPONENT_JODY] =
+ [TRAINER_JODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jody
},
- [OPPONENT_WENDY] =
+ [TRAINER_WENDY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wendy
},
- [OPPONENT_ELAINE] =
+ [TRAINER_ELAINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elaine
},
- [OPPONENT_BROOKE_1] =
+ [TRAINER_BROOKE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke1
},
- [OPPONENT_JENNIFER] =
+ [TRAINER_JENNIFER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jennifer
},
- [OPPONENT_HOPE] =
+ [TRAINER_HOPE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hope
},
- [OPPONENT_SHANNON] =
+ [TRAINER_SHANNON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shannon
},
- [OPPONENT_MICHELLE] =
+ [TRAINER_MICHELLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Michelle
},
- [OPPONENT_CAROLINE] =
+ [TRAINER_CAROLINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Caroline
},
- [OPPONENT_JULIE] =
+ [TRAINER_JULIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Julie
},
- [OPPONENT_BROOKE_2] =
+ [TRAINER_BROOKE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke2
},
- [OPPONENT_BROOKE_3] =
+ [TRAINER_BROOKE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke3
},
- [OPPONENT_BROOKE_4] =
+ [TRAINER_BROOKE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke4
},
- [OPPONENT_BROOKE_5] =
+ [TRAINER_BROOKE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brooke5
},
- [OPPONENT_PATRICIA] =
+ [TRAINER_PATRICIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Patricia
},
- [OPPONENT_KINDRA] =
+ [TRAINER_KINDRA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kindra
},
- [OPPONENT_TAMMY] =
+ [TRAINER_TAMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tammy
},
- [OPPONENT_VALERIE_1] =
+ [TRAINER_VALERIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie1
},
- [OPPONENT_TASHA] =
+ [TRAINER_TASHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tasha
},
- [OPPONENT_VALERIE_2] =
+ [TRAINER_VALERIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie2
},
- [OPPONENT_VALERIE_3] =
+ [TRAINER_VALERIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie3
},
- [OPPONENT_VALERIE_4] =
+ [TRAINER_VALERIE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie4
},
- [OPPONENT_VALERIE_5] =
+ [TRAINER_VALERIE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Valerie5
},
- [OPPONENT_CINDY_1] =
+ [TRAINER_CINDY_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy1
},
- [OPPONENT_ANONYMOUS_2] =
+ [TRAINER_ANONYMOUS_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous2
},
- [OPPONENT_BRIANNA_1] =
+ [TRAINER_BRIANNA_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brianna1
},
- [OPPONENT_CINDY_2] =
+ [TRAINER_CINDY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy2
},
- [OPPONENT_BRIANNA_2] =
+ [TRAINER_BRIANNA_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brianna2
},
- [OPPONENT_ANETTE] =
+ [TRAINER_ANETTE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anette
},
- [OPPONENT_CINDY_3] =
+ [TRAINER_CINDY_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy3
},
- [OPPONENT_CINDY_4] =
+ [TRAINER_CINDY_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy4
},
- [OPPONENT_CINDY_5] =
+ [TRAINER_CINDY_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy5
},
- [OPPONENT_CINDY_6] =
+ [TRAINER_CINDY_6] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
@@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cindy6
},
- [OPPONENT_MELISSA] =
+ [TRAINER_MELISSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Melissa
},
- [OPPONENT_SHEILA] =
+ [TRAINER_SHEILA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sheila
},
- [OPPONENT_SHIRLEY] =
+ [TRAINER_SHIRLEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shirley
},
- [OPPONENT_JESSICA_1] =
+ [TRAINER_JESSICA_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica1
},
- [OPPONENT_CONNIE] =
+ [TRAINER_CONNIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Connie
},
- [OPPONENT_BRIDGET] =
+ [TRAINER_BRIDGET] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bridget
},
- [OPPONENT_OLIVIA] =
+ [TRAINER_OLIVIA] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Olivia
},
- [OPPONENT_TIFFANY] =
+ [TRAINER_TIFFANY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tiffany
},
- [OPPONENT_JESSICA_2] =
+ [TRAINER_JESSICA_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica2
},
- [OPPONENT_JESSICA_3] =
+ [TRAINER_JESSICA_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica3
},
- [OPPONENT_JESSICA_4] =
+ [TRAINER_JESSICA_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica4
},
- [OPPONENT_JESSICA_5] =
+ [TRAINER_JESSICA_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jessica5
},
- [OPPONENT_WINSTON_1] =
+ [TRAINER_WINSTON_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston1
},
- [OPPONENT_ANONYMOUS_3] =
+ [TRAINER_ANONYMOUS_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous3
},
- [OPPONENT_GARRET] =
+ [TRAINER_GARRET] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Garret
},
- [OPPONENT_WINSTON_2] =
+ [TRAINER_WINSTON_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston2
},
- [OPPONENT_WINSTON_3] =
+ [TRAINER_WINSTON_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston3
},
- [OPPONENT_WINSTON_4] =
+ [TRAINER_WINSTON_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston4
},
- [OPPONENT_WINSTON_5] =
+ [TRAINER_WINSTON_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winston5
},
- [OPPONENT_STEVE_1] =
+ [TRAINER_STEVE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve1
},
- [OPPONENT_CHRIS] =
+ [TRAINER_CHRIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chris
},
- [OPPONENT_MARK] =
+ [TRAINER_MARK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mark
},
- [OPPONENT_KENN] =
+ [TRAINER_KENN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kenn
},
- [OPPONENT_STEVE_2] =
+ [TRAINER_STEVE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve2
},
- [OPPONENT_STEVE_3] =
+ [TRAINER_STEVE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve3
},
- [OPPONENT_STEVE_4] =
+ [TRAINER_STEVE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve4
},
- [OPPONENT_STEVE_5] =
+ [TRAINER_STEVE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steve5
},
- [OPPONENT_LUIS] =
+ [TRAINER_LUIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Luis
},
- [OPPONENT_AUSTIN] =
+ [TRAINER_AUSTIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Austin
},
- [OPPONENT_DOUGLAS] =
+ [TRAINER_DOUGLAS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Douglas
},
- [OPPONENT_DARRIN] =
+ [TRAINER_DARRIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Darrin
},
- [OPPONENT_TONY_1] =
+ [TRAINER_TONY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony1
},
- [OPPONENT_JEROME] =
+ [TRAINER_JEROME] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerome
},
- [OPPONENT_MATTHEW] =
+ [TRAINER_MATTHEW] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Matthew
},
- [OPPONENT_DAVID] =
+ [TRAINER_DAVID] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_David
},
- [OPPONENT_SPENCER] =
+ [TRAINER_SPENCER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Spencer
},
- [OPPONENT_ROLAND] =
+ [TRAINER_ROLAND] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roland
},
- [OPPONENT_CODY] =
+ [TRAINER_CODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cody
},
- [OPPONENT_STAN] =
+ [TRAINER_STAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Stan
},
- [OPPONENT_BARRY] =
+ [TRAINER_BARRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Barry
},
- [OPPONENT_DEAN] =
+ [TRAINER_DEAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dean
},
- [OPPONENT_RODNEY] =
+ [TRAINER_RODNEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rodney
},
- [OPPONENT_RICHARD] =
+ [TRAINER_RICHARD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Richard
},
- [OPPONENT_HERMAN] =
+ [TRAINER_HERMAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Herman
},
- [OPPONENT_ANONYMOUS_4] =
+ [TRAINER_ANONYMOUS_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous4
},
- [OPPONENT_GILBERT] =
+ [TRAINER_GILBERT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gilbert
},
- [OPPONENT_FRANKLIN] =
+ [TRAINER_FRANKLIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Franklin
},
- [OPPONENT_DANNY] =
+ [TRAINER_DANNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Danny
},
- [OPPONENT_JACK] =
+ [TRAINER_JACK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jack
},
- [OPPONENT_DUDLEY] =
+ [TRAINER_DUDLEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dudley
},
- [OPPONENT_CHAD] =
+ [TRAINER_CHAD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chad
},
- [OPPONENT_TONY_2] =
+ [TRAINER_TONY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony2
},
- [OPPONENT_TONY_3] =
+ [TRAINER_TONY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony3
},
- [OPPONENT_TONY_4] =
+ [TRAINER_TONY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony4
},
- [OPPONENT_TONY_5] =
+ [TRAINER_TONY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tony5
},
- [OPPONENT_HIDEKI] =
+ [TRAINER_HIDEKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideki
},
- [OPPONENT_HITOSHI] =
+ [TRAINER_HITOSHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hitoshi
},
- [OPPONENT_KIYO] =
+ [TRAINER_KIYO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kiyo
},
- [OPPONENT_KOICHI] =
+ [TRAINER_KOICHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Koichi
},
- [OPPONENT_NOB_1] =
+ [TRAINER_NOB_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob1
},
- [OPPONENT_NOB_2] =
+ [TRAINER_NOB_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob2
},
- [OPPONENT_NOB_3] =
+ [TRAINER_NOB_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob3
},
- [OPPONENT_NOB_4] =
+ [TRAINER_NOB_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob4
},
- [OPPONENT_NOB_5] =
+ [TRAINER_NOB_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nob5
},
- [OPPONENT_YUJI] =
+ [TRAINER_YUJI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Yuji
},
- [OPPONENT_DAISUKE] =
+ [TRAINER_DAISUKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Daisuke
},
- [OPPONENT_ATSUSHI] =
+ [TRAINER_ATSUSHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Atsushi
},
- [OPPONENT_KIRK] =
+ [TRAINER_KIRK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kirk
},
- [OPPONENT_SCOTT] =
+ [TRAINER_SCOTT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Scott
},
- [OPPONENT_HARVEY] =
+ [TRAINER_HARVEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Harvey
},
- [OPPONENT_SHAWN] =
+ [TRAINER_SHAWN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shawn
},
- [OPPONENT_RANDY] =
+ [TRAINER_RANDY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Randy
},
- [OPPONENT_DALTON_1] =
+ [TRAINER_DALTON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton1
},
- [OPPONENT_DALTON_2] =
+ [TRAINER_DALTON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton2
},
- [OPPONENT_DALTON_3] =
+ [TRAINER_DALTON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton3
},
- [OPPONENT_DALTON_4] =
+ [TRAINER_DALTON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton4
},
- [OPPONENT_DALTON_5] =
+ [TRAINER_DALTON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dalton5
},
- [OPPONENT_COLE] =
+ [TRAINER_COLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cole
},
- [OPPONENT_FLINT] =
+ [TRAINER_FLINT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Flint
},
- [OPPONENT_AXLE] =
+ [TRAINER_AXLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Axle
},
- [OPPONENT_JAKE] =
+ [TRAINER_JAKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jake
},
- [OPPONENT_ANDY] =
+ [TRAINER_ANDY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andy
},
- [OPPONENT_BERNIE_1] =
+ [TRAINER_BERNIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie1
},
- [OPPONENT_BERNIE_2] =
+ [TRAINER_BERNIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie2
},
- [OPPONENT_BERNIE_3] =
+ [TRAINER_BERNIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie3
},
- [OPPONENT_BERNIE_4] =
+ [TRAINER_BERNIE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie4
},
- [OPPONENT_BERNIE_5] =
+ [TRAINER_BERNIE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
@@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Bernie5
},
- [OPPONENT_DREW] =
+ [TRAINER_DREW] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Drew
},
- [OPPONENT_CLIFF] =
+ [TRAINER_CLIFF] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cliff
},
- [OPPONENT_LARRY] =
+ [TRAINER_LARRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Larry
},
- [OPPONENT_SHANE] =
+ [TRAINER_SHANE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shane
},
- [OPPONENT_JUSTIN] =
+ [TRAINER_JUSTIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Justin
},
- [OPPONENT_ETHAN_1] =
+ [TRAINER_ETHAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan1
},
- [OPPONENT_JEFF] =
+ [TRAINER_JEFF] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jeff
},
- [OPPONENT_TRAVIS] =
+ [TRAINER_TRAVIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Travis
},
- [OPPONENT_ETHAN_2] =
+ [TRAINER_ETHAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan2
},
- [OPPONENT_ETHAN_3] =
+ [TRAINER_ETHAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan3
},
- [OPPONENT_ETHAN_4] =
+ [TRAINER_ETHAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan4
},
- [OPPONENT_ETHAN_5] =
+ [TRAINER_ETHAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ethan5
},
- [OPPONENT_BRENT] =
+ [TRAINER_BRENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brent
},
- [OPPONENT_DONALD] =
+ [TRAINER_DONALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Donald
},
- [OPPONENT_TAYLOR] =
+ [TRAINER_TAYLOR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Taylor
},
- [OPPONENT_BRANDON_1] =
+ [TRAINER_BRANDON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon1
},
- [OPPONENT_DEREK] =
+ [TRAINER_DEREK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Derek
},
- [OPPONENT_BRANDON_2] =
+ [TRAINER_BRANDON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon2
},
- [OPPONENT_BRANDON_3] =
+ [TRAINER_BRANDON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon3
},
- [OPPONENT_BRANDON_4] =
+ [TRAINER_BRANDON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon4
},
- [OPPONENT_BRANDON_5] =
+ [TRAINER_BRANDON_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brandon5
},
- [OPPONENT_EDWARD] =
+ [TRAINER_EDWARD] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edward
},
- [OPPONENT_PRESTON] =
+ [TRAINER_PRESTON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Preston
},
- [OPPONENT_VIRGIL] =
+ [TRAINER_VIRGIL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Virgil
},
- [OPPONENT_FRITZ] =
+ [TRAINER_FRITZ] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Fritz
},
- [OPPONENT_WILLIAM] =
+ [TRAINER_WILLIAM] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_William
},
- [OPPONENT_JOSHUA] =
+ [TRAINER_JOSHUA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Joshua
},
- [OPPONENT_CAMERON_1] =
+ [TRAINER_CAMERON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron1
},
- [OPPONENT_CAMERON_2] =
+ [TRAINER_CAMERON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron2
},
- [OPPONENT_CAMERON_3] =
+ [TRAINER_CAMERON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron3
},
- [OPPONENT_CAMERON_4] =
+ [TRAINER_CAMERON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron4
},
- [OPPONENT_CAMERON_5] =
+ [TRAINER_CAMERON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cameron5
},
- [OPPONENT_JACLYN] =
+ [TRAINER_JACLYN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jaclyn
},
- [OPPONENT_HANNAH] =
+ [TRAINER_HANNAH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hannah
},
- [OPPONENT_SAMANTHA] =
+ [TRAINER_SAMANTHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Samantha
},
- [OPPONENT_MAURA] =
+ [TRAINER_MAURA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maura
},
- [OPPONENT_KAYLA] =
+ [TRAINER_KAYLA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kayla
},
- [OPPONENT_ALEXIS] =
+ [TRAINER_ALEXIS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexis
},
- [OPPONENT_JACKI_1] =
+ [TRAINER_JACKI_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki1
},
- [OPPONENT_JACKI_2] =
+ [TRAINER_JACKI_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki2
},
- [OPPONENT_JACKI_3] =
+ [TRAINER_JACKI_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki3
},
- [OPPONENT_JACKI_4] =
+ [TRAINER_JACKI_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki4
},
- [OPPONENT_JACKI_5] =
+ [TRAINER_JACKI_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacki5
},
- [OPPONENT_WALTER_1] =
+ [TRAINER_WALTER_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter1
},
- [OPPONENT_TUCKER] =
+ [TRAINER_TUCKER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tucker
},
- [OPPONENT_THOMAS] =
+ [TRAINER_THOMAS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Thomas
},
- [OPPONENT_WALTER_2] =
+ [TRAINER_WALTER_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter2
},
- [OPPONENT_WALTER_3] =
+ [TRAINER_WALTER_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter3
},
- [OPPONENT_WALTER_4] =
+ [TRAINER_WALTER_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter4
},
- [OPPONENT_WALTER_5] =
+ [TRAINER_WALTER_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Walter5
},
- [OPPONENT_SIDNEY] =
+ [TRAINER_SIDNEY] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sidney
},
- [OPPONENT_PHOEBE] =
+ [TRAINER_PHOEBE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phoebe
},
- [OPPONENT_GLACIA] =
+ [TRAINER_GLACIA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Glacia
},
- [OPPONENT_DRAKE] =
+ [TRAINER_DRAKE] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Drake
},
- [OPPONENT_ROXANNE] =
+ [TRAINER_ROXANNE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roxanne
},
- [OPPONENT_BRAWLY] =
+ [TRAINER_BRAWLY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brawly
},
- [OPPONENT_WATTSON] =
+ [TRAINER_WATTSON] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wattson
},
- [OPPONENT_FLANNERY] =
+ [TRAINER_FLANNERY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Flannery
},
- [OPPONENT_NORMAN] =
+ [TRAINER_NORMAN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Norman
},
- [OPPONENT_WINONA] =
+ [TRAINER_WINONA] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Winona
},
- [OPPONENT_TATE_AND_LIZA] =
+ [TRAINER_TATE_AND_LIZA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_TateAndLiza
},
- [OPPONENT_WALLACE] =
+ [TRAINER_WALLACE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
@@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wallace
},
- [OPPONENT_JERRY_1] =
+ [TRAINER_JERRY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry1
},
- [OPPONENT_TED] =
+ [TRAINER_TED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ted
},
- [OPPONENT_PAUL] =
+ [TRAINER_PAUL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Paul
},
- [OPPONENT_JERRY_2] =
+ [TRAINER_JERRY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry2
},
- [OPPONENT_JERRY_3] =
+ [TRAINER_JERRY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry3
},
- [OPPONENT_JERRY_4] =
+ [TRAINER_JERRY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry4
},
- [OPPONENT_JERRY_5] =
+ [TRAINER_JERRY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jerry5
},
- [OPPONENT_KAREN_1] =
+ [TRAINER_KAREN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen1
},
- [OPPONENT_GEORGIA] =
+ [TRAINER_GEORGIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Georgia
},
- [OPPONENT_KAREN_2] =
+ [TRAINER_KAREN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen2
},
- [OPPONENT_KAREN_3] =
+ [TRAINER_KAREN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen3
},
- [OPPONENT_KAREN_4] =
+ [TRAINER_KAREN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen4
},
- [OPPONENT_KAREN_5] =
+ [TRAINER_KAREN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Karen5
},
- [OPPONENT_KATE_AND_JOY] =
+ [TRAINER_KATE_AND_JOY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_KateAndJoy
},
- [OPPONENT_ANNA_AND_MEG_1] =
+ [TRAINER_ANNA_AND_MEG_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg1
},
- [OPPONENT_ANNA_AND_MEG_2] =
+ [TRAINER_ANNA_AND_MEG_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg2
},
- [OPPONENT_ANNA_AND_MEG_3] =
+ [TRAINER_ANNA_AND_MEG_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg3
},
- [OPPONENT_ANNA_AND_MEG_4] =
+ [TRAINER_ANNA_AND_MEG_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg4
},
- [OPPONENT_ANNA_AND_MEG_5] =
+ [TRAINER_ANNA_AND_MEG_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AnnaAndMeg5
},
- [OPPONENT_VICTOR] =
+ [TRAINER_VICTOR] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Victor
},
- [OPPONENT_MIGUEL_1] =
+ [TRAINER_MIGUEL_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel1
},
- [OPPONENT_COLTON] =
+ [TRAINER_COLTON] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Colton
},
- [OPPONENT_MIGUEL_2] =
+ [TRAINER_MIGUEL_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel2
},
- [OPPONENT_MIGUEL_3] =
+ [TRAINER_MIGUEL_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel3
},
- [OPPONENT_MIGUEL_4] =
+ [TRAINER_MIGUEL_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel4
},
- [OPPONENT_MIGUEL_5] =
+ [TRAINER_MIGUEL_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Miguel5
},
- [OPPONENT_VICTORIA] =
+ [TRAINER_VICTORIA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Victoria
},
- [OPPONENT_VANESSA] =
+ [TRAINER_VANESSA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vanessa
},
- [OPPONENT_MARISSA] =
+ [TRAINER_MARISSA] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Marissa
},
- [OPPONENT_ISABEL_1] =
+ [TRAINER_ISABEL_1] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel1
},
- [OPPONENT_ISABEL_2] =
+ [TRAINER_ISABEL_2] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel2
},
- [OPPONENT_ISABEL_3] =
+ [TRAINER_ISABEL_3] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel3
},
- [OPPONENT_ISABEL_4] =
+ [TRAINER_ISABEL_4] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel4
},
- [OPPONENT_ISABEL_5] =
+ [TRAINER_ISABEL_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isabel5
},
- [OPPONENT_TIMOTHY_1] =
+ [TRAINER_TIMOTHY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy1
},
- [OPPONENT_TIMOTHY_2] =
+ [TRAINER_TIMOTHY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy2
},
- [OPPONENT_TIMOTHY_3] =
+ [TRAINER_TIMOTHY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy3
},
- [OPPONENT_TIMOTHY_4] =
+ [TRAINER_TIMOTHY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy4
},
- [OPPONENT_TIMOTHY_5] =
+ [TRAINER_TIMOTHY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timothy5
},
- [OPPONENT_VICKY] =
+ [TRAINER_VICKY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vicky
},
- [OPPONENT_SHELBY_1] =
+ [TRAINER_SHELBY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby1
},
- [OPPONENT_SHELBY_2] =
+ [TRAINER_SHELBY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby2
},
- [OPPONENT_SHELBY_3] =
+ [TRAINER_SHELBY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby3
},
- [OPPONENT_SHELBY_4] =
+ [TRAINER_SHELBY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby4
},
- [OPPONENT_SHELBY_5] =
+ [TRAINER_SHELBY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
@@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Shelby5
},
- [OPPONENT_CALVIN_1] =
+ [TRAINER_CALVIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin1
},
- [OPPONENT_BILLY] =
+ [TRAINER_BILLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Billy
},
- [OPPONENT_JOSH] =
+ [TRAINER_JOSH] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Josh
},
- [OPPONENT_TOMMY] =
+ [TRAINER_TOMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tommy
},
- [OPPONENT_JOEY] =
+ [TRAINER_JOEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Joey
},
- [OPPONENT_BEN] =
+ [TRAINER_BEN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ben
},
- [OPPONENT_ANONYMOUS_5] =
+ [TRAINER_ANONYMOUS_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous5
},
- [OPPONENT_KEVIN] =
+ [TRAINER_KEVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kevin
},
- [OPPONENT_NEAL] =
+ [TRAINER_NEAL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Neal
},
- [OPPONENT_DILLON] =
+ [TRAINER_DILLON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dillon
},
- [OPPONENT_CALVIN_2] =
+ [TRAINER_CALVIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin2
},
- [OPPONENT_CALVIN_3] =
+ [TRAINER_CALVIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin3
},
- [OPPONENT_CALVIN_4] =
+ [TRAINER_CALVIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin4
},
- [OPPONENT_CALVIN_5] =
+ [TRAINER_CALVIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Calvin5
},
- [OPPONENT_EDDIE] =
+ [TRAINER_EDDIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Eddie
},
- [OPPONENT_ALLEN] =
+ [TRAINER_ALLEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Allen
},
- [OPPONENT_TIMMY] =
+ [TRAINER_TIMMY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Timmy
},
- [OPPONENT_STEVEN] =
+ [TRAINER_STEVEN] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Steven
},
- [OPPONENT_ANDREW] =
+ [TRAINER_ANDREW] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andrew
},
- [OPPONENT_IVAN] =
+ [TRAINER_IVAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ivan
},
- [OPPONENT_CLAUDE] =
+ [TRAINER_CLAUDE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Claude
},
- [OPPONENT_ELLIOT_1] =
+ [TRAINER_ELLIOT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot1
},
- [OPPONENT_NED] =
+ [TRAINER_NED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ned
},
- [OPPONENT_DALE] =
+ [TRAINER_DALE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dale
},
- [OPPONENT_NOLAN] =
+ [TRAINER_NOLAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nolan
},
- [OPPONENT_BARNY] =
+ [TRAINER_BARNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Barny
},
- [OPPONENT_WADE] =
+ [TRAINER_WADE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wade
},
- [OPPONENT_CARTER] =
+ [TRAINER_CARTER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carter
},
- [OPPONENT_ELLIOT_2] =
+ [TRAINER_ELLIOT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot2
},
- [OPPONENT_ELLIOT_3] =
+ [TRAINER_ELLIOT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot3
},
- [OPPONENT_ELLIOT_4] =
+ [TRAINER_ELLIOT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot4
},
- [OPPONENT_ELLIOT_5] =
+ [TRAINER_ELLIOT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Elliot5
},
- [OPPONENT_RONALD] =
+ [TRAINER_RONALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ronald
},
- [OPPONENT_JACOB] =
+ [TRAINER_JACOB] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jacob
},
- [OPPONENT_ANTHONY] =
+ [TRAINER_ANTHONY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anthony
},
- [OPPONENT_BENJAMIN_1] =
+ [TRAINER_BENJAMIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin1
},
- [OPPONENT_BENJAMIN_2] =
+ [TRAINER_BENJAMIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin2
},
- [OPPONENT_BENJAMIN_3] =
+ [TRAINER_BENJAMIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin3
},
- [OPPONENT_BENJAMIN_4] =
+ [TRAINER_BENJAMIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin4
},
- [OPPONENT_BENJAMIN_5] =
+ [TRAINER_BENJAMIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benjamin5
},
- [OPPONENT_ABIGAIL_1] =
+ [TRAINER_ABIGAIL_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail1
},
- [OPPONENT_JASMINE] =
+ [TRAINER_JASMINE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jasmine
},
- [OPPONENT_ABIGAIL_2] =
+ [TRAINER_ABIGAIL_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail2
},
- [OPPONENT_ABIGAIL_3] =
+ [TRAINER_ABIGAIL_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail3
},
- [OPPONENT_ABIGAIL_4] =
+ [TRAINER_ABIGAIL_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail4
},
- [OPPONENT_ABIGAIL_5] =
+ [TRAINER_ABIGAIL_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Abigail5
},
- [OPPONENT_DYLAN_1] =
+ [TRAINER_DYLAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan1
},
- [OPPONENT_DYLAN_2] =
+ [TRAINER_DYLAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan2
},
- [OPPONENT_DYLAN_3] =
+ [TRAINER_DYLAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan3
},
- [OPPONENT_DYLAN_4] =
+ [TRAINER_DYLAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan4
},
- [OPPONENT_DYLAN_5] =
+ [TRAINER_DYLAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dylan5
},
- [OPPONENT_MARIA_1] =
+ [TRAINER_MARIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria1
},
- [OPPONENT_MARIA_2] =
+ [TRAINER_MARIA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria2
},
- [OPPONENT_MARIA_3] =
+ [TRAINER_MARIA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria3
},
- [OPPONENT_MARIA_4] =
+ [TRAINER_MARIA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria4
},
- [OPPONENT_MARIA_5] =
+ [TRAINER_MARIA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maria5
},
- [OPPONENT_CALEB] =
+ [TRAINER_CALEB] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Caleb
},
- [OPPONENT_ANONYMOUS_6] =
+ [TRAINER_ANONYMOUS_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous6
},
- [OPPONENT_ISAIAH_1] =
+ [TRAINER_ISAIAH_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah1
},
- [OPPONENT_ANONYMOUS_7] =
+ [TRAINER_ANONYMOUS_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous7
},
- [OPPONENT_CHASE] =
+ [TRAINER_CHASE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chase
},
- [OPPONENT_ISAIAH_2] =
+ [TRAINER_ISAIAH_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah2
},
- [OPPONENT_ISAIAH_3] =
+ [TRAINER_ISAIAH_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah3
},
- [OPPONENT_ISAIAH_4] =
+ [TRAINER_ISAIAH_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah4
},
- [OPPONENT_ISAIAH_5] =
+ [TRAINER_ISAIAH_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaiah5
},
- [OPPONENT_ANONYMOUS_8] =
+ [TRAINER_ANONYMOUS_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous8
},
- [OPPONENT_CONNOR] =
+ [TRAINER_CONNOR] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Connor
},
- [OPPONENT_ANONYMOUS_9] =
+ [TRAINER_ANONYMOUS_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous9
},
- [OPPONENT_KATELYN_1] =
+ [TRAINER_KATELYN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn1
},
- [OPPONENT_ALLISON] =
+ [TRAINER_ALLISON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Allison
},
- [OPPONENT_KATELYN_2] =
+ [TRAINER_KATELYN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn2
},
- [OPPONENT_KATELYN_3] =
+ [TRAINER_KATELYN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn3
},
- [OPPONENT_KATELYN_4] =
+ [TRAINER_KATELYN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn4
},
- [OPPONENT_KATELYN_5] =
+ [TRAINER_KATELYN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katelyn5
},
- [OPPONENT_NICOLAS_1] =
+ [TRAINER_NICOLAS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas1
},
- [OPPONENT_NICOLAS_2] =
+ [TRAINER_NICOLAS_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas2
},
- [OPPONENT_NICOLAS_3] =
+ [TRAINER_NICOLAS_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas3
},
- [OPPONENT_NICOLAS_4] =
+ [TRAINER_NICOLAS_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas4
},
- [OPPONENT_NICOLAS_5] =
+ [TRAINER_NICOLAS_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicolas5
},
- [OPPONENT_AARON] =
+ [TRAINER_AARON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Aaron
},
- [OPPONENT_PERRY] =
+ [TRAINER_PERRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Perry
},
- [OPPONENT_HUGH] =
+ [TRAINER_HUGH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hugh
},
- [OPPONENT_PHIL] =
+ [TRAINER_PHIL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phil
},
- [OPPONENT_JARED] =
+ [TRAINER_JARED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jared
},
- [OPPONENT_ANONYMOUS_10] =
+ [TRAINER_ANONYMOUS_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous10
},
- [OPPONENT_TANNER] =
+ [TRAINER_TANNER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tanner
},
- [OPPONENT_WILL] =
+ [TRAINER_WILL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Will
},
- [OPPONENT_COLIN] =
+ [TRAINER_COLIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Colin
},
- [OPPONENT_ROBERT_1] =
+ [TRAINER_ROBERT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert1
},
- [OPPONENT_BENNY] =
+ [TRAINER_BENNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Benny
},
- [OPPONENT_CHESTER] =
+ [TRAINER_CHESTER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Chester
},
- [OPPONENT_ROBERT_2] =
+ [TRAINER_ROBERT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert2
},
- [OPPONENT_ROBERT_3] =
+ [TRAINER_ROBERT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert3
},
- [OPPONENT_ROBERT_4] =
+ [TRAINER_ROBERT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert4
},
- [OPPONENT_ROBERT_5] =
+ [TRAINER_ROBERT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robert5
},
- [OPPONENT_ALEX] =
+ [TRAINER_ALEX] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alex
},
- [OPPONENT_BECK] =
+ [TRAINER_BECK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beck
},
- [OPPONENT_YASU] =
+ [TRAINER_YASU] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Yasu
},
- [OPPONENT_TAKASHI] =
+ [TRAINER_TAKASHI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Takashi
},
- [OPPONENT_MAKOTO] =
+ [TRAINER_MAKOTO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Makoto
},
- [OPPONENT_HIDEO_1] =
+ [TRAINER_HIDEO_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideo1
},
- [OPPONENT_LAO_1] =
+ [TRAINER_LAO_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao1
},
- [OPPONENT_LUNG] =
+ [TRAINER_LUNG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lung
},
- [OPPONENT_LAO_2] =
+ [TRAINER_LAO_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao2
},
- [OPPONENT_LAO_3] =
+ [TRAINER_LAO_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao3
},
- [OPPONENT_LAO_4] =
+ [TRAINER_LAO_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao4
},
- [OPPONENT_LAO_5] =
+ [TRAINER_LAO_5] =
{
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lao5
},
- [OPPONENT_TESSA] =
+ [TRAINER_TESSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tessa
},
- [OPPONENT_LAURA] =
+ [TRAINER_LAURA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Laura
},
- [OPPONENT_CYNDY_1] =
+ [TRAINER_CYNDY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy1
},
- [OPPONENT_CORA] =
+ [TRAINER_CORA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cora
},
- [OPPONENT_JILL] =
+ [TRAINER_JILL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jill
},
- [OPPONENT_CYNDY_2] =
+ [TRAINER_CYNDY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy2
},
- [OPPONENT_CYNDY_3] =
+ [TRAINER_CYNDY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy3
},
- [OPPONENT_CYNDY_4] =
+ [TRAINER_CYNDY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy4
},
- [OPPONENT_CYNDY_5] =
+ [TRAINER_CYNDY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Cyndy5
},
- [OPPONENT_MADELINE_1] =
+ [TRAINER_MADELINE_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline1
},
- [OPPONENT_CLARISSA] =
+ [TRAINER_CLARISSA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clarissa
},
- [OPPONENT_ANGELICA] =
+ [TRAINER_ANGELICA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Angelica
},
- [OPPONENT_MADELINE_2] =
+ [TRAINER_MADELINE_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline2
},
- [OPPONENT_MADELINE_3] =
+ [TRAINER_MADELINE_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline3
},
- [OPPONENT_MADELINE_4] =
+ [TRAINER_MADELINE_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline4
},
- [OPPONENT_MADELINE_5] =
+ [TRAINER_MADELINE_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Madeline5
},
- [OPPONENT_BEVERLY] =
+ [TRAINER_BEVERLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beverly
},
- [OPPONENT_DAWN] =
+ [TRAINER_DAWN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dawn
},
- [OPPONENT_NICOLE] =
+ [TRAINER_NICOLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nicole
},
- [OPPONENT_DENISE] =
+ [TRAINER_DENISE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Denise
},
- [OPPONENT_BETH] =
+ [TRAINER_BETH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Beth
},
- [OPPONENT_TARA] =
+ [TRAINER_TARA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tara
},
- [OPPONENT_MISSY] =
+ [TRAINER_MISSY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Missy
},
- [OPPONENT_ALICE] =
+ [TRAINER_ALICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alice
},
- [OPPONENT_JENNY_1] =
+ [TRAINER_JENNY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny1
},
- [OPPONENT_GRACE] =
+ [TRAINER_GRACE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grace
},
- [OPPONENT_TANYA] =
+ [TRAINER_TANYA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tanya
},
- [OPPONENT_SHARON] =
+ [TRAINER_SHARON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sharon
},
- [OPPONENT_NIKKI] =
+ [TRAINER_NIKKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nikki
},
- [OPPONENT_BRENDA] =
+ [TRAINER_BRENDA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brenda
},
- [OPPONENT_KATIE] =
+ [TRAINER_KATIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Katie
},
- [OPPONENT_SUSIE] =
+ [TRAINER_SUSIE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Susie
},
- [OPPONENT_KARA] =
+ [TRAINER_KARA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kara
},
- [OPPONENT_DANA] =
+ [TRAINER_DANA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dana
},
- [OPPONENT_ERIN] =
+ [TRAINER_ERIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Erin
},
- [OPPONENT_DEBRA] =
+ [TRAINER_DEBRA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Debra
},
- [OPPONENT_LINDA] =
+ [TRAINER_LINDA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Linda
},
- [OPPONENT_KAYLEE] =
+ [TRAINER_KAYLEE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kaylee
},
- [OPPONENT_LAUREL] =
+ [TRAINER_LAUREL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Laurel
},
- [OPPONENT_DARCY] =
+ [TRAINER_DARCY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Darcy
},
- [OPPONENT_JENNY_2] =
+ [TRAINER_JENNY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny2
},
- [OPPONENT_JENNY_3] =
+ [TRAINER_JENNY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny3
},
- [OPPONENT_JENNY_4] =
+ [TRAINER_JENNY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny4
},
- [OPPONENT_JENNY_5] =
+ [TRAINER_JENNY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenny5
},
- [OPPONENT_HEIDI] =
+ [TRAINER_HEIDI] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Heidi
},
- [OPPONENT_BECKY] =
+ [TRAINER_BECKY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Becky
},
- [OPPONENT_CAROL] =
+ [TRAINER_CAROL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carol
},
- [OPPONENT_NANCY] =
+ [TRAINER_NANCY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nancy
},
- [OPPONENT_MARTHA] =
+ [TRAINER_MARTHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Martha
},
- [OPPONENT_DIANA_1] =
+ [TRAINER_DIANA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana1
},
- [OPPONENT_NINA] =
+ [TRAINER_NINA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Nina
},
- [OPPONENT_IRENE] =
+ [TRAINER_IRENE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Irene
},
- [OPPONENT_DIANA_2] =
+ [TRAINER_DIANA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana2
},
- [OPPONENT_DIANA_3] =
+ [TRAINER_DIANA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana3
},
- [OPPONENT_DIANA_4] =
+ [TRAINER_DIANA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana4
},
- [OPPONENT_DIANA_5] =
+ [TRAINER_DIANA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Diana5
},
- [OPPONENT_AMY_AND_LIV_1] =
+ [TRAINER_AMY_AND_LIV_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv1
},
- [OPPONENT_AMY_AND_LIV_2] =
+ [TRAINER_AMY_AND_LIV_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv2
},
- [OPPONENT_GINA_AND_MIA_1] =
+ [TRAINER_GINA_AND_MIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GinaAndMia1
},
- [OPPONENT_MIU_AND_YUKI] =
+ [TRAINER_MIU_AND_YUKI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_MiuAndYuki
},
- [OPPONENT_AMY_AND_LIV_3] =
+ [TRAINER_AMY_AND_LIV_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv3
},
- [OPPONENT_GINA_AND_MIA_2] =
+ [TRAINER_GINA_AND_MIA_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_GinaAndMia2
},
- [OPPONENT_AMY_AND_LIV_4] =
+ [TRAINER_AMY_AND_LIV_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv4
},
- [OPPONENT_AMY_AND_LIV_5] =
+ [TRAINER_AMY_AND_LIV_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv5
},
- [OPPONENT_AMY_AND_LIV_6] =
+ [TRAINER_AMY_AND_LIV_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_AmyAndLiv6
},
- [OPPONENT_HUEY] =
+ [TRAINER_HUEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Huey
},
- [OPPONENT_EDMOND] =
+ [TRAINER_EDMOND] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edmond
},
- [OPPONENT_ERNEST_1] =
+ [TRAINER_ERNEST_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest1
},
- [OPPONENT_DWAYNE] =
+ [TRAINER_DWAYNE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Dwayne
},
- [OPPONENT_PHILLIP] =
+ [TRAINER_PHILLIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Phillip
},
- [OPPONENT_LEONARD] =
+ [TRAINER_LEONARD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Leonard
},
- [OPPONENT_DUNCAN] =
+ [TRAINER_DUNCAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Duncan
},
- [OPPONENT_ERNEST_2] =
+ [TRAINER_ERNEST_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest2
},
- [OPPONENT_ERNEST_3] =
+ [TRAINER_ERNEST_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest3
},
- [OPPONENT_ERNEST_4] =
+ [TRAINER_ERNEST_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest4
},
- [OPPONENT_ERNEST_5] =
+ [TRAINER_ERNEST_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
@@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ernest5
},
- [OPPONENT_ANONYMOUS_11] =
+ [TRAINER_ANONYMOUS_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous11
},
- [OPPONENT_ANONYMOUS_12] =
+ [TRAINER_ANONYMOUS_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous12
},
- [OPPONENT_ANONYMOUS_13] =
+ [TRAINER_ANONYMOUS_13] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous13
},
- [OPPONENT_SONNY] =
+ [TRAINER_SONNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sonny
},
- [OPPONENT_DONOVAN] =
+ [TRAINER_DONOVAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Donovan
},
- [OPPONENT_GERALD] =
+ [TRAINER_GERALD] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Gerald
},
- [OPPONENT_KELVIN] =
+ [TRAINER_KELVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kelvin
},
- [OPPONENT_KODY] =
+ [TRAINER_KODY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kody
},
- [OPPONENT_TEVIN] =
+ [TRAINER_TEVIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tevin
},
- [OPPONENT_DAMON] =
+ [TRAINER_DAMON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Damon
},
- [OPPONENT_PABLO] =
+ [TRAINER_PABLO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BOARDER,
@@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Pablo
},
- [OPPONENT_EDWIN_1] =
+ [TRAINER_EDWIN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin1
},
- [OPPONENT_HECTOR_1] =
+ [TRAINER_HECTOR_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hector1
},
- [OPPONENT_HECTOR_2] =
+ [TRAINER_HECTOR_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hector2
},
- [OPPONENT_EDWIN_2] =
+ [TRAINER_EDWIN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin2
},
- [OPPONENT_EDWIN_3] =
+ [TRAINER_EDWIN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin3
},
- [OPPONENT_EDWIN_4] =
+ [TRAINER_EDWIN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin4
},
- [OPPONENT_EDWIN_5] =
+ [TRAINER_EDWIN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Edwin5
},
- [OPPONENT_WALLY_1] =
+ [TRAINER_WALLY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally1
},
- [OPPONENT_BRENDAN_1] =
+ [TRAINER_BRENDAN_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan1
},
- [OPPONENT_BRENDAN_2] =
+ [TRAINER_BRENDAN_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan2
},
- [OPPONENT_BRENDAN_3] =
+ [TRAINER_BRENDAN_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan3
},
- [OPPONENT_BRENDAN_4] =
+ [TRAINER_BRENDAN_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan4
},
- [OPPONENT_BRENDAN_5] =
+ [TRAINER_BRENDAN_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan5
},
- [OPPONENT_BRENDAN_6] =
+ [TRAINER_BRENDAN_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan6
},
- [OPPONENT_BRENDAN_7] =
+ [TRAINER_BRENDAN_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan7
},
- [OPPONENT_BRENDAN_8] =
+ [TRAINER_BRENDAN_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan8
},
- [OPPONENT_BRENDAN_9] =
+ [TRAINER_BRENDAN_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan9
},
- [OPPONENT_MAY_1] =
+ [TRAINER_MAY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May1
},
- [OPPONENT_MAY_2] =
+ [TRAINER_MAY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May2
},
- [OPPONENT_MAY_3] =
+ [TRAINER_MAY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May3
},
- [OPPONENT_MAY_4] =
+ [TRAINER_MAY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May4
},
- [OPPONENT_MAY_5] =
+ [TRAINER_MAY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May5
},
- [OPPONENT_MAY_6] =
+ [TRAINER_MAY_6] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May6
},
- [OPPONENT_MAY_7] =
+ [TRAINER_MAY_7] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May7
},
- [OPPONENT_MAY_8] =
+ [TRAINER_MAY_8] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May8
},
- [OPPONENT_MAY_9] =
+ [TRAINER_MAY_9] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May9
},
- [OPPONENT_ISAAC_1] =
+ [TRAINER_ISAAC_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac1
},
- [OPPONENT_RILEY] =
+ [TRAINER_RILEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Riley
},
- [OPPONENT_AIDAN] =
+ [TRAINER_AIDAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Aidan
},
- [OPPONENT_ISAAC_2] =
+ [TRAINER_ISAAC_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac2
},
- [OPPONENT_ISAAC_3] =
+ [TRAINER_ISAAC_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac3
},
- [OPPONENT_ISAAC_4] =
+ [TRAINER_ISAAC_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac4
},
- [OPPONENT_ISAAC_5] =
+ [TRAINER_ISAAC_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Isaac5
},
- [OPPONENT_LYDIA_1] =
+ [TRAINER_LYDIA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia1
},
- [OPPONENT_ALEXIA] =
+ [TRAINER_ALEXIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexia
},
- [OPPONENT_DANIELLE] =
+ [TRAINER_DANIELLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Danielle
},
- [OPPONENT_LYDIA_2] =
+ [TRAINER_LYDIA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia2
},
- [OPPONENT_LYDIA_3] =
+ [TRAINER_LYDIA_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia3
},
- [OPPONENT_LYDIA_4] =
+ [TRAINER_LYDIA_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia4
},
- [OPPONENT_LYDIA_5] =
+ [TRAINER_LYDIA_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lydia5
},
- [OPPONENT_JACKSON_1] =
+ [TRAINER_JACKSON_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson1
},
- [OPPONENT_CARLOS] =
+ [TRAINER_CARLOS] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Carlos
},
- [OPPONENT_SEBASTIAN] =
+ [TRAINER_SEBASTIAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sebastian
},
- [OPPONENT_JACKSON_2] =
+ [TRAINER_JACKSON_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson2
},
- [OPPONENT_JACKSON_3] =
+ [TRAINER_JACKSON_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson3
},
- [OPPONENT_JACKSON_4] =
+ [TRAINER_JACKSON_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson4
},
- [OPPONENT_JACKSON_5] =
+ [TRAINER_JACKSON_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jackson5
},
- [OPPONENT_CATHERINE_1] =
+ [TRAINER_CATHERINE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine1
},
- [OPPONENT_JENNA] =
+ [TRAINER_JENNA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jenna
},
- [OPPONENT_SOPHIA] =
+ [TRAINER_SOPHIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sophia
},
- [OPPONENT_CATHERINE_2] =
+ [TRAINER_CATHERINE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine2
},
- [OPPONENT_CATHERINE_3] =
+ [TRAINER_CATHERINE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine3
},
- [OPPONENT_CATHERINE_4] =
+ [TRAINER_CATHERINE_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine4
},
- [OPPONENT_CATHERINE_5] =
+ [TRAINER_CATHERINE_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Catherine5
},
- [OPPONENT_MAXIE_1] =
+ [TRAINER_MAXIE_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie1
},
- [OPPONENT_GRUNT_28] =
+ [TRAINER_GRUNT_28] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt28
},
- [OPPONENT_GRUNT_29] =
+ [TRAINER_GRUNT_29] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt29
},
- [OPPONENT_GRUNT_30] =
+ [TRAINER_GRUNT_30] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt30
},
- [OPPONENT_GRUNT_31] =
+ [TRAINER_GRUNT_31] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt31
},
- [OPPONENT_GRUNT_32] =
+ [TRAINER_GRUNT_32] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt32
},
- [OPPONENT_GRUNT_33] =
+ [TRAINER_GRUNT_33] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt33
},
- [OPPONENT_GRUNT_34] =
+ [TRAINER_GRUNT_34] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt34
},
- [OPPONENT_GRUNT_35] =
+ [TRAINER_GRUNT_35] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt35
},
- [OPPONENT_GRUNT_36] =
+ [TRAINER_GRUNT_36] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt36
},
- [OPPONENT_GRUNT_37] =
+ [TRAINER_GRUNT_37] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt37
},
- [OPPONENT_GRUNT_38] =
+ [TRAINER_GRUNT_38] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt38
},
- [OPPONENT_GRUNT_39] =
+ [TRAINER_GRUNT_39] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt39
},
- [OPPONENT_GRUNT_40] =
+ [TRAINER_GRUNT_40] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt40
},
- [OPPONENT_GRUNT_41] =
+ [TRAINER_GRUNT_41] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt41
},
- [OPPONENT_GRUNT_42] =
+ [TRAINER_GRUNT_42] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt42
},
- [OPPONENT_GRUNT_43] =
+ [TRAINER_GRUNT_43] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt43
},
- [OPPONENT_GRUNT_44] =
+ [TRAINER_GRUNT_44] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt44
},
- [OPPONENT_GRUNT_45] =
+ [TRAINER_GRUNT_45] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt45
},
- [OPPONENT_GRUNT_46] =
+ [TRAINER_GRUNT_46] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt46
},
- [OPPONENT_GRUNT_47] =
+ [TRAINER_GRUNT_47] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt47
},
- [OPPONENT_GRUNT_48] =
+ [TRAINER_GRUNT_48] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt48
},
- [OPPONENT_GRUNT_49] =
+ [TRAINER_GRUNT_49] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt49
},
- [OPPONENT_GRUNT_50] =
+ [TRAINER_GRUNT_50] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt50
},
- [OPPONENT_GRUNT_51] =
+ [TRAINER_GRUNT_51] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt51
},
- [OPPONENT_GRUNT_52] =
+ [TRAINER_GRUNT_52] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt52
},
- [OPPONENT_GRUNT_53] =
+ [TRAINER_GRUNT_53] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt53
},
- [OPPONENT_GRUNT_54] =
+ [TRAINER_GRUNT_54] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Grunt54
},
- [OPPONENT_ANONYMOUS_14] =
+ [TRAINER_ANONYMOUS_14] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous14
},
- [OPPONENT_ANONYMOUS_15] =
+ [TRAINER_ANONYMOUS_15] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous15
},
- [OPPONENT_TABITHA_1] =
+ [TRAINER_TABITHA_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tabitha1
},
- [OPPONENT_TABITHA_2] =
+ [TRAINER_TABITHA_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tabitha2
},
- [OPPONENT_ANONYMOUS_16] =
+ [TRAINER_ANONYMOUS_16] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Anonymous16
},
- [OPPONENT_COURTNEY_1] =
+ [TRAINER_COURTNEY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Courtney1
},
- [OPPONENT_COURTNEY_2] =
+ [TRAINER_COURTNEY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Courtney2
},
- [OPPONENT_MAXIE_2] =
+ [TRAINER_MAXIE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie2
},
- [OPPONENT_MAXIE_3] =
+ [TRAINER_MAXIE_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Maxie3
},
- [OPPONENT_TIANA] =
+ [TRAINER_TIANA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tiana
},
- [OPPONENT_HALEY_1] =
+ [TRAINER_HALEY_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley1
},
- [OPPONENT_JANICE] =
+ [TRAINER_JANICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Janice
},
- [OPPONENT_VIVI] =
+ [TRAINER_VIVI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vivi
},
- [OPPONENT_HALEY_2] =
+ [TRAINER_HALEY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley2
},
- [OPPONENT_HALEY_3] =
+ [TRAINER_HALEY_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley3
},
- [OPPONENT_HALEY_4] =
+ [TRAINER_HALEY_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley4
},
- [OPPONENT_HALEY_5] =
+ [TRAINER_HALEY_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Haley5
},
- [OPPONENT_SALLY] =
+ [TRAINER_SALLY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sally
},
- [OPPONENT_ROBIN] =
+ [TRAINER_ROBIN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Robin
},
- [OPPONENT_ANDREA] =
+ [TRAINER_ANDREA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Andrea
},
- [OPPONENT_CRISSY] =
+ [TRAINER_CRISSY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
@@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Crissy
},
- [OPPONENT_RICK] =
+ [TRAINER_RICK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Rick
},
- [OPPONENT_LYLE] =
+ [TRAINER_LYLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lyle
},
- [OPPONENT_JOSE] =
+ [TRAINER_JOSE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jose
},
- [OPPONENT_DOUG] =
+ [TRAINER_DOUG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Doug
},
- [OPPONENT_GREG] =
+ [TRAINER_GREG] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Greg
},
- [OPPONENT_KENT] =
+ [TRAINER_KENT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kent
},
- [OPPONENT_JAMES_1] =
+ [TRAINER_JAMES_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James1
},
- [OPPONENT_JAMES_2] =
+ [TRAINER_JAMES_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James2
},
- [OPPONENT_JAMES_3] =
+ [TRAINER_JAMES_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James3
},
- [OPPONENT_JAMES_4] =
+ [TRAINER_JAMES_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James4
},
- [OPPONENT_JAMES_5] =
+ [TRAINER_JAMES_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_James5
},
- [OPPONENT_BRICE] =
+ [TRAINER_BRICE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brice
},
- [OPPONENT_TRENT_1] =
+ [TRAINER_TRENT_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent1
},
- [OPPONENT_LENNY] =
+ [TRAINER_LENNY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lenny
},
- [OPPONENT_LUCAS_1] =
+ [TRAINER_LUCAS_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lucas1
},
- [OPPONENT_ALAN] =
+ [TRAINER_ALAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alan
},
- [OPPONENT_CLARK] =
+ [TRAINER_CLARK] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Clark
},
- [OPPONENT_ERIC] =
+ [TRAINER_ERIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Eric
},
- [OPPONENT_LUCAS_2] =
+ [TRAINER_LUCAS_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Lucas2
},
- [OPPONENT_MIKE_1] =
+ [TRAINER_MIKE_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mike1
},
- [OPPONENT_MIKE_2] =
+ [TRAINER_MIKE_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Mike2
},
- [OPPONENT_TRENT_2] =
+ [TRAINER_TRENT_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent2
},
- [OPPONENT_TRENT_3] =
+ [TRAINER_TRENT_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent3
},
- [OPPONENT_TRENT_4] =
+ [TRAINER_TRENT_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent4
},
- [OPPONENT_TRENT_5] =
+ [TRAINER_TRENT_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
@@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Trent5
},
- [OPPONENT_DEZ_AND_LUKE] =
+ [TRAINER_DEZ_AND_LUKE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_DezAndLuke
},
- [OPPONENT_LEA_AND_JED] =
+ [TRAINER_LEA_AND_JED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LeaAndJed
},
- [OPPONENT_LOIS_AND_HAL_1] =
+ [TRAINER_LOIS_AND_HAL_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal1
},
- [OPPONENT_LOIS_AND_HAL_2] =
+ [TRAINER_LOIS_AND_HAL_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal2
},
- [OPPONENT_LOIS_AND_HAL_3] =
+ [TRAINER_LOIS_AND_HAL_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal3
},
- [OPPONENT_LOIS_AND_HAL_4] =
+ [TRAINER_LOIS_AND_HAL_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal4
},
- [OPPONENT_LOIS_AND_HAL_5] =
+ [TRAINER_LOIS_AND_HAL_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LoisAndHal5
},
- [OPPONENT_JOHANNA] =
+ [TRAINER_JOHANNA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Johanna
},
- [OPPONENT_ZANE] =
+ [TRAINER_ZANE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Zane
},
- [OPPONENT_VIVIAN] =
+ [TRAINER_VIVIAN] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Vivian
},
- [OPPONENT_SADIE] =
+ [TRAINER_SADIE] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Sadie
},
- [OPPONENT_HIDEO_2] =
+ [TRAINER_HIDEO_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Hideo2
},
- [OPPONENT_KEIGO] =
+ [TRAINER_KEIGO] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Keigo
},
- [OPPONENT_TSUNAO] =
+ [TRAINER_TSUNAO] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tsunao
},
- [OPPONENT_TERRELL] =
+ [TRAINER_TERRELL] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
@@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Terrell
},
- [OPPONENT_KYLEE] =
+ [TRAINER_KYLEE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Kylee
},
- [OPPONENT_WALLY_2] =
+ [TRAINER_WALLY_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally2
},
- [OPPONENT_WALLY_3] =
+ [TRAINER_WALLY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally3
},
- [OPPONENT_WALLY_4] =
+ [TRAINER_WALLY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally4
},
- [OPPONENT_WALLY_5] =
+ [TRAINER_WALLY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally5
},
- [OPPONENT_WALLY_6] =
+ [TRAINER_WALLY_6] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wally6
},
- [OPPONENT_BRENDAN_10] =
+ [TRAINER_BRENDAN_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan10
},
- [OPPONENT_BRENDAN_11] =
+ [TRAINER_BRENDAN_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan11
},
- [OPPONENT_BRENDAN_12] =
+ [TRAINER_BRENDAN_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Brendan12
},
- [OPPONENT_MAY_10] =
+ [TRAINER_MAY_10] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May10
},
- [OPPONENT_MAY_11] =
+ [TRAINER_MAY_11] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May11
},
- [OPPONENT_MAY_12] =
+ [TRAINER_MAY_12] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_May12
},
- [OPPONENT_JONAH] =
+ [TRAINER_JONAH] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Jonah
},
- [OPPONENT_HENRY] =
+ [TRAINER_HENRY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Henry
},
- [OPPONENT_ROGER] =
+ [TRAINER_ROGER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Roger
},
- [OPPONENT_ALEXA] =
+ [TRAINER_ALEXA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Alexa
},
- [OPPONENT_RUBEN] =
+ [TRAINER_RUBEN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Ruben
},
- [OPPONENT_KOJI] =
+ [TRAINER_KOJI] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Koji
},
- [OPPONENT_WAYNE] =
+ [TRAINER_WAYNE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Wayne
},
- [OPPONENT_BYRON] =
+ [TRAINER_BYRON] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Byron
},
- [OPPONENT_REED] =
+ [TRAINER_REED] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Reed
},
- [OPPONENT_TISHA] =
+ [TRAINER_TISHA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_Tisha
},
- [OPPONENT_TORI_AND_TIA] =
+ [TRAINER_TORI_AND_TIA] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
@@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_ToriAndTia
},
- [OPPONENT_KIM_AND_IRIS] =
+ [TRAINER_KIM_AND_IRIS] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_KimAndIris
},
- [OPPONENT_TYRA_AND_IVY] =
+ [TRAINER_TYRA_AND_IVY] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_TyraAndIvy
},
- [OPPONENT_MEL_AND_PAUL] =
+ [TRAINER_MEL_AND_PAUL] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_MelAndPaul
},
- [OPPONENT_JOHN_AND_JAY_1] =
+ [TRAINER_JOHN_AND_JAY_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay1
},
- [OPPONENT_JOHN_AND_JAY_2] =
+ [TRAINER_JOHN_AND_JAY_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay2
},
- [OPPONENT_JOHN_AND_JAY_3] =
+ [TRAINER_JOHN_AND_JAY_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay3
},
- [OPPONENT_JOHN_AND_JAY_4] =
+ [TRAINER_JOHN_AND_JAY_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay4
},
- [OPPONENT_JOHN_AND_JAY_5] =
+ [TRAINER_JOHN_AND_JAY_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_JohnAndJay5
},
- [OPPONENT_RELI_AND_IAN] =
+ [TRAINER_RELI_AND_IAN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_ReliAndIan
},
- [OPPONENT_RITA_AND_SAM_1] =
+ [TRAINER_RITA_AND_SAM_1] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam1
},
- [OPPONENT_RITA_AND_SAM_2] =
+ [TRAINER_RITA_AND_SAM_2] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam2
},
- [OPPONENT_RITA_AND_SAM_3] =
+ [TRAINER_RITA_AND_SAM_3] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam3
},
- [OPPONENT_RITA_AND_SAM_4] =
+ [TRAINER_RITA_AND_SAM_4] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam4
},
- [OPPONENT_RITA_AND_SAM_5] =
+ [TRAINER_RITA_AND_SAM_5] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_RitaAndSam5
},
- [OPPONENT_LISA_AND_RAY] =
+ [TRAINER_LISA_AND_RAY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = {
.party = gTrainerParty_LisaAndRay
},
- [OPPONENT_EUGENE] =
+ [TRAINER_EUGENE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 01:59:55 +0000