dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Misc missing constant use

Browse Source
This commit is contained in:
GriffinR
2023-08-10 01:21:38 -04:00
parent da238562f0
commit 18319e8da3
22 changed files with 254 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
src/data/contest_opponents.h
View File

@@ -138,11 +138,14 @@ enum {
#define CONTEST_AI_SET_20 (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_12 | CONTEST_AI_DUMMY_25)
#define CONTEST_AI_SET_21 (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_7 | CONTEST_AI_DUMMY_25)
// All AI contestants have the same trainer ID
#define CONTEST_AI_TRAINER_ID 0xFFFF
const struct ContestWinner gDefaultContestWinners[] =
{
[CONTEST_WINNER_HALL_1 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_ELECTRIKE,
.contestCategory = CONTEST_CATEGORY_CUTE,
.monName = _("ELECTER"),
@@ -151,7 +154,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_2 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_TROPIUS,
.contestCategory = CONTEST_CATEGORY_COOL,
.monName = _("TROPO"),
@@ -160,7 +163,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_3 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_XATU,
.contestCategory = CONTEST_CATEGORY_BEAUTY,
.monName = _("TUXA"),
@@ -169,7 +172,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_4 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_PLUSLE,
.contestCategory = CONTEST_CATEGORY_TOUGH,
.monName = _("PULSE"),
@@ -178,7 +181,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_5 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_SHUPPET,
.contestCategory = CONTEST_CATEGORY_SMART,
.monName = _("SHUPUP"),
@@ -187,7 +190,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_6 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_ZANGOOSE,
.contestCategory = CONTEST_CATEGORY_COOL,
.monName = _("GOOZAN"),
@@ -196,7 +199,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_UNUSED_1 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_LOUDRED,
.contestCategory = CONTEST_CATEGORY_BEAUTY,
.monName = _("LOUDED"),
@@ -205,7 +208,7 @@ const struct ContestWinner gDefaultContestWinners[] =
},
[CONTEST_WINNER_HALL_UNUSED_2 - 1] = {
.personality = 0,
.trainerId = 0xFFFF,
.trainerId = CONTEST_AI_TRAINER_ID,
.species = SPECIES_DELCATTY,
.contestCategory = CONTEST_CATEGORY_CUTE,
.monName = _("KITSY"),
@@ -242,7 +245,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 4,
.sheen = 50,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_EDITH] = {
.species = SPECIES_ILLUMISE,
@@ -270,7 +273,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 2,
.sheen = 60,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_EVAN] = {
.species = SPECIES_DUSTOX,
@@ -298,7 +301,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 4,
.sheen = 70,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KELSEY] = {
.species = SPECIES_SEEDOT,
@@ -326,7 +329,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 7,
.sheen = 80,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MADISON] = {
.species = SPECIES_TAILLOW,
@@ -354,7 +357,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 4,
.sheen = 90,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_RAYMOND] = {
.species = SPECIES_NINCADA,
@@ -382,7 +385,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 8,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_GRANT] = {
.species = SPECIES_SHROOMISH,
@@ -410,7 +413,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 2,
.sheen = 50,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_PAIGE] = {
.species = SPECIES_SPHEAL,
@@ -438,7 +441,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 10,
.sheen = 60,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ALEC] = {
.species = SPECIES_SLAKOTH,
@@ -466,7 +469,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 18,
.sheen = 70,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SYDNEY] = {
.species = SPECIES_WHISMUR,
@@ -494,7 +497,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 7,
.sheen = 80,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MORRIS] = {
.species = SPECIES_MAKUHITA,
@@ -522,7 +525,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 1,
.sheen = 90,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MARIAH] = {
.species = SPECIES_ARON,
@@ -550,7 +553,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 2,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_RUSSELL] = {
.species = SPECIES_CROBAT,
@@ -578,7 +581,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 10,
.sheen = 50,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MELANIE] = {
.species = SPECIES_GULPIN,
@@ -606,7 +609,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 5,
.sheen = 60,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CHANCE] = {
.species = SPECIES_MANECTRIC,
@@ -634,7 +637,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 1,
.sheen = 70,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_AGATHA] = {
.species = SPECIES_BULBASAUR,
@@ -662,7 +665,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 4,
.sheen = 50,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_BEAU] = {
.species = SPECIES_BUTTERFREE,
@@ -690,7 +693,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 4,
.sheen = 60,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KAY] = {
.species = SPECIES_PIDGEOTTO,
@@ -718,7 +721,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 3,
.sheen = 70,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CALE] = {
.species = SPECIES_DIGLETT,
@@ -746,7 +749,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 10,
.sheen = 80,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CAITLIN] = {
.species = SPECIES_POLIWAG,
@@ -774,7 +777,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 10,
.sheen = 90,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_COLBY] = {
.species = SPECIES_TOTODILE,
@@ -802,7 +805,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 5,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KYLIE] = {
.species = SPECIES_LEDYBA,
@@ -830,7 +833,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 2,
.sheen = 90,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_LIAM] = {
.species = SPECIES_DELIBIRD,
@@ -858,7 +861,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 3,
.sheen = 80,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MILO] = {
.species = SPECIES_LARVITAR,
@@ -886,7 +889,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 10,
.sheen = 70,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KARINA] = {
.species = SPECIES_ROSELIA,
@@ -914,7 +917,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_BOBBY] = {
.species = SPECIES_DODRIO,
@@ -942,7 +945,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 35,
.sheen = 110,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CLAIRE] = {
.species = SPECIES_TRAPINCH,
@@ -970,7 +973,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 120,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_WILLIE] = {
.species = SPECIES_CACNEA,
@@ -998,7 +1001,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 130,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CASSIDY] = {
.species = SPECIES_SANDSLASH,
@@ -1026,7 +1029,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 140,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MORGAN] = {
.species = SPECIES_BALTOY,
@@ -1054,7 +1057,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 35,
.sheen = 150,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SUMMER] = {
.species = SPECIES_MEDICHAM,
@@ -1082,7 +1085,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 40,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MILES] = {
.species = SPECIES_SPINDA,
@@ -1110,7 +1113,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 110,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_AUDREY] = {
.species = SPECIES_SWABLU,
@@ -1138,7 +1141,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 120,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_AVERY] = {
.species = SPECIES_SPOINK,
@@ -1166,7 +1169,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 30,
.sheen = 130,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ARIANA] = {
.species = SPECIES_KECLEON,
@@ -1194,7 +1197,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 35,
.sheen = 140,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ASHTON] = {
.species = SPECIES_GOLDEEN,
@@ -1222,7 +1225,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 150,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SANDRA] = {
.species = SPECIES_BARBOACH,
@@ -1250,7 +1253,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 15,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CARSON] = {
.species = SPECIES_SKARMORY,
@@ -1278,7 +1281,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 110,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KATRINA] = {
.species = SPECIES_LOTAD,
@@ -1306,7 +1309,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 75,
.sheen = 120,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_LUKE] = {
.species = SPECIES_SLOWBRO,
@@ -1334,7 +1337,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 100,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_RAUL] = {
.species = SPECIES_FARFETCHD,
@@ -1362,7 +1365,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 110,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JADA] = {
.species = SPECIES_SEEL,
@@ -1390,7 +1393,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 120,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ZEEK] = {
.species = SPECIES_DROWZEE,
@@ -1418,7 +1421,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 45,
.sheen = 130,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_DIEGO] = {
.species = SPECIES_HITMONCHAN,
@@ -1446,7 +1449,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 45,
.sheen = 140,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ALIYAH] = {
.species = SPECIES_BLISSEY,
@@ -1474,7 +1477,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 150,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_NATALIA] = {
.species = SPECIES_ELEKID,
@@ -1502,7 +1505,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 25,
.sheen = 140,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_DEVIN] = {
.species = SPECIES_SNUBBULL,
@@ -1530,7 +1533,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 130,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_TYLOR] = {
.species = SPECIES_MISDREAVUS,
@@ -1558,7 +1561,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 20,
.sheen = 120,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_RONNIE] = {
.species = SPECIES_LAIRON,
@@ -1586,7 +1589,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 90,
.sheen = 200,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CLAUDIA] = {
.species = SPECIES_SHIFTRY,
@@ -1614,7 +1617,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 70,
.sheen = 210,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ELIAS] = {
.species = SPECIES_NINJASK,
@@ -1642,7 +1645,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 70,
.sheen = 220,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JADE] = {
.species = SPECIES_SWELLOW,
@@ -1670,7 +1673,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 40,
.sheen = 230,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_FRANCIS] = {
.species = SPECIES_MIGHTYENA,
@@ -1698,7 +1701,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 70,
.sheen = 240,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ALISHA] = {
.species = SPECIES_BEAUTIFLY,
@@ -1726,7 +1729,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 250,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SAUL] = {
.species = SPECIES_SEAKING,
@@ -1754,7 +1757,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 90,
.sheen = 200,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_FELICIA] = {
.species = SPECIES_CASTFORM,
@@ -1782,7 +1785,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 65,
.sheen = 210,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_EMILIO] = {
.species = SPECIES_MACHOKE,
@@ -1810,7 +1813,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 50,
.sheen = 220,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KARLA] = {
.species = SPECIES_LOMBRE,
@@ -1838,7 +1841,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 70,
.sheen = 230,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_DARRYL] = {
.species = SPECIES_SEVIPER,
@@ -1866,7 +1869,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 240,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SELENA] = {
.species = SPECIES_WAILMER,
@@ -1894,7 +1897,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 30,
.sheen = 250,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_NOEL] = {
.species = SPECIES_MAGIKARP,
@@ -1922,7 +1925,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 160,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_LACEY] = {
.species = SPECIES_LUNATONE,
@@ -1950,7 +1953,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 50,
.sheen = 210,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CORBIN] = {
.species = SPECIES_ABSOL,
@@ -1978,7 +1981,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 35,
.sheen = 220,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_GRACIE] = {
.species = SPECIES_EXEGGUTOR,
@@ -2006,7 +2009,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 200,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_COLTIN] = {
.species = SPECIES_CUBONE,
@@ -2034,7 +2037,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 210,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ELLIE] = {
.species = SPECIES_HITMONLEE,
@@ -2062,7 +2065,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 220,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MARCUS] = {
.species = SPECIES_SQUIRTLE,
@@ -2090,7 +2093,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 95,
.sheen = 230,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KIARA] = {
.species = SPECIES_KANGASKHAN,
@@ -2118,7 +2121,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 240,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_BRYCE] = {
.species = SPECIES_PINECO,
@@ -2146,7 +2149,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 250,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JAMIE] = {
.species = SPECIES_DUNSPARCE,
@@ -2174,7 +2177,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 110,
.sheen = 240,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JORGE] = {
.species = SPECIES_HOUNDOOM,
@@ -2202,7 +2205,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 230,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_DEVON] = {
.species = SPECIES_MILTANK,
@@ -2230,7 +2233,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 40,
.sheen = 220,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JUSTINA] = {
.species = SPECIES_GYARADOS,
@@ -2258,7 +2261,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 160,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_RALPH] = {
.species = SPECIES_LOUDRED,
@@ -2286,7 +2289,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 160,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_ROSA] = {
.species = SPECIES_SKITTY,
@@ -2314,7 +2317,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 60,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KEATON] = {
.species = SPECIES_SLAKING,
@@ -2342,7 +2345,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 150,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MAYRA] = {
.species = SPECIES_ALTARIA,
@@ -2370,7 +2373,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 90,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_LAMAR] = {
.species = SPECIES_KIRLIA,
@@ -2398,7 +2401,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_AUBREY] = {
.species = SPECIES_BELLOSSOM,
@@ -2426,7 +2429,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 40,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_NIGEL] = {
.species = SPECIES_SABLEYE,
@@ -2454,7 +2457,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 160,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CAMILLE] = {
.species = SPECIES_NATU,
@@ -2482,7 +2485,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 170,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_DEON] = {
.species = SPECIES_SHARPEDO,
@@ -2510,7 +2513,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 100,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JANELLE] = {
.species = SPECIES_LUVDISC,
@@ -2538,7 +2541,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 190,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_HEATH] = {
.species = SPECIES_HERACROSS,
@@ -2566,7 +2569,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 140,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SASHA] = {
.species = SPECIES_ELECTRODE,
@@ -2594,7 +2597,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 50,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_FRANKIE] = {
.species = SPECIES_PICHU,
@@ -2622,7 +2625,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 120,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_HELEN] = {
.species = SPECIES_WOBBUFFET,
@@ -2650,7 +2653,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 210,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CAMILE] = {
.species = SPECIES_GENGAR,
@@ -2678,7 +2681,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 180,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_MARTIN] = {
.species = SPECIES_PORYGON,
@@ -2706,7 +2709,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 130,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_SERGIO] = {
.species = SPECIES_DRAGONITE,
@@ -2734,7 +2737,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 150,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_KAILEY] = {
.species = SPECIES_MEOWTH,
@@ -2762,7 +2765,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_PERLA] = {
.species = SPECIES_JYNX,
@@ -2790,7 +2793,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 120,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_CLARA] = {
.species = SPECIES_TOGEPI,
@@ -2818,7 +2821,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 80,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_JAKOB] = {
.species = SPECIES_ESPEON,
@@ -2846,7 +2849,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 150,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_TREY] = {
.species = SPECIES_SLOWKING,
@@ -2874,7 +2877,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 170,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
},
[CONTEST_OPPONENT_LANE] = {
.species = SPECIES_URSARING,
@@ -2902,7 +2905,7 @@ const struct ContestPokemon gContestOpponents[] =
.tough = 190,
.sheen = 255,
.personality = 0,
.otId = 0xFFFF
.otId = CONTEST_AI_TRAINER_ID,
}
};