summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/data/contest_opponents.h392
-rw-r--r--src/data/contest_text_tables.h118
2 files changed, 255 insertions, 255 deletions
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index 2ebfd1dfd..ef1fdba9f 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -182,9 +182,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_POOCHYENA,
.nickname = _("POOCHY"),
.trainerName = _("JIMMY"),
- .trainerGfxId = 7,
+ .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
.flags = 0xC000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -211,9 +211,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ILLUMISE,
.nickname = _("MUSILLE"),
.trainerName = _("EDITH"),
- .trainerGfxId = 8,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
.flags = 0x82000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -240,9 +240,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DUSTOX,
.nickname = _("DUSTER"),
.trainerName = _("EVAN"),
- .trainerGfxId = 11,
+ .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
.flags = 0x21000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -269,9 +269,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SEEDOT,
.nickname = _("DOTS"),
.trainerName = _("KELSEY"),
- .trainerGfxId = 16,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
.flags = 0x20800FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -298,9 +298,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_TAILLOW,
.nickname = _("TATAY"),
.trainerName = _("MADISON"),
- .trainerGfxId = 18,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
.flags = 0x80400FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -327,9 +327,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_NINCADA,
.nickname = _("NINDA"),
.trainerName = _("RAYMOND"),
- .trainerGfxId = 44,
+ .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
.flags = 0x10200FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -356,9 +356,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SHROOMISH,
.nickname = _("SMISH"),
.trainerName = _("GRANT"),
- .trainerGfxId = 35,
+ .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
.flags = 0x20100FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -385,9 +385,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SPHEAL,
.nickname = _("SLEAL"),
.trainerName = _("PAIGE"),
- .trainerGfxId = 26,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
.flags = 0x8080FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -414,9 +414,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SLAKOTH,
.nickname = _("SLOKTH"),
.trainerName = _("ALEC"),
- .trainerGfxId = 31,
+ .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
.flags = 0x40040FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -443,9 +443,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_WHISMUR,
.nickname = _("WHIRIS"),
.trainerName = _("SYDNEY"),
- .trainerGfxId = 47,
+ .trainerGfxId = EVENT_OBJ_GFX_LASS,
.flags = 0x80020FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -472,9 +472,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MAKUHITA,
.nickname = _("MAHITA"),
.trainerName = _("MORRIS"),
- .trainerGfxId = 38,
+ .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
.flags = 0x8010FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -501,9 +501,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ARON,
.nickname = _("RONAR"),
.trainerName = _("MARIAH"),
- .trainerGfxId = 10,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
.flags = 0x8008FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -530,9 +530,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_CROBAT,
.nickname = _("BATRO"),
.trainerName = _("RUSSELL"),
- .trainerGfxId = 33,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
.flags = 0x90004FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -559,9 +559,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_GULPIN,
.nickname = _("GULIN"),
.trainerName = _("MELANIE"),
- .trainerGfxId = 6,
+ .trainerGfxId = EVENT_OBJ_GFX_TWIN,
.flags = 0x40002FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -588,9 +588,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MANECTRIC,
.nickname = _("RIKELEC"),
.trainerName = _("CHANCE"),
- .trainerGfxId = 15,
+ .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
.flags = 0x80001FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -617,9 +617,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BULBASAUR,
.nickname = _("BULBY"),
.trainerName = _("AGATHA"),
- .trainerGfxId = 20,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
.flags = 0xC000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -646,9 +646,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BUTTERFREE,
.nickname = _("FUTTERBE"),
.trainerName = _("BEAU"),
- .trainerGfxId = 40,
+ .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
.flags = 0x82000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -675,9 +675,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_PIDGEOTTO,
.nickname = _("PIDEOT"),
.trainerName = _("KAY"),
- .trainerGfxId = 34,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
.flags = 0x21000FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -704,9 +704,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DIGLETT,
.nickname = _("DIGLE"),
.trainerName = _("CALE"),
- .trainerGfxId = 55,
+ .trainerGfxId = EVENT_OBJ_GFX_HIKER,
.flags = 0x20800FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -733,9 +733,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_POLIWAG,
.nickname = _("WAGIL"),
.trainerName = _("CAITLIN"),
- .trainerGfxId = 53,
+ .trainerGfxId = EVENT_OBJ_GFX_TUBER_F,
.flags = 0x80400FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -762,9 +762,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_TOTODILE,
.nickname = _("TOTDIL"),
.trainerName = _("COLBY"),
- .trainerGfxId = 5,
+ .trainerGfxId = EVENT_OBJ_GFX_NINJA_BOY,
.flags = 0x10200FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -791,9 +791,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LEDYBA,
.nickname = _("BALEDY"),
.trainerName = _("KYLIE"),
- .trainerGfxId = 45,
+ .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
.flags = 0x20100FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -820,9 +820,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DELIBIRD,
.nickname = _("BIRDLY"),
.trainerName = _("LIAM"),
- .trainerGfxId = 66,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
.flags = 0x8080FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -849,9 +849,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LARVITAR,
.nickname = _("TARVITAR"),
.trainerName = _("MILO"),
- .trainerGfxId = 39,
+ .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
.flags = 0x40040FFF,
- .whichRank = 0,
+ .whichRank = CONTEST_RANK_NORMAL,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -878,9 +878,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ROSELIA,
.nickname = _("RELIA"),
.trainerName = _("KARINA"),
- .trainerGfxId = 32,
+ .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
.flags = 0x24000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -907,9 +907,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DODRIO,
.nickname = _("DUODO"),
.trainerName = _("BOBBY"),
- .trainerGfxId = 51,
+ .trainerGfxId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
.flags = 0x82000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -936,9 +936,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_TRAPINCH,
.nickname = _("PINCHIN"),
.trainerName = _("CLAIRE"),
- .trainerGfxId = 8,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
.flags = 0x81000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -965,9 +965,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_CACNEA,
.nickname = _("NACAC"),
.trainerName = _("WILLIE"),
- .trainerGfxId = 11,
+ .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
.flags = 0x80800FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -994,9 +994,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SANDSLASH,
.nickname = _("SHRAND"),
.trainerName = _("CASSIDY"),
- .trainerGfxId = 18,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
.flags = 0x10400FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1023,9 +1023,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BALTOY,
.nickname = _("TOYBAL"),
.trainerName = _("MORGAN"),
- .trainerGfxId = 44,
+ .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
.flags = 0x8200FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1052,9 +1052,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MEDICHAM,
.nickname = _("CHAMCHAM"),
.trainerName = _("SUMMER"),
- .trainerGfxId = 26,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
.flags = 0x10100FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1081,9 +1081,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SPINDA,
.nickname = _("SPININ"),
.trainerName = _("MILES"),
- .trainerGfxId = 31,
+ .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
.flags = 0x80080FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1110,9 +1110,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SWABLU,
.nickname = _("SWABY"),
.trainerName = _("AUDREY"),
- .trainerGfxId = 47,
+ .trainerGfxId = EVENT_OBJ_GFX_LASS,
.flags = 0xA0040FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1139,9 +1139,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SPOINK,
.nickname = _("POINKER"),
.trainerName = _("AVERY"),
- .trainerGfxId = 38,
+ .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
.flags = 0x80020FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1168,9 +1168,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_KECLEON,
.nickname = _("KECON"),
.trainerName = _("ARIANA"),
- .trainerGfxId = 10,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
.flags = 0x80010FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1197,9 +1197,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_GOLDEEN,
.nickname = _("GOLDEN"),
.trainerName = _("ASHTON"),
- .trainerGfxId = 33,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
.flags = 0x80008FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1226,9 +1226,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BARBOACH,
.nickname = _("BOBOACH"),
.trainerName = _("SANDRA"),
- .trainerGfxId = 6,
+ .trainerGfxId = EVENT_OBJ_GFX_TWIN,
.flags = 0x80004FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1255,9 +1255,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SKARMORY,
.nickname = _("CORPY"),
.trainerName = _("CARSON"),
- .trainerGfxId = 35,
+ .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
.flags = 0x8002FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1284,9 +1284,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LOTAD,
.nickname = _("TADO"),
.trainerName = _("KATRINA"),
- .trainerGfxId = 16,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
.flags = 0x8001FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1313,9 +1313,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SLOWBRO,
.nickname = _("BROWLO"),
.trainerName = _("LUKE"),
- .trainerGfxId = 17,
+ .trainerGfxId = EVENT_OBJ_GFX_FAT_MAN,
.flags = 0xC000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1342,9 +1342,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_FARFETCHD,
.nickname = _("FETCHIN"),
.trainerName = _("RAUL"),
- .trainerGfxId = 66,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
.flags = 0x82000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1371,9 +1371,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SEEL,
.nickname = _("SEELEY"),
.trainerName = _("JADA"),
- .trainerGfxId = 20,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
.flags = 0x21000FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1400,9 +1400,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DROWZEE,
.nickname = _("DROWZIN"),
.trainerName = _("ZEEK"),
- .trainerGfxId = 37,
+ .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
.flags = 0x20800FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1429,9 +1429,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_HITMONCHAN,
.nickname = _("HITEMON"),
.trainerName = _("DIEGO"),
- .trainerGfxId = 21,
+ .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
.flags = 0x80400FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1458,9 +1458,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BLISSEY,
.nickname = _("BLISS"),
.trainerName = _("ALIYAH"),
- .trainerGfxId = 85,
+ .trainerGfxId = EVENT_OBJ_GFX_TEALA,
.flags = 0x10200FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1487,9 +1487,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ELEKID,
.nickname = _("KIDLEK"),
.trainerName = _("NATALIA"),
- .trainerGfxId = 18,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
.flags = 0x20100FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1516,9 +1516,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SNUBBULL,
.nickname = _("SNUBBINS"),
.trainerName = _("DEVIN"),
- .trainerGfxId = 48,
+ .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
.flags = 0x8080FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1545,9 +1545,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MISDREAVUS,
.nickname = _("DREAVIS"),
.trainerName = _("TYLOR"),
- .trainerGfxId = 40,
+ .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
.flags = 0x40040FFF,
- .whichRank = 1,
+ .whichRank = CONTEST_RANK_SUPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1574,9 +1574,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LAIRON,
.nickname = _("LAIRN"),
.trainerName = _("RONNIE"),
- .trainerGfxId = 55,
+ .trainerGfxId = EVENT_OBJ_GFX_HIKER,
.flags = 0x84000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1603,9 +1603,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SHIFTRY,
.nickname = _("SHIFTY"),
.trainerName = _("CLAUDIA"),
- .trainerGfxId = 8,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
.flags = 0x82000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1632,9 +1632,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_NINJASK,
.nickname = _("NINAS"),
.trainerName = _("ELIAS"),
- .trainerGfxId = 11,
+ .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
.flags = 0x81000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1661,9 +1661,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SWELLOW,
.nickname = _("WELOW"),
.trainerName = _("JADE"),
- .trainerGfxId = 18,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
.flags = 0x80800FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1690,9 +1690,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MIGHTYENA,
.nickname = _("YENA"),
.trainerName = _("FRANCIS"),
- .trainerGfxId = 44,
+ .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
.flags = 0x80400FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1719,9 +1719,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BEAUTIFLY,
.nickname = _("TIFLY"),
.trainerName = _("ALISHA"),
- .trainerGfxId = 26,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
.flags = 0x80200FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1748,9 +1748,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SEAKING,
.nickname = _("KINGSEA"),
.trainerName = _("SAUL"),
- .trainerGfxId = 31,
+ .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
.flags = 0x80100FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1777,9 +1777,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_CASTFORM,
.nickname = _("CASTER"),
.trainerName = _("FELICIA"),
- .trainerGfxId = 47,
+ .trainerGfxId = EVENT_OBJ_GFX_LASS,
.flags = 0x80080FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1806,9 +1806,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MACHOKE,
.nickname = _("CHOKEM"),
.trainerName = _("EMILIO"),
- .trainerGfxId = 38,
+ .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
.flags = 0x80040FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1835,9 +1835,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LOMBRE,
.nickname = _("LOMBE"),
.trainerName = _("KARLA"),
- .trainerGfxId = 10,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
.flags = 0x80020FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1864,9 +1864,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SEVIPER,
.nickname = _("VIPES"),
.trainerName = _("DARRYL"),
- .trainerGfxId = 33,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
.flags = 0x80010FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -1893,9 +1893,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_WAILMER,
.nickname = _("MERAIL"),
.trainerName = _("SELENA"),
- .trainerGfxId = 22,
+ .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
.flags = 0x80008FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -1922,9 +1922,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MAGIKARP,
.nickname = _("KARPAG"),
.trainerName = _("NOEL"),
- .trainerGfxId = 35,
+ .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
.flags = 0x80004FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -1951,9 +1951,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LUNATONE,
.nickname = _("LUNONE"),
.trainerName = _("LACEY"),
- .trainerGfxId = 16,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
.flags = 0x80002FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -1980,9 +1980,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ABSOL,
.nickname = _("ABSO"),
.trainerName = _("CORBIN"),
- .trainerGfxId = 39,
+ .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
.flags = 0x80001FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2009,9 +2009,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_EXEGGUTOR,
.nickname = _("EGGSOR"),
.trainerName = _("GRACIE"),
- .trainerGfxId = 32,
+ .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
.flags = 0xC000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2038,9 +2038,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_CUBONE,
.nickname = _("CUBIN"),
.trainerName = _("COLTIN"),
- .trainerGfxId = 65,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_4,
.flags = 0x82000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2067,9 +2067,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_HITMONLEE,
.nickname = _("HITMON"),
.trainerName = _("ELLIE"),
- .trainerGfxId = 22,
+ .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
.flags = 0x21000FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2096,9 +2096,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SQUIRTLE,
.nickname = _("SURTLE"),
.trainerName = _("MARCUS"),
- .trainerGfxId = 49,
+ .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
.flags = 0x20800FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2125,9 +2125,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_KANGASKHAN,
.nickname = _("KHANKAN"),
.trainerName = _("KIARA"),
- .trainerGfxId = 14,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_3,
.flags = 0x80400FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2154,9 +2154,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_PINECO,
.nickname = _("PINOC"),
.trainerName = _("BRYCE"),
- .trainerGfxId = 36,
+ .trainerGfxId = EVENT_OBJ_GFX_BUG_CATCHER,
.flags = 0x10200FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2183,9 +2183,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DUNSPARCE,
.nickname = _("DILTOT"),
.trainerName = _("JAMIE"),
- .trainerGfxId = 34,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
.flags = 0x20100FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2212,9 +2212,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_HOUNDOOM,
.nickname = _("DOOMOND"),
.trainerName = _("JORGE"),
- .trainerGfxId = 48,
+ .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
.flags = 0x8080FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2241,9 +2241,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MILTANK,
.nickname = _("MILKAN"),
.trainerName = _("DEVON"),
- .trainerGfxId = 25,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_M,
.flags = 0x40040FFF,
- .whichRank = 2,
+ .whichRank = CONTEST_RANK_HYPER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -2270,9 +2270,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_GYARADOS,
.nickname = _("RADOS"),
.trainerName = _("JUSTINA"),
- .trainerGfxId = 32,
+ .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
.flags = 0x84000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2299,9 +2299,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LOUDRED,
.nickname = _("LOUDERD"),
.trainerName = _("RALPH"),
- .trainerGfxId = 21,
+ .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
.flags = 0x82000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2328,9 +2328,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SKITTY,
.nickname = _("SITTY"),
.trainerName = _("ROSA"),
- .trainerGfxId = 8,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
.flags = 0x81000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -2357,9 +2357,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SLAKING,
.nickname = _("SLING"),
.trainerName = _("KEATON"),
- .trainerGfxId = 11,
+ .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
.flags = 0x80800FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2386,9 +2386,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ALTARIA,
.nickname = _("TARIA"),
.trainerName = _("MAYRA"),
- .trainerGfxId = 18,
+ .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
.flags = 0x80400FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2415,9 +2415,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_KIRLIA,
.nickname = _("LIRKI"),
.trainerName = _("LAMAR"),
- .trainerGfxId = 15,
+ .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
.flags = 0x80200FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2444,9 +2444,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_BELLOSSOM,
.nickname = _("BLOSSOM"),
.trainerName = _("AUBREY"),
- .trainerGfxId = 26,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
.flags = 0x80100FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -2473,9 +2473,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SABLEYE,
.nickname = _("EYESAB"),
.trainerName = _("NIGEL"),
- .trainerGfxId = 31,
+ .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
.flags = 0x80080FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2502,9 +2502,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_NATU,
.nickname = _("UTAN"),
.trainerName = _("CAMILLE"),
- .trainerGfxId = 47,
+ .trainerGfxId = EVENT_OBJ_GFX_LASS,
.flags = 0x80040FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2531,9 +2531,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SHARPEDO,
.nickname = _("PEDOS"),
.trainerName = _("DEON"),
- .trainerGfxId = 38,
+ .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
.flags = 0x80020FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2560,9 +2560,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_LUVDISC,
.nickname = _("LUVIS"),
.trainerName = _("JANELLE"),
- .trainerGfxId = 10,
+ .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
.flags = 0x80010FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2589,9 +2589,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_HERACROSS,
.nickname = _("HEROSS"),
.trainerName = _("HEATH"),
- .trainerGfxId = 33,
+ .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
.flags = 0x80008FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2618,9 +2618,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ELECTRODE,
.nickname = _("RODLECT"),
.trainerName = _("SASHA"),
- .trainerGfxId = 6,
+ .trainerGfxId = EVENT_OBJ_GFX_TWIN,
.flags = 0x80004FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2647,9 +2647,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_PICHU,
.nickname = _("CHUPY"),
.trainerName = _("FRANKIE"),
- .trainerGfxId = 35,
+ .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
.flags = 0x80002FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -2676,9 +2676,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_WOBBUFFET,
.nickname = _("WOBET"),
.trainerName = _("HELEN"),
- .trainerGfxId = 16,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
.flags = 0x80001FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2705,9 +2705,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_GENGAR,
.nickname = _("GAREN"),
.trainerName = _("CAMILE"),
- .trainerGfxId = 40,
+ .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
.flags = 0xC000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2734,9 +2734,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_PORYGON,
.nickname = _("GONPOR"),
.trainerName = _("MARTIN"),
- .trainerGfxId = 46,
+ .trainerGfxId = EVENT_OBJ_GFX_SCIENTIST_1,
.flags = 0x82000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = TRUE,
@@ -2763,9 +2763,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_DRAGONITE,
.nickname = _("DRITE"),
.trainerName = _("SERGIO"),
- .trainerGfxId = 7,
+ .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
.flags = 0x21000FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2792,9 +2792,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_MEOWTH,
.nickname = _("MEOWY"),
.trainerName = _("KAILEY"),
- .trainerGfxId = 6,
+ .trainerGfxId = EVENT_OBJ_GFX_TWIN,
.flags = 0x20800FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2821,9 +2821,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_JYNX,
.nickname = _("NYX"),
.trainerName = _("PERLA"),
- .trainerGfxId = 45,
+ .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
.flags = 0x80400FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2850,9 +2850,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_TOGEPI,
.nickname = _("GEPITO"),
.trainerName = _("CLARA"),
- .trainerGfxId = 20,
+ .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
.flags = 0x10200FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2879,9 +2879,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_ESPEON,
.nickname = _("SPEON"),
.trainerName = _("JAKOB"),
- .trainerGfxId = 37,
+ .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
.flags = 0x20100FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = TRUE,
.aiPool_Cute = FALSE,
@@ -2908,9 +2908,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_SLOWKING,
.nickname = _("SLOWGO"),
.trainerName = _("TREY"),
- .trainerGfxId = 49,
+ .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
.flags = 0x8080FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = FALSE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = TRUE,
@@ -2937,9 +2937,9 @@ const struct ContestPokemon gContestOpponents[] =
.species = SPECIES_URSARING,
.nickname = _("URSING"),
.trainerName = _("LANE"),
- .trainerGfxId = 44,
+ .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
.flags = 0x40040FFF,
- .whichRank = 3,
+ .whichRank = CONTEST_RANK_MASTER,
.aiPool_Cool = TRUE,
.aiPool_Beauty = FALSE,
.aiPool_Cute = FALSE,
@@ -2967,7 +2967,7 @@ const struct ContestPokemon gContestOpponents[] =
const u8 gPostgameContestOpponentFilter[] =
{
- [CONTEST_OPPONENT_JIMMY] = CONTEST_FILTER_NONE,
+ [CONTEST_OPPONENT_JIMMY] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_EDITH] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_EVAN] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_KELSEY] = CONTEST_FILTER_NONE,
@@ -2999,7 +2999,7 @@ const u8 gPostgameContestOpponentFilter[] =
[CONTEST_OPPONENT_MORGAN] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_SUMMER] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_MILES] = CONTEST_FILTER_NONE,
- [CONTEST_OPPONENT_AUDREY] = CONTEST_FILTER_NONE,
+ [CONTEST_OPPONENT_AUDREY] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_AVERY] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_ARIANA] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_ASHTON] = CONTEST_FILTER_NONE,
@@ -3031,7 +3031,7 @@ const u8 gPostgameContestOpponentFilter[] =
[CONTEST_OPPONENT_LACEY] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_CORBIN] = CONTEST_FILTER_NONE,
[CONTEST_OPPONENT_GRACIE] = CONTEST_FILTER_ONLY_POSTGAME,
- [CONTEST_OPPONENT_COLTIN] = CONTEST_FILTER_ONLY_POSTGAME,
+ [CONTEST_OPPONENT_COLTIN] = CONTEST_FILTER_ONLY_POSTGAME,
[CONTEST_OPPONENT_ELLIE] = CONTEST_FILTER_ONLY_POSTGAME,
[CONTEST_OPPONENT_MARCUS] = CONTEST_FILTER_ONLY_POSTGAME,
[CONTEST_OPPONENT_KIARA] = CONTEST_FILTER_ONLY_POSTGAME,
@@ -3063,4 +3063,4 @@ const u8 gPostgameContestOpponentFilter[] =
[CONTEST_OPPONENT_JAKOB] = CONTEST_FILTER_ONLY_POSTGAME,
[CONTEST_OPPONENT_TREY] = CONTEST_FILTER_ONLY_POSTGAME,
[CONTEST_OPPONENT_LANE] = CONTEST_FILTER_ONLY_POSTGAME
-}; \ No newline at end of file
+};
diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h
index fa32f33b5..8375520d1 100644
--- a/src/data/contest_text_tables.h
+++ b/src/data/contest_text_tables.h
@@ -196,53 +196,53 @@ extern const u8 gText_0827E8CA[];
const u8 *const gContestEffectDescriptionPointers[] =
{
gContestEffect00hDescription,
- gContestEffect01hDescription,
+ gContestEffect01hDescription,
gContestEffect02hDescription,
- gContestEffect03hDescription,
- gContestEffect04hDescription,
- gContestEffect05hDescription,
- gContestEffect06hDescription,
- gContestEffect07hDescription,
- gContestEffect08hDescription,
- gContestEffect09hDescription,
- gContestEffect0AhDescription,
- gContestEffect0BhDescription,
- gContestEffect0ChDescription,
- gContestEffect0DhDescription,
- gContestEffect0EhDescription,
- gContestEffect0FhDescription,
- gContestEffect10hDescription,
- gContestEffect11hDescription,
- gContestEffect12hDescription,
- gContestEffect13hDescription,
- gContestEffect14hDescription,
- gContestEffect15hDescription,
- gContestEffect16hDescription,
- gContestEffect17hDescription,
- gContestEffect18hDescription,
- gContestEffect19hDescription,
- gContestEffect1AhDescription,
- gContestEffect1BhDescription,
- gContestEffect1ChDescription,
- gContestEffect1DhDescription,
- gContestEffect1EhDescription,
- gContestEffect1FhDescription,
- gContestEffect20hDescription,
- gContestEffect21hDescription,
- gContestEffect22hDescription,
- gContestEffect23hDescription,
- gContestEffect24hDescription,
- gContestEffect25hDescription,
- gContestEffect26hDescription,
- gContestEffect27hDescription,
- gContestEffect28hDescription,
- gContestEffect29hDescription,
- gContestEffect2AhDescription,
- gContestEffect2BhDescription,
- gContestEffect2ChDescription,
- gContestEffect2DhDescription,
- gContestEffect2EhDescription,
- gContestEffect2FhDescription
+ gContestEffect03hDescription,
+ gContestEffect04hDescription,
+ gContestEffect05hDescription,
+ gContestEffect06hDescription,
+ gContestEffect07hDescription,
+ gContestEffect08hDescription,
+ gContestEffect09hDescription,
+ gContestEffect0AhDescription,
+ gContestEffect0BhDescription,
+ gContestEffect0ChDescription,
+ gContestEffect0DhDescription,
+ gContestEffect0EhDescription,
+ gContestEffect0FhDescription,
+ gContestEffect10hDescription,
+ gContestEffect11hDescription,
+ gContestEffect12hDescription,
+ gContestEffect13hDescription,
+ gContestEffect14hDescription,
+ gContestEffect15hDescription,
+ gContestEffect16hDescription,
+ gContestEffect17hDescription,
+ gContestEffect18hDescription,
+ gContestEffect19hDescription,
+ gContestEffect1AhDescription,
+ gContestEffect1BhDescription,
+ gContestEffect1ChDescription,
+ gContestEffect1DhDescription,
+ gContestEffect1EhDescription,
+ gContestEffect1FhDescription,
+ gContestEffect20hDescription,
+ gContestEffect21hDescription,
+ gContestEffect22hDescription,
+ gContestEffect23hDescription,
+ gContestEffect24hDescription,
+ gContestEffect25hDescription,
+ gContestEffect26hDescription,
+ gContestEffect27hDescription,
+ gContestEffect28hDescription,
+ gContestEffect29hDescription,
+ gContestEffect2AhDescription,
+ gContestEffect2BhDescription,
+ gContestEffect2ChDescription,
+ gContestEffect2DhDescription,
+ gContestEffect2EhDescription,
+ gContestEffect2FhDescription
};
// Unreferenced array of pointers to move names.
@@ -278,18 +278,18 @@ const u8 *const gContestMoveTypeTextPointers[] =
const u8 *const gUnknown_08587D5C[] =
{
gText_0827D5C1,
- gText_0827D5DC,
- gText_0827D600,
- gText_0827D612,
- gText_0827D612,
- gText_0827D62D,
- gText_0827D654,
- gText_0827D67E,
- gText_0827D69C,
- gText_0827D6BA,
- gText_0827D6E5,
- gText_0827D706,
- gText_0827D71D
+ gText_0827D5DC,
+ gText_0827D600,
+ gText_0827D612,
+ gText_0827D612,
+ gText_0827D62D,
+ gText_0827D654,
+ gText_0827D67E,
+ gText_0827D69C,
+ gText_0827D6BA,
+ gText_0827D6E5,
+ gText_0827D706,
+ gText_0827D71D
};
const u8 *const gUnknown_08587D90[] =
@@ -411,4 +411,4 @@ const u8 *const gUnknown_08587F1C[] =
gText_0827E8B4,
gText_0827E8BF,
gText_0827E8CA
-}; \ No newline at end of file
+};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 22:59:37 +0000