summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c2
-rw-r--r--src/data/trainer_parties.h22
-rw-r--r--src/data/trainers.h136
3 files changed, 80 insertions, 80 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 3234e8974..879084342 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -305,7 +305,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
[REMATCH_TRENT] = REMATCH(TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5, ROUTE112),
[REMATCH_SAWYER] = REMATCH(TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5, MT_CHIMNEY),
[REMATCH_KIRA_AND_DAN] = REMATCH(TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5, ABANDONED_SHIP_ROOMS2_1F),
- [REMATCH_WALLY_3] = REMATCH(TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6, VICTORY_ROAD_1F),
+ [REMATCH_WALLY_3] = REMATCH(TRAINER_WALLY_VR_2, TRAINER_WALLY_VR_3, TRAINER_WALLY_VR_4, TRAINER_WALLY_VR_5, TRAINER_WALLY_VR_5, VICTORY_ROAD_1F),
[REMATCH_ROXANNE] = REMATCH(TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5, RUSTBORO_CITY),
[REMATCH_BRAWLY] = REMATCH(TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5, DEWFORD_TOWN),
[REMATCH_WATTSON] = REMATCH(TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5, MAUVILLE_CITY),
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 932b563d7..68104ed74 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -331,7 +331,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = {
{
.iv = 50,
.lvl = 28,
@@ -344,7 +344,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelly2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = {
{
.iv = 100,
.lvl = 37,
@@ -6678,7 +6678,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = {
{
.iv = 100,
.lvl = 36,
@@ -6748,7 +6748,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
}
};
-static const struct TrainerMonNoItemCustomMoves sParty_Wally1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = {
{
.iv = 150,
.lvl = 44,
@@ -7893,7 +7893,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = {
{
.iv = 50,
.lvl = 18,
@@ -8743,7 +8743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = {
{
.iv = 30,
.lvl = 16,
@@ -8751,7 +8751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
}
};
-static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = {
{
.iv = 150,
.lvl = 47,
@@ -8784,7 +8784,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = {
}
};
-static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = {
{
.iv = 150,
.lvl = 50,
@@ -8817,7 +8817,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = {
}
};
-static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = {
{
.iv = 150,
.lvl = 53,
@@ -8850,7 +8850,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = {
}
};
-static const struct TrainerMonNoItemCustomMoves sParty_Wally6[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR5[] = {
{
.iv = 150,
.lvl = 56,
@@ -9783,7 +9783,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] =
}
};
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] = {
{
.iv = 75,
.lvl = 26,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 223a15726..163a8296d 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Zander},
},
- [TRAINER_SHELLY_1] =
+ [TRAINER_SHELLY_WEATHER_INSTITUTE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -457,11 +457,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelly1),
- .party = {.NoItemDefaultMoves = sParty_Shelly1},
+ .partySize = ARRAY_COUNT(sParty_ShellyWeatherInstitute),
+ .party = {.NoItemDefaultMoves = sParty_ShellyWeatherInstitute},
},
- [TRAINER_SHELLY_2] =
+ [TRAINER_SHELLY_SEAFLOOR_CAVERN] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -471,8 +471,8 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelly2),
- .party = {.NoItemDefaultMoves = sParty_Shelly2},
+ .partySize = ARRAY_COUNT(sParty_ShellySeafloorCavern),
+ .party = {.NoItemDefaultMoves = sParty_ShellySeafloorCavern},
},
[TRAINER_ARCHIE] =
@@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Hector},
},
- [TRAINER_TABITHA_1] =
+ [TRAINER_TABITHA_MOSSDEEP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -7205,8 +7205,8 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tabitha1),
- .party = {.NoItemDefaultMoves = sParty_Tabitha1},
+ .partySize = ARRAY_COUNT(sParty_TabithaMossdeep),
+ .party = {.NoItemDefaultMoves = sParty_TabithaMossdeep},
},
[TRAINER_EDWIN_2] =
@@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Edwin5},
},
- [TRAINER_WALLY_1] =
+ [TRAINER_WALLY_VR_1] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7275,11 +7275,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally1),
- .party = {.NoItemCustomMoves = sParty_Wally1},
+ .partySize = ARRAY_COUNT(sParty_WallyVR1),
+ .party = {.NoItemCustomMoves = sParty_WallyVR1},
},
- [TRAINER_BRENDAN_1] =
+ [TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Mudkip},
},
- [TRAINER_BRENDAN_2] =
+ [TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Mudkip},
},
- [TRAINER_BRENDAN_3] =
+ [TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Mudkip},
},
- [TRAINER_BRENDAN_4] =
+ [TRAINER_BRENDAN_ROUTE_103_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Treecko},
},
- [TRAINER_BRENDAN_5] =
+ [TRAINER_BRENDAN_ROUTE_110_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Treecko},
},
- [TRAINER_BRENDAN_6] =
+ [TRAINER_BRENDAN_ROUTE_119_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Treecko},
},
- [TRAINER_BRENDAN_7] =
+ [TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Torchic},
},
- [TRAINER_BRENDAN_8] =
+ [TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Torchic},
},
- [TRAINER_BRENDAN_9] =
+ [TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Torchic},
},
- [TRAINER_MAY_1] =
+ [TRAINER_MAY_ROUTE_103_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Mudkip},
},
- [TRAINER_MAY_2] =
+ [TRAINER_MAY_ROUTE_110_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Mudkip},
},
- [TRAINER_MAY_3] =
+ [TRAINER_MAY_ROUTE_119_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute119Mudkip},
},
- [TRAINER_MAY_4] =
+ [TRAINER_MAY_ROUTE_103_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Treecko},
},
- [TRAINER_MAY_5] =
+ [TRAINER_MAY_ROUTE_110_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Treecko},
},
- [TRAINER_MAY_6] =
+ [TRAINER_MAY_ROUTE_119_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute119Treecko},
},
- [TRAINER_MAY_7] =
+ [TRAINER_MAY_ROUTE_103_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Torchic},
},
- [TRAINER_MAY_8] =
+ [TRAINER_MAY_ROUTE_110_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Torchic},
},
- [TRAINER_MAY_9] =
+ [TRAINER_MAY_ROUTE_119_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Macey},
},
- [TRAINER_BRENDAN_10] =
+ [TRAINER_BRENDAN_RUSTBORO_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRustboroTreecko},
},
- [TRAINER_BRENDAN_11] =
+ [TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
},
- [TRAINER_TABITHA_2] =
+ [TRAINER_TABITHA_MT_CHIMNEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8367,8 +8367,8 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Tabitha2),
- .party = {.NoItemDefaultMoves = sParty_Tabitha2},
+ .partySize = ARRAY_COUNT(sParty_TabithaMtChimney),
+ .party = {.NoItemDefaultMoves = sParty_TabithaMtChimney},
},
[TRAINER_JONATHAN] =
@@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Jonathan},
},
- [TRAINER_BRENDAN_12] =
+ [TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRustboroTorchic},
},
- [TRAINER_MAY_10] =
+ [TRAINER_MAY_RUSTBORO_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRustboroMudkip},
},
- [TRAINER_MAXIE_1] =
+ [TRAINER_MAXIE_MAGMA_HIDEOUT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MaxieMagmaHideout},
},
- [TRAINER_MAXIE_2] =
+ [TRAINER_MAXIE_MT_CHIMNEY] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Ashley},
},
- [TRAINER_WALLY_2] =
+ [TRAINER_WALLY_MAUVILLE] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9193,11 +9193,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally2),
- .party = {.NoItemDefaultMoves = sParty_Wally2},
+ .partySize = ARRAY_COUNT(sParty_WallyMauville),
+ .party = {.NoItemDefaultMoves = sParty_WallyMauville},
},
- [TRAINER_WALLY_3] =
+ [TRAINER_WALLY_VR_2] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9207,11 +9207,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally3),
- .party = {.NoItemCustomMoves = sParty_Wally3},
+ .partySize = ARRAY_COUNT(sParty_WallyVR2),
+ .party = {.NoItemCustomMoves = sParty_WallyVR2},
},
- [TRAINER_WALLY_4] =
+ [TRAINER_WALLY_VR_3] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9221,11 +9221,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally4),
- .party = {.NoItemCustomMoves = sParty_Wally4},
+ .partySize = ARRAY_COUNT(sParty_WallyVR3),
+ .party = {.NoItemCustomMoves = sParty_WallyVR3},
},
- [TRAINER_WALLY_5] =
+ [TRAINER_WALLY_VR_4] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9235,11 +9235,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally5),
- .party = {.NoItemCustomMoves = sParty_Wally5},
+ .partySize = ARRAY_COUNT(sParty_WallyVR4),
+ .party = {.NoItemCustomMoves = sParty_WallyVR4},
},
- [TRAINER_WALLY_6] =
+ [TRAINER_WALLY_VR_5] =
{
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9249,11 +9249,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wally6),
- .party = {.NoItemCustomMoves = sParty_Wally6},
+ .partySize = ARRAY_COUNT(sParty_WallyVR5),
+ .party = {.NoItemCustomMoves = sParty_WallyVR5},
},
- [TRAINER_BRENDAN_13] =
+ [TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveMudkip},
},
- [TRAINER_BRENDAN_14] =
+ [TRAINER_BRENDAN_LILYCOVE_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTreecko},
},
- [TRAINER_BRENDAN_15] =
+ [TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTorchic},
},
- [TRAINER_MAY_11] =
+ [TRAINER_MAY_LILYCOVE_MUDKIP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayLilycoveMudkip},
},
- [TRAINER_MAY_12] =
+ [TRAINER_MAY_LILYCOVE_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayLilycoveTreecko},
},
- [TRAINER_MAY_13] =
+ [TRAINER_MAY_LILYCOVE_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -10247,7 +10247,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
},
- [TRAINER_TABITHA_3] =
+ [TRAINER_TABITHA_MAGMA_HIDEOUT] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -10257,8 +10257,8 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tabitha3),
- .party = {.NoItemDefaultMoves = sParty_Tabitha3},
+ .partySize = ARRAY_COUNT(sParty_TabithaMagmaHideout),
+ .party = {.NoItemDefaultMoves = sParty_TabithaMagmaHideout},
},
[TRAINER_DARCY] =
@@ -10275,7 +10275,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Darcy},
},
- [TRAINER_MAXIE_3] =
+ [TRAINER_MAXIE_MOSSDEEP] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -10751,7 +10751,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Cristin1},
},
- [TRAINER_MAY_14] =
+ [TRAINER_MAY_RUSTBORO_TREECKO] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -10765,7 +10765,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRustboroTreecko},
},
- [TRAINER_MAY_15] =
+ [TRAINER_MAY_RUSTBORO_TORCHIC] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -11941,7 +11941,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Leaf},
},
- [TRAINER_BRENDAN_16] =
+ [TRAINER_BRENDAN_PLACEHOLDER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG,
@@ -11955,7 +11955,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLinkPlaceholder},
},
- [TRAINER_MAY_16] =
+ [TRAINER_MAY_PLACEHOLDER] =
{
.partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 21:24:26 +0000