summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-27 03:24:02 -0800
committerYamaArashi <shadow962@live.com>2016-01-27 03:24:02 -0800
commit49648a278a5d50fc1f2a498af31c972836b29bcd (patch)
tree385ca7641f42a6a8f059f68bf3b345621961ab33
parent10b1f13681ce4f5894ef41ad9057ab4b65e3172e (diff)
trainer class data
Diffstat
-rw-r--r--asm/rom.s20
-rw-r--r--constants/trainer_constants.s1313
-rw-r--r--data/data2.s7
-rw-r--r--data/graphics/trainers/front_pic_palette_table.s4
-rw-r--r--data/graphics/trainers/front_pic_table.s4
-rw-r--r--data/graphics/trainers/graphics.s16
-rw-r--r--data/text/trainer_class_names.s4
-rw-r--r--data/trainer_class_index_tables.s157
-rw-r--r--graphics/trainers/pokefan_f/front.png (renamed from graphics/trainers/winstrate_f/front.png)bin849 -> 849 bytes
-rw-r--r--graphics/trainers/pokefan_f/palette.pal (renamed from graphics/trainers/winstrate_f/palette.pal)0
-rw-r--r--graphics/trainers/pokefan_m/front.png (renamed from graphics/trainers/winstrate_m/front.png)bin786 -> 786 bytes
-rw-r--r--graphics/trainers/pokefan_m/palette.pal (renamed from graphics/trainers/winstrate_m/palette.pal)0
12 files changed, 400 insertions, 1125 deletions
diff --git a/asm/rom.s b/asm/rom.s
index a26388781..61a85834b 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -124024,7 +124024,7 @@ sub_803DCA8: ; 803DCA8
.align 2
_0803DCD8: .4byte gUnknown_082082E8
_0803DCDC: .4byte 0x02017000
-_0803DCE0: .4byte gUnknown_081FDDD0
+_0803DCE0: .4byte gTrainerClassToPicIndex
thumb_func_end sub_803DCA8
thumb_func_start sub_803DCE4
@@ -124054,7 +124054,7 @@ sub_803DCE4: ; 803DCE4
.align 2
_0803DD14: .4byte gUnknown_082082E8
_0803DD18: .4byte 0x02017000
-_0803DD1C: .4byte gUnknown_081FDE1D
+_0803DD1C: .4byte gTrainerClassToNameIndex
thumb_func_end sub_803DCE4
thumb_func_start sub_803DD20
@@ -634921,7 +634921,7 @@ sub_8134C74: ; 8134C74
.align 2
_08134C90: .4byte 0x02024ea4
_08134C94: .4byte 0x00000564
-_08134C98: .4byte gUnknown_081FDDD0
+_08134C98: .4byte gTrainerClassToPicIndex
_08134C9C: .4byte 0x00000499
_08134CA0:
cmp r0, 0x63
@@ -634938,7 +634938,7 @@ _08134CA0:
adds r0, r2
b _08134CD2
.align 2
-_08134CBC: .4byte gUnknown_081FDDD0
+_08134CBC: .4byte gTrainerClassToPicIndex
_08134CC0:
ldr r3, _08134CD8
ldr r2, _08134CDC
@@ -634954,7 +634954,7 @@ _08134CD2:
pop {r1}
bx r1
.align 2
-_08134CD8: .4byte gUnknown_081FDDD0
+_08134CD8: .4byte gTrainerClassToPicIndex
_08134CDC: .4byte gUnknown_08402F00
thumb_func_end sub_8134C74
@@ -634976,7 +634976,7 @@ sub_8134CE0: ; 8134CE0
.align 2
_08134CFC: .4byte 0x02024ea4
_08134D00: .4byte 0x00000564
-_08134D04: .4byte gUnknown_081FDE1D
+_08134D04: .4byte gTrainerClassToNameIndex
_08134D08: .4byte 0x00000499
_08134D0C:
cmp r0, 0x63
@@ -634992,7 +634992,7 @@ _08134D0C:
adds r0, r3
b _08134D40
.align 2
-_08134D24: .4byte gUnknown_081FDE1D
+_08134D24: .4byte gTrainerClassToNameIndex
_08134D28: .4byte gUnknown_08402F00
_08134D2C:
ldr r2, _08134D48
@@ -635010,7 +635010,7 @@ _08134D40:
pop {r1}
bx r1
.align 2
-_08134D48: .4byte gUnknown_081FDE1D
+_08134D48: .4byte gTrainerClassToNameIndex
thumb_func_end sub_8134CE0
thumb_func_start sub_8134D4C
@@ -637350,7 +637350,7 @@ sub_8135FBC: ; 8135FBC
ldrb r0, [r0]
bx lr
.align 2
-_08135FCC: .4byte gUnknown_081FDDD0
+_08135FCC: .4byte gTrainerClassToPicIndex
_08135FD0: .4byte 0x02024ea4
_08135FD4: .4byte 0x00000499
thumb_func_end sub_8135FBC
@@ -637366,7 +637366,7 @@ sub_8135FD8: ; 8135FD8
ldrb r0, [r0]
bx lr
.align 2
-_08135FE8: .4byte gUnknown_081FDE1D
+_08135FE8: .4byte gTrainerClassToNameIndex
_08135FEC: .4byte 0x02024ea4
_08135FF0: .4byte 0x00000499
thumb_func_end sub_8135FD8
diff --git a/constants/trainer_constants.s b/constants/trainer_constants.s
index 9e356ff9f..59e12db88 100644
--- a/constants/trainer_constants.s
+++ b/constants/trainer_constants.s
@@ -1,1102 +1,223 @@
- .set TRAINER_NONE, 0
- .set TRAINER_SAWYER_1, 1
- .set TRAINER_GRUNT_1, 2
- .set TRAINER_GRUNT_2, 3
- .set TRAINER_GRUNT_3, 4
- .set TRAINER_GRUNT_4, 5
- .set TRAINER_GRUNT_5, 6
- .set TRAINER_GRUNT_6, 7
- .set TRAINER_GRUNT_7, 8
- .set TRAINER_GABRIELLE_1, 9
- .set TRAINER_GRUNT_8, 10
- .set TRAINER_MARCEL, 11
- .set TRAINER_ALBERTO, 12
- .set TRAINER_ED, 13
- .set TRAINER_GRUNT_9, 14
- .set TRAINER_DECLAN, 15
- .set TRAINER_GRUNT_10, 16
- .set TRAINER_GRUNT_11, 17
- .set TRAINER_GRUNT_12, 18
- .set TRAINER_GRUNT_13, 19
- .set TRAINER_GRUNT_14, 20
- .set TRAINER_GRUNT_15, 21
- .set TRAINER_GRUNT_16, 22
- .set TRAINER_GRUNT_17, 23
- .set TRAINER_GRUNT_18, 24
- .set TRAINER_GRUNT_19, 25
- .set TRAINER_GRUNT_20, 26
- .set TRAINER_GRUNT_21, 27
- .set TRAINER_GRUNT_22, 28
- .set TRAINER_FREDRICK, 29
- .set TRAINER_MATT, 30
- .set TRAINER_ZANDER, 31
- .set TRAINER_SHELLY_1, 32
- .set TRAINER_SHELLY_2, 33
- .set TRAINER_ARCHIE, 34
- .set TRAINER_LEAH, 35
- .set TRAINER_DAISY, 36
- .set TRAINER_ROSE_1, 37
- .set TRAINER_FELIX, 38
- .set TRAINER_VIOLET, 39
- .set TRAINER_ROSE_2, 40
- .set TRAINER_ROSE_3, 41
- .set TRAINER_ROSE_4, 42
- .set TRAINER_ROSE_5, 43
- .set TRAINER_DUSTY_1, 44
- .set TRAINER_CHIP, 45
- .set TRAINER_FOSTER, 46
- .set TRAINER_DUSTY_2, 47
- .set TRAINER_DUSTY_3, 48
- .set TRAINER_DUSTY_4, 49
- .set TRAINER_DUSTY_5, 50
- .set TRAINER_GABBY_AND_TY_1, 51
- .set TRAINER_GABBY_AND_TY_2, 52
- .set TRAINER_GABBY_AND_TY_3, 53
- .set TRAINER_GABBY_AND_TY_4, 54
- .set TRAINER_GABBY_AND_TY_5, 55
- .set TRAINER_GABBY_AND_TY_6, 56
- .set TRAINER_LOLA_1, 57
- .set TRAINER_AUSTINA, 58
- .set TRAINER_GWEN, 59
- .set TRAINER_LOLA_2, 60
- .set TRAINER_LOLA_3, 61
- .set TRAINER_LOLA_4, 62
- .set TRAINER_LOLA_5, 63
- .set TRAINER_RICKY_1, 64
- .set TRAINER_SIMON, 65
- .set TRAINER_CHARLIE, 66
- .set TRAINER_RICKY_2, 67
- .set TRAINER_RICKY_3, 68
- .set TRAINER_RICKY_4, 69
- .set TRAINER_RICKY_5, 70
- .set TRAINER_RANDALL, 71
- .set TRAINER_PARKER, 72
- .set TRAINER_GEORGE, 73
- .set TRAINER_BERKE, 74
- .set TRAINER_BRAXTON, 75
- .set TRAINER_VINCENT, 76
- .set TRAINER_LEROY, 77
- .set TRAINER_WILTON_1, 78
- .set TRAINER_EDGAR, 79
- .set TRAINER_ALBERT, 80
- .set TRAINER_SAMUEL, 81
- .set TRAINER_VITO, 82
- .set TRAINER_OWEN, 83
- .set TRAINER_WILTON_2, 84
- .set TRAINER_WILTON_3, 85
- .set TRAINER_WILTON_4, 86
- .set TRAINER_WILTON_5, 87
- .set TRAINER_WARREN, 88
- .set TRAINER_MARY, 89
- .set TRAINER_ALEXIA, 90
- .set TRAINER_JODY, 91
- .set TRAINER_WENDY, 92
- .set TRAINER_KEIRA, 93
- .set TRAINER_BROOKE_1, 94
- .set TRAINER_JENNIFER, 95
- .set TRAINER_HOPE, 96
- .set TRAINER_SHANNON, 97
- .set TRAINER_MICHELLE, 98
- .set TRAINER_CAROLINE, 99
- .set TRAINER_JULIE, 100
- .set TRAINER_BROOKE_2, 101
- .set TRAINER_BROOKE_3, 102
- .set TRAINER_BROOKE_4, 103
- .set TRAINER_BROOKE_5, 104
- .set TRAINER_PATRICIA, 105
- .set TRAINER_KINDRA, 106
- .set TRAINER_TAMMY, 107
- .set TRAINER_VALERIE_1, 108
- .set TRAINER_TASHA, 109
- .set TRAINER_VALERIE_2, 110
- .set TRAINER_VALERIE_3, 111
- .set TRAINER_VALERIE_4, 112
- .set TRAINER_VALERIE_5, 113
- .set TRAINER_CINDY_1, 114
- .set TRAINER_DAPHNE, 115
- .set TRAINER_GRUNT_23, 116
- .set TRAINER_CINDY_2, 117
- .set TRAINER_BRIANNA, 118
- .set TRAINER_NAOMI, 119
- .set TRAINER_CINDY_3, 120
- .set TRAINER_CINDY_4, 121
- .set TRAINER_CINDY_5, 122
- .set TRAINER_CINDY_6, 123
- .set TRAINER_MELISSA, 124
- .set TRAINER_SHEILA, 125
- .set TRAINER_SHIRLEY, 126
- .set TRAINER_JESSICA_1, 127
- .set TRAINER_CONNIE, 128
- .set TRAINER_BRIDGET, 129
- .set TRAINER_OLIVIA, 130
- .set TRAINER_TIFFANY, 131
- .set TRAINER_JESSICA_2, 132
- .set TRAINER_JESSICA_3, 133
- .set TRAINER_JESSICA_4, 134
- .set TRAINER_JESSICA_5, 135
- .set TRAINER_WINSTON_1, 136
- .set TRAINER_MOLLIE, 137
- .set TRAINER_GARRET, 138
- .set TRAINER_WINSTON_2, 139
- .set TRAINER_WINSTON_3, 140
- .set TRAINER_WINSTON_4, 141
- .set TRAINER_WINSTON_5, 142
- .set TRAINER_STEVE_1, 143
- .set TRAINER_THALIA_1, 144
- .set TRAINER_MARK, 145
- .set TRAINER_GRUNT_24, 146
- .set TRAINER_STEVE_2, 147
- .set TRAINER_STEVE_3, 148
- .set TRAINER_STEVE_4, 149
- .set TRAINER_STEVE_5, 150
- .set TRAINER_LUIS, 151
- .set TRAINER_DOMINIK, 152
- .set TRAINER_DOUGLAS, 153
- .set TRAINER_DARRIN, 154
- .set TRAINER_TONY_1, 155
- .set TRAINER_JEROME, 156
- .set TRAINER_MATTHEW, 157
- .set TRAINER_DAVID, 158
- .set TRAINER_SPENCER, 159
- .set TRAINER_ROLAND, 160
- .set TRAINER_NOLEN, 161
- .set TRAINER_STAN, 162
- .set TRAINER_BARRY, 163
- .set TRAINER_DEAN, 164
- .set TRAINER_RODNEY, 165
- .set TRAINER_RICHARD, 166
- .set TRAINER_HERMAN, 167
- .set TRAINER_SANTIAGO, 168
- .set TRAINER_GILBERT, 169
- .set TRAINER_FRANKLIN, 170
- .set TRAINER_KEVIN, 171
- .set TRAINER_JACK, 172
- .set TRAINER_DUDLEY, 173
- .set TRAINER_CHAD, 174
- .set TRAINER_TONY_2, 175
- .set TRAINER_TONY_3, 176
- .set TRAINER_TONY_4, 177
- .set TRAINER_TONY_5, 178
- .set TRAINER_TAKAO, 179
- .set TRAINER_HITOSHI, 180
- .set TRAINER_KIYO, 181
- .set TRAINER_KOICHI, 182
- .set TRAINER_NOB_1, 183
- .set TRAINER_NOB_2, 184
- .set TRAINER_NOB_3, 185
- .set TRAINER_NOB_4, 186
- .set TRAINER_NOB_5, 187
- .set TRAINER_YUJI, 188
- .set TRAINER_DAISUKE, 189
- .set TRAINER_ATSUSHI, 190
- .set TRAINER_KIRK, 191
- .set TRAINER_GRUNT_25, 192
- .set TRAINER_GRUNT_26, 193
- .set TRAINER_SHAWN, 194
- .set TRAINER_FERNANDO_1, 195
- .set TRAINER_DALTON_1, 196
- .set TRAINER_DALTON_2, 197
- .set TRAINER_DALTON_3, 198
- .set TRAINER_DALTON_4, 199
- .set TRAINER_DALTON_5, 200
- .set TRAINER_COLE, 201
- .set TRAINER_JEFF, 202
- .set TRAINER_AXLE, 203
- .set TRAINER_JACE, 204
- .set TRAINER_KEEGAN, 205
- .set TRAINER_BERNIE_1, 206
- .set TRAINER_BERNIE_2, 207
- .set TRAINER_BERNIE_3, 208
- .set TRAINER_BERNIE_4, 209
- .set TRAINER_BERNIE_5, 210
- .set TRAINER_DREW, 211
- .set TRAINER_BEAU, 212
- .set TRAINER_LARRY, 213
- .set TRAINER_SHANE, 214
- .set TRAINER_JUSTIN, 215
- .set TRAINER_ETHAN_1, 216
- .set TRAINER_AUTUMN, 217
- .set TRAINER_TRAVIS, 218
- .set TRAINER_ETHAN_2, 219
- .set TRAINER_ETHAN_3, 220
- .set TRAINER_ETHAN_4, 221
- .set TRAINER_ETHAN_5, 222
- .set TRAINER_BRENT, 223
- .set TRAINER_DONALD, 224
- .set TRAINER_TAYLOR, 225
- .set TRAINER_JEFFREY_1, 226
- .set TRAINER_DEREK, 227
- .set TRAINER_JEFFREY_2, 228
- .set TRAINER_JEFFREY_3, 229
- .set TRAINER_JEFFREY_4, 230
- .set TRAINER_JEFFREY_5, 231
- .set TRAINER_EDWARD, 232
- .set TRAINER_PRESTON, 233
- .set TRAINER_VIRGIL, 234
- .set TRAINER_BLAKE, 235
- .set TRAINER_WILLIAM, 236
- .set TRAINER_JOSHUA, 237
- .set TRAINER_CAMERON_1, 238
- .set TRAINER_CAMERON_2, 239
- .set TRAINER_CAMERON_3, 240
- .set TRAINER_CAMERON_4, 241
- .set TRAINER_CAMERON_5, 242
- .set TRAINER_JACLYN, 243
- .set TRAINER_HANNAH, 244
- .set TRAINER_SAMANTHA, 245
- .set TRAINER_MAURA, 246
- .set TRAINER_KAYLA, 247
- .set TRAINER_ALEXIS, 248
- .set TRAINER_JACKI_1, 249
- .set TRAINER_JACKI_2, 250
- .set TRAINER_JACKI_3, 251
- .set TRAINER_JACKI_4, 252
- .set TRAINER_JACKI_5, 253
- .set TRAINER_WALTER_1, 254
- .set TRAINER_MICAH, 255
- .set TRAINER_THOMAS, 256
- .set TRAINER_WALTER_2, 257
- .set TRAINER_WALTER_3, 258
- .set TRAINER_WALTER_4, 259
- .set TRAINER_WALTER_5, 260
- .set TRAINER_SIDNEY, 261
- .set TRAINER_PHOEBE, 262
- .set TRAINER_GLACIA, 263
- .set TRAINER_DRAKE, 264
- .set TRAINER_ROXANNE_1, 265
- .set TRAINER_BRAWLY_1, 266
- .set TRAINER_WATTSON_1, 267
- .set TRAINER_FLANNERY_1, 268
- .set TRAINER_NORMAN_1, 269
- .set TRAINER_WINONA_1, 270
- .set TRAINER_TATE_AND_LIZA_1, 271
- .set TRAINER_JUAN_1, 272
- .set TRAINER_JERRY_1, 273
- .set TRAINER_TED, 274
- .set TRAINER_PAUL, 275
- .set TRAINER_JERRY_2, 276
- .set TRAINER_JERRY_3, 277
- .set TRAINER_JERRY_4, 278
- .set TRAINER_JERRY_5, 279
- .set TRAINER_KAREN_1, 280
- .set TRAINER_GEORGIA, 281
- .set TRAINER_KAREN_2, 282
- .set TRAINER_KAREN_3, 283
- .set TRAINER_KAREN_4, 284
- .set TRAINER_KAREN_5, 285
- .set TRAINER_KATE_AND_JOY, 286
- .set TRAINER_ANNA_AND_MEG_1, 287
- .set TRAINER_ANNA_AND_MEG_2, 288
- .set TRAINER_ANNA_AND_MEG_3, 289
- .set TRAINER_ANNA_AND_MEG_4, 290
- .set TRAINER_ANNA_AND_MEG_5, 291
- .set TRAINER_VICTOR, 292
- .set TRAINER_MIGUEL_1, 293
- .set TRAINER_COLTON, 294
- .set TRAINER_MIGUEL_2, 295
- .set TRAINER_MIGUEL_3, 296
- .set TRAINER_MIGUEL_4, 297
- .set TRAINER_MIGUEL_5, 298
- .set TRAINER_VICTORIA, 299
- .set TRAINER_VANESSA, 300
- .set TRAINER_BETHANY, 301
- .set TRAINER_ISABEL_1, 302
- .set TRAINER_ISABEL_2, 303
- .set TRAINER_ISABEL_3, 304
- .set TRAINER_ISABEL_4, 305
- .set TRAINER_ISABEL_5, 306
- .set TRAINER_TIMOTHY_1, 307
- .set TRAINER_TIMOTHY_2, 308
- .set TRAINER_TIMOTHY_3, 309
- .set TRAINER_TIMOTHY_4, 310
- .set TRAINER_TIMOTHY_5, 311
- .set TRAINER_VICKY, 312
- .set TRAINER_SHELBY_1, 313
- .set TRAINER_SHELBY_2, 314
- .set TRAINER_SHELBY_3, 315
- .set TRAINER_SHELBY_4, 316
- .set TRAINER_SHELBY_5, 317
- .set TRAINER_CALVIN_1, 318
- .set TRAINER_BILLY, 319
- .set TRAINER_JOSH, 320
- .set TRAINER_TOMMY, 321
- .set TRAINER_JOEY, 322
- .set TRAINER_BEN, 323
- .set TRAINER_QUINCY, 324
- .set TRAINER_KATELYNN, 325
- .set TRAINER_JAYLEN, 326
- .set TRAINER_DILLON, 327
- .set TRAINER_CALVIN_2, 328
- .set TRAINER_CALVIN_3, 329
- .set TRAINER_CALVIN_4, 330
- .set TRAINER_CALVIN_5, 331
- .set TRAINER_EDDIE, 332
- .set TRAINER_ALLEN, 333
- .set TRAINER_TIMMY, 334
- .set TRAINER_WALLACE, 335
- .set TRAINER_ANDREW, 336
- .set TRAINER_IVAN, 337
- .set TRAINER_CLAUDE, 338
- .set TRAINER_ELLIOT_1, 339
- .set TRAINER_NED, 340
- .set TRAINER_DALE, 341
- .set TRAINER_NOLAN, 342
- .set TRAINER_BARNY, 343
- .set TRAINER_WADE, 344
- .set TRAINER_CARTER, 345
- .set TRAINER_ELLIOT_2, 346
- .set TRAINER_ELLIOT_3, 347
- .set TRAINER_ELLIOT_4, 348
- .set TRAINER_ELLIOT_5, 349
- .set TRAINER_RONALD, 350
- .set TRAINER_JACOB, 351
- .set TRAINER_ANTHONY, 352
- .set TRAINER_BENJAMIN_1, 353
- .set TRAINER_BENJAMIN_2, 354
- .set TRAINER_BENJAMIN_3, 355
- .set TRAINER_BENJAMIN_4, 356
- .set TRAINER_BENJAMIN_5, 357
- .set TRAINER_ABIGAIL_1, 358
- .set TRAINER_JASMINE, 359
- .set TRAINER_ABIGAIL_2, 360
- .set TRAINER_ABIGAIL_3, 361
- .set TRAINER_ABIGAIL_4, 362
- .set TRAINER_ABIGAIL_5, 363
- .set TRAINER_DYLAN_1, 364
- .set TRAINER_DYLAN_2, 365
- .set TRAINER_DYLAN_3, 366
- .set TRAINER_DYLAN_4, 367
- .set TRAINER_DYLAN_5, 368
- .set TRAINER_MARIA_1, 369
- .set TRAINER_MARIA_2, 370
- .set TRAINER_MARIA_3, 371
- .set TRAINER_MARIA_4, 372
- .set TRAINER_MARIA_5, 373
- .set TRAINER_CAMDEN, 374
- .set TRAINER_DEMETRIUS, 375
- .set TRAINER_ISAIAH_1, 376
- .set TRAINER_PABLO_1, 377
- .set TRAINER_CHASE, 378
- .set TRAINER_ISAIAH_2, 379
- .set TRAINER_ISAIAH_3, 380
- .set TRAINER_ISAIAH_4, 381
- .set TRAINER_ISAIAH_5, 382
- .set TRAINER_ISOBEL, 383
- .set TRAINER_DONNY, 384
- .set TRAINER_TALIA, 385
- .set TRAINER_KATELYN_1, 386
- .set TRAINER_ALLISON, 387
- .set TRAINER_KATELYN_2, 388
- .set TRAINER_KATELYN_3, 389
- .set TRAINER_KATELYN_4, 390
- .set TRAINER_KATELYN_5, 391
- .set TRAINER_NICOLAS_1, 392
- .set TRAINER_NICOLAS_2, 393
- .set TRAINER_NICOLAS_3, 394
- .set TRAINER_NICOLAS_4, 395
- .set TRAINER_NICOLAS_5, 396
- .set TRAINER_AARON, 397
- .set TRAINER_PERRY, 398
- .set TRAINER_HUGH, 399
- .set TRAINER_PHIL, 400
- .set TRAINER_JARED, 401
- .set TRAINER_HUMBERTO, 402
- .set TRAINER_PRESLEY, 403
- .set TRAINER_EDWARDO, 404
- .set TRAINER_COLIN, 405
- .set TRAINER_ROBERT_1, 406
- .set TRAINER_BENNY, 407
- .set TRAINER_CHESTER, 408
- .set TRAINER_ROBERT_2, 409
- .set TRAINER_ROBERT_3, 410
- .set TRAINER_ROBERT_4, 411
- .set TRAINER_ROBERT_5, 412
- .set TRAINER_ALEX, 413
- .set TRAINER_BECK, 414
- .set TRAINER_YASU, 415
- .set TRAINER_TAKASHI, 416
- .set TRAINER_DIANNE, 417
- .set TRAINER_JANI, 418
- .set TRAINER_LAO_1, 419
- .set TRAINER_LUNG, 420
- .set TRAINER_LAO_2, 421
- .set TRAINER_LAO_3, 422
- .set TRAINER_LAO_4, 423
- .set TRAINER_LAO_5, 424
- .set TRAINER_JOCELYN, 425
- .set TRAINER_LAURA, 426
- .set TRAINER_CYNDY_1, 427
- .set TRAINER_CORA, 428
- .set TRAINER_PAULA, 429
- .set TRAINER_CYNDY_2, 430
- .set TRAINER_CYNDY_3, 431
- .set TRAINER_CYNDY_4, 432
- .set TRAINER_CYNDY_5, 433
- .set TRAINER_MADELINE_1, 434
- .set TRAINER_CLARISSA, 435
- .set TRAINER_ANGELICA, 436
- .set TRAINER_MADELINE_2, 437
- .set TRAINER_MADELINE_3, 438
- .set TRAINER_MADELINE_4, 439
- .set TRAINER_MADELINE_5, 440
- .set TRAINER_BEVERLY, 441
- .set TRAINER_IMANI, 442
- .set TRAINER_KYLA, 443
- .set TRAINER_DENISE, 444
- .set TRAINER_BETH, 445
- .set TRAINER_TARA, 446
- .set TRAINER_MISSY, 447
- .set TRAINER_ALICE, 448
- .set TRAINER_JENNY_1, 449
- .set TRAINER_GRACE, 450
- .set TRAINER_TANYA, 451
- .set TRAINER_SHARON, 452
- .set TRAINER_NIKKI, 453
- .set TRAINER_BRENDA, 454
- .set TRAINER_KATIE, 455
- .set TRAINER_SUSIE, 456
- .set TRAINER_KARA, 457
- .set TRAINER_DANA, 458
- .set TRAINER_SIENNA, 459
- .set TRAINER_DEBRA, 460
- .set TRAINER_LINDA, 461
- .set TRAINER_KAYLEE, 462
- .set TRAINER_LAUREL, 463
- .set TRAINER_CARLEE, 464
- .set TRAINER_JENNY_2, 465
- .set TRAINER_JENNY_3, 466
- .set TRAINER_JENNY_4, 467
- .set TRAINER_JENNY_5, 468
- .set TRAINER_HEIDI, 469
- .set TRAINER_BECKY, 470
- .set TRAINER_CAROL, 471
- .set TRAINER_NANCY, 472
- .set TRAINER_MARTHA, 473
- .set TRAINER_DIANA_1, 474
- .set TRAINER_CEDRIC, 475
- .set TRAINER_IRENE, 476
- .set TRAINER_DIANA_2, 477
- .set TRAINER_DIANA_3, 478
- .set TRAINER_DIANA_4, 479
- .set TRAINER_DIANA_5, 480
- .set TRAINER_AMY_AND_LIV_1, 481
- .set TRAINER_AMY_AND_LIV_2, 482
- .set TRAINER_GINA_AND_MIA_1, 483
- .set TRAINER_MIU_AND_YUKI, 484
- .set TRAINER_AMY_AND_LIV_3, 485
- .set TRAINER_GINA_AND_MIA_2, 486
- .set TRAINER_AMY_AND_LIV_4, 487
- .set TRAINER_AMY_AND_LIV_5, 488
- .set TRAINER_AMY_AND_LIV_6, 489
- .set TRAINER_HUEY, 490
- .set TRAINER_EDMOND, 491
- .set TRAINER_ERNEST_1, 492
- .set TRAINER_DWAYNE, 493
- .set TRAINER_PHILLIP, 494
- .set TRAINER_LEONARD, 495
- .set TRAINER_DUNCAN, 496
- .set TRAINER_ERNEST_2, 497
- .set TRAINER_ERNEST_3, 498
- .set TRAINER_ERNEST_4, 499
- .set TRAINER_ERNEST_5, 500
- .set TRAINER_ELI, 501
- .set TRAINER_ANNIKA, 502
- .set TRAINER_JAZMYN, 503
- .set TRAINER_JONAS, 504
- .set TRAINER_KAYLEY, 505
- .set TRAINER_AURON, 506
- .set TRAINER_KELVIN, 507
- .set TRAINER_MARLEY, 508
- .set TRAINER_REYNA, 509
- .set TRAINER_HUDSON, 510
- .set TRAINER_CONOR, 511
- .set TRAINER_EDWIN_1, 512
- .set TRAINER_HECTOR, 513
- .set TRAINER_TABITHA_1, 514
- .set TRAINER_EDWIN_2, 515
- .set TRAINER_EDWIN_3, 516
- .set TRAINER_EDWIN_4, 517
- .set TRAINER_EDWIN_5, 518
- .set TRAINER_WALLY_1, 519
- .set TRAINER_BRENDAN_1, 520
- .set TRAINER_BRENDAN_2, 521
- .set TRAINER_BRENDAN_3, 522
- .set TRAINER_BRENDAN_4, 523
- .set TRAINER_BRENDAN_5, 524
- .set TRAINER_BRENDAN_6, 525
- .set TRAINER_BRENDAN_7, 526
- .set TRAINER_BRENDAN_8, 527
- .set TRAINER_BRENDAN_9, 528
- .set TRAINER_MAY_1, 529
- .set TRAINER_MAY_2, 530
- .set TRAINER_MAY_3, 531
- .set TRAINER_MAY_4, 532
- .set TRAINER_MAY_5, 533
- .set TRAINER_MAY_6, 534
- .set TRAINER_MAY_7, 535
- .set TRAINER_MAY_8, 536
- .set TRAINER_MAY_9, 537
- .set TRAINER_ISAAC_1, 538
- .set TRAINER_DAVIS, 539
- .set TRAINER_MITCHELL, 540
- .set TRAINER_ISAAC_2, 541
- .set TRAINER_ISAAC_3, 542
- .set TRAINER_ISAAC_4, 543
- .set TRAINER_ISAAC_5, 544
- .set TRAINER_LYDIA_1, 545
- .set TRAINER_HALLE, 546
- .set TRAINER_GARRISON, 547
- .set TRAINER_LYDIA_2, 548
- .set TRAINER_LYDIA_3, 549
- .set TRAINER_LYDIA_4, 550
- .set TRAINER_LYDIA_5, 551
- .set TRAINER_JACKSON_1, 552
- .set TRAINER_LORENZO, 553
- .set TRAINER_SEBASTIAN, 554
- .set TRAINER_JACKSON_2, 555
- .set TRAINER_JACKSON_3, 556
- .set TRAINER_JACKSON_4, 557
- .set TRAINER_JACKSON_5, 558
- .set TRAINER_CATHERINE_1, 559
- .set TRAINER_JENNA, 560
- .set TRAINER_SOPHIA, 561
- .set TRAINER_CATHERINE_2, 562
- .set TRAINER_CATHERINE_3, 563
- .set TRAINER_CATHERINE_4, 564
- .set TRAINER_CATHERINE_5, 565
- .set TRAINER_JULIO, 566
- .set TRAINER_GRUNT_27, 567
- .set TRAINER_GRUNT_28, 568
- .set TRAINER_GRUNT_29, 569
- .set TRAINER_GRUNT_30, 570
- .set TRAINER_MARC, 571
- .set TRAINER_BRENDEN, 572
- .set TRAINER_LILITH, 573
- .set TRAINER_CRISTIAN, 574
- .set TRAINER_SYLVIA, 575
- .set TRAINER_LEONARDO, 576
- .set TRAINER_ATHENA, 577
- .set TRAINER_HARRISON, 578
- .set TRAINER_GRUNT_31, 579
- .set TRAINER_CLARENCE, 580
- .set TRAINER_TERRY, 581
- .set TRAINER_NATE, 582
- .set TRAINER_KATHLEEN, 583
- .set TRAINER_CLIFFORD, 584
- .set TRAINER_NICHOLAS, 585
- .set TRAINER_GRUNT_32, 586
- .set TRAINER_GRUNT_33, 587
- .set TRAINER_GRUNT_34, 588
- .set TRAINER_GRUNT_35, 589
- .set TRAINER_GRUNT_36, 590
- .set TRAINER_MACEY, 591
- .set TRAINER_BRENDAN_10, 592
- .set TRAINER_BRENDAN_11, 593
- .set TRAINER_PAXTON, 594
- .set TRAINER_ISABELLA, 595
- .set TRAINER_GRUNT_37, 596
- .set TRAINER_TABITHA_2, 597
- .set TRAINER_JONATHAN, 598
- .set TRAINER_BRENDAN_12, 599
- .set TRAINER_MAY_10, 600
- .set TRAINER_MAXIE_1, 601
- .set TRAINER_MAXIE_2, 602
- .set TRAINER_TIANA, 603
- .set TRAINER_HALEY_1, 604
- .set TRAINER_JANICE, 605
- .set TRAINER_VIVI, 606
- .set TRAINER_HALEY_2, 607
- .set TRAINER_HALEY_3, 608
- .set TRAINER_HALEY_4, 609
- .set TRAINER_HALEY_5, 610
- .set TRAINER_SALLY, 611
- .set TRAINER_ROBIN, 612
- .set TRAINER_ANDREA, 613
- .set TRAINER_CRISSY, 614
- .set TRAINER_RICK, 615
- .set TRAINER_LYLE, 616
- .set TRAINER_JOSE, 617
- .set TRAINER_DOUG, 618
- .set TRAINER_GREG, 619
- .set TRAINER_KENT, 620
- .set TRAINER_JAMES_1, 621
- .set TRAINER_JAMES_2, 622
- .set TRAINER_JAMES_3, 623
- .set TRAINER_JAMES_4, 624
- .set TRAINER_JAMES_5, 625
- .set TRAINER_BRICE, 626
- .set TRAINER_TRENT_1, 627
- .set TRAINER_LENNY, 628
- .set TRAINER_LUCAS_1, 629
- .set TRAINER_ALAN, 630
- .set TRAINER_CLARK, 631
- .set TRAINER_ERIC, 632
- .set TRAINER_LUCAS_2, 633
- .set TRAINER_MIKE_1, 634
- .set TRAINER_MIKE_2, 635
- .set TRAINER_TRENT_2, 636
- .set TRAINER_TRENT_3, 637
- .set TRAINER_TRENT_4, 638
- .set TRAINER_TRENT_5, 639
- .set TRAINER_DEZ_AND_LUKE, 640
- .set TRAINER_LEA_AND_JED, 641
- .set TRAINER_KIRA_AND_DAN_1, 642
- .set TRAINER_KIRA_AND_DAN_2, 643
- .set TRAINER_KIRA_AND_DAN_3, 644
- .set TRAINER_KIRA_AND_DAN_4, 645
- .set TRAINER_KIRA_AND_DAN_5, 646
- .set TRAINER_JOHANNA, 647
- .set TRAINER_GERALD, 648
- .set TRAINER_VIVIAN, 649
- .set TRAINER_DANIELLE, 650
- .set TRAINER_HIDEO, 651
- .set TRAINER_KEIGO, 652
- .set TRAINER_RILEY, 653
- .set TRAINER_FLINT, 654
- .set TRAINER_ASHLEY, 655
- .set TRAINER_WALLY_2, 656
- .set TRAINER_WALLY_3, 657
- .set TRAINER_WALLY_4, 658
- .set TRAINER_WALLY_5, 659
- .set TRAINER_WALLY_6, 660
- .set TRAINER_BRENDAN_13, 661
- .set TRAINER_BRENDAN_14, 662
- .set TRAINER_BRENDAN_15, 663
- .set TRAINER_MAY_11, 664
- .set TRAINER_MAY_12, 665
- .set TRAINER_MAY_13, 666
- .set TRAINER_JONAH, 667
- .set TRAINER_HENRY, 668
- .set TRAINER_ROGER, 669
- .set TRAINER_ALEXA, 670
- .set TRAINER_RUBEN, 671
- .set TRAINER_KOJI_1, 672
- .set TRAINER_WAYNE, 673
- .set TRAINER_AIDAN, 674
- .set TRAINER_REED, 675
- .set TRAINER_TISHA, 676
- .set TRAINER_TORI_AND_TIA, 677
- .set TRAINER_KIM_AND_IRIS, 678
- .set TRAINER_TYRA_AND_IVY, 679
- .set TRAINER_MEL_AND_PAUL, 680
- .set TRAINER_JOHN_AND_JAY_1, 681
- .set TRAINER_JOHN_AND_JAY_2, 682
- .set TRAINER_JOHN_AND_JAY_3, 683
- .set TRAINER_JOHN_AND_JAY_4, 684
- .set TRAINER_JOHN_AND_JAY_5, 685
- .set TRAINER_RELI_AND_IAN, 686
- .set TRAINER_LILA_AND_ROY_1, 687
- .set TRAINER_LILA_AND_ROY_2, 688
- .set TRAINER_LILA_AND_ROY_3, 689
- .set TRAINER_LILA_AND_ROY_4, 690
- .set TRAINER_LILA_AND_ROY_5, 691
- .set TRAINER_LISA_AND_RAY, 692
- .set TRAINER_CHRIS, 693
- .set TRAINER_DAWSON, 694
- .set TRAINER_SARAH, 695
- .set TRAINER_DARIAN, 696
- .set TRAINER_HAILEY, 697
- .set TRAINER_CHANDLER, 698
- .set TRAINER_KALEB, 699
- .set TRAINER_JOSEPH, 700
- .set TRAINER_ALYSSA, 701
- .set TRAINER_MARCOS, 702
- .set TRAINER_RHETT, 703
- .set TRAINER_TYRON, 704
- .set TRAINER_CELINA, 705
- .set TRAINER_BIANCA, 706
- .set TRAINER_HAYDEN, 707
- .set TRAINER_SOPHIE, 708
- .set TRAINER_COBY, 709
- .set TRAINER_LAWRENCE, 710
- .set TRAINER_WYATT, 711
- .set TRAINER_ANGELINA, 712
- .set TRAINER_KAI, 713
- .set TRAINER_CHARLOTTE, 714
- .set TRAINER_DEANDRE, 715
- .set TRAINER_GRUNT_38, 716
- .set TRAINER_GRUNT_39, 717
- .set TRAINER_GRUNT_40, 718
- .set TRAINER_GRUNT_41, 719
- .set TRAINER_GRUNT_42, 720
- .set TRAINER_GRUNT_43, 721
- .set TRAINER_GRUNT_44, 722
- .set TRAINER_GRUNT_45, 723
- .set TRAINER_GRUNT_46, 724
- .set TRAINER_GRUNT_47, 725
- .set TRAINER_GRUNT_48, 726
- .set TRAINER_GRUNT_49, 727
- .set TRAINER_GRUNT_50, 728
- .set TRAINER_GRUNT_51, 729
- .set TRAINER_GRUNT_52, 730
- .set TRAINER_GRUNT_53, 731
- .set TRAINER_TABITHA_3, 732
- .set TRAINER_DARCY, 733
- .set TRAINER_MAXIE_3, 734
- .set TRAINER_PETE, 735
- .set TRAINER_ISABELLE, 736
- .set TRAINER_ANDRES_1, 737
- .set TRAINER_JOSUE, 738
- .set TRAINER_CAMRON, 739
- .set TRAINER_CORY_1, 740
- .set TRAINER_CAROLINA, 741
- .set TRAINER_ELIJAH, 742
- .set TRAINER_CELIA, 743
- .set TRAINER_BRYAN, 744
- .set TRAINER_BRANDEN, 745
- .set TRAINER_BRYANT, 746
- .set TRAINER_SHAYLA, 747
- .set TRAINER_KYRA, 748
- .set TRAINER_JAIDEN, 749
- .set TRAINER_ALIX, 750
- .set TRAINER_HELENE, 751
- .set TRAINER_MARLENE, 752
- .set TRAINER_DEVAN, 753
- .set TRAINER_JOHNSON, 754
- .set TRAINER_MELINA, 755
- .set TRAINER_BRANDI, 756
- .set TRAINER_AISHA, 757
- .set TRAINER_MAKAYLA, 758
- .set TRAINER_FABIAN, 759
- .set TRAINER_DAYTON, 760
- .set TRAINER_RACHEL, 761
- .set TRAINER_LEONEL, 762
- .set TRAINER_CALLIE, 763
- .set TRAINER_CALE, 764
- .set TRAINER_MYLES, 765
- .set TRAINER_PAT, 766
- .set TRAINER_CRISTIN_1, 767
- .set TRAINER_MAY_14, 768
- .set TRAINER_MAY_15, 769
- .set TRAINER_ROXANNE_2, 770
- .set TRAINER_ROXANNE_3, 771
- .set TRAINER_ROXANNE_4, 772
- .set TRAINER_ROXANNE_5, 773
- .set TRAINER_BRAWLY_2, 774
- .set TRAINER_BRAWLY_3, 775
- .set TRAINER_BRAWLY_4, 776
- .set TRAINER_BRAWLY_5, 777
- .set TRAINER_WATTSON_2, 778
- .set TRAINER_WATTSON_3, 779
- .set TRAINER_WATTSON_4, 780
- .set TRAINER_WATTSON_5, 781
- .set TRAINER_FLANNERY_2, 782
- .set TRAINER_FLANNERY_3, 783
- .set TRAINER_FLANNERY_4, 784
- .set TRAINER_FLANNERY_5, 785
- .set TRAINER_NORMAN_2, 786
- .set TRAINER_NORMAN_3, 787
- .set TRAINER_NORMAN_4, 788
- .set TRAINER_NORMAN_5, 789
- .set TRAINER_WINONA_2, 790
- .set TRAINER_WINONA_3, 791
- .set TRAINER_WINONA_4, 792
- .set TRAINER_WINONA_5, 793
- .set TRAINER_TATE_AND_LIZA_2, 794
- .set TRAINER_TATE_AND_LIZA_3, 795
- .set TRAINER_TATE_AND_LIZA_4, 796
- .set TRAINER_TATE_AND_LIZA_5, 797
- .set TRAINER_JUAN_2, 798
- .set TRAINER_JUAN_3, 799
- .set TRAINER_JUAN_4, 800
- .set TRAINER_JUAN_5, 801
- .set TRAINER_ANGELO, 802
- .set TRAINER_DARIUS, 803
- .set TRAINER_STEVEN, 804
- .set TRAINER_ANABEL, 805
- .set TRAINER_TUCKER, 806
- .set TRAINER_SPENSER, 807
- .set TRAINER_GRETA, 808
- .set TRAINER_NOLAND, 809
- .set TRAINER_LUCY, 810
- .set TRAINER_BRANDON, 811
- .set TRAINER_ANDRES_2, 812
- .set TRAINER_ANDRES_3, 813
- .set TRAINER_ANDRES_4, 814
- .set TRAINER_ANDRES_5, 815
- .set TRAINER_CORY_2, 816
- .set TRAINER_CORY_3, 817
- .set TRAINER_CORY_4, 818
- .set TRAINER_CORY_5, 819
- .set TRAINER_PABLO_2, 820
- .set TRAINER_PABLO_3, 821
- .set TRAINER_PABLO_4, 822
- .set TRAINER_PABLO_5, 823
- .set TRAINER_KOJI_2, 824
- .set TRAINER_KOJI_3, 825
- .set TRAINER_KOJI_4, 826
- .set TRAINER_KOJI_5, 827
- .set TRAINER_CRISTIN_2, 828
- .set TRAINER_CRISTIN_3, 829
- .set TRAINER_CRISTIN_4, 830
- .set TRAINER_CRISTIN_5, 831
- .set TRAINER_FERNANDO_2, 832
- .set TRAINER_FERNANDO_3, 833
- .set TRAINER_FERNANDO_4, 834
- .set TRAINER_FERNANDO_5, 835
- .set TRAINER_SAWYER_2, 836
- .set TRAINER_SAWYER_3, 837
- .set TRAINER_SAWYER_4, 838
- .set TRAINER_SAWYER_5, 839
- .set TRAINER_GABRIELLE_2, 840
- .set TRAINER_GABRIELLE_3, 841
- .set TRAINER_GABRIELLE_4, 842
- .set TRAINER_GABRIELLE_5, 843
- .set TRAINER_THALIA_2, 844
- .set TRAINER_THALIA_3, 845
- .set TRAINER_THALIA_4, 846
- .set TRAINER_THALIA_5, 847
- .set TRAINER_MARIELA, 848
- .set TRAINER_ALVARO, 849
- .set TRAINER_EVERETT, 850
- .set TRAINER_RED, 851
- .set TRAINER_LEAF, 852
- .set TRAINER_BRENDAN_16, 853
- .set TRAINER_MAY_16, 854
+ .set TRAINER_CLASS_AQUA_LEADER, 0
+ .set TRAINER_CLASS_TEAM_AQUA_M, 1
+ .set TRAINER_CLASS_TEAM_AQUA_F, 2
+ .set TRAINER_CLASS_AROMA_LADY, 3
+ .set TRAINER_CLASS_RUIN_MANIAC, 4
+ .set TRAINER_CLASS_INTERVIEWER, 5
+ .set TRAINER_CLASS_TUBER_F, 6
+ .set TRAINER_CLASS_TUBER_M, 7
+ .set TRAINER_CLASS_COOL_TRAINER_M, 8
+ .set TRAINER_CLASS_COOL_TRAINER_F, 9
+ .set TRAINER_CLASS_HEX_MANIAC, 10
+ .set TRAINER_CLASS_LADY, 11
+ .set TRAINER_CLASS_BEAUTY, 12
+ .set TRAINER_CLASS_RICH_BOY, 13
+ .set TRAINER_CLASS_POKEMANIAC, 14
+ .set TRAINER_CLASS_SWIMMER_M, 15
+ .set TRAINER_CLASS_BLACK_BELT, 16
+ .set TRAINER_CLASS_GUITARIST, 17
+ .set TRAINER_CLASS_KINDLER, 18
+ .set TRAINER_CLASS_CAMPER, 19
+ .set TRAINER_CLASS_BUG_MANIAC, 20
+ .set TRAINER_CLASS_PSYCHIC_M, 21
+ .set TRAINER_CLASS_PSYCHIC_F, 22
+ .set TRAINER_CLASS_GENTLEMAN, 23
+ .set TRAINER_CLASS_ELITE_FOUR_M, 24
+ .set TRAINER_CLASS_ELITE_FOUR_F, 25
+ .set TRAINER_CLASS_LEADER_F, 26
+ .set TRAINER_CLASS_LEADER_M, 27
+ .set TRAINER_CLASS_LEADER_MF, 28
+ .set TRAINER_CLASS_SCHOOL_KID_M, 29
+ .set TRAINER_CLASS_SCHOOL_KID_F, 30
+ .set TRAINER_CLASS_SR_AND_JR, 31
+ .set TRAINER_CLASS_POKEFAN_M, 32
+ .set TRAINER_CLASS_POKEFAN_F, 33
+ .set TRAINER_CLASS_EXPERT_M, 34
+ .set TRAINER_CLASS_EXPERT_F, 35
+ .set TRAINER_CLASS_YOUNGSTER, 36
+ .set TRAINER_CLASS_CHAMPION, 37
+ .set TRAINER_CLASS_FISHERMAN, 38
+ .set TRAINER_CLASS_CYCLING_TRIATHLETE_M, 39
+ .set TRAINER_CLASS_CYCLING_TRIATHLETE_F, 40
+ .set TRAINER_CLASS_RUNNING_TRIATHLETE_M, 41
+ .set TRAINER_CLASS_RUNNING_TRIATHLETE_F, 42
+ .set TRAINER_CLASS_SWIMMING_TRIATHLETE_M, 43
+ .set TRAINER_CLASS_SWIMMING_TRIATHLETE_F, 44
+ .set TRAINER_CLASS_DRAGON_TAMER, 45
+ .set TRAINER_CLASS_BIRD_KEEPER, 46
+ .set TRAINER_CLASS_NINJA_BOY, 47
+ .set TRAINER_CLASS_BATTLE_GIRL, 48
+ .set TRAINER_CLASS_PARASOL_LADY, 49
+ .set TRAINER_CLASS_SWIMMER_F, 50
+ .set TRAINER_CLASS_PICNICKER, 51
+ .set TRAINER_CLASS_TWINS, 52
+ .set TRAINER_CLASS_SAILOR, 53
+ .set TRAINER_CLASS_BOARDER_1, 54
+ .set TRAINER_CLASS_BOARDER_2, 55
+ .set TRAINER_CLASS_COLLECTOR, 56
+ .set TRAINER_CLASS_WALLY, 57
+ .set TRAINER_CLASS_BRENDAN_1, 58
+ .set TRAINER_CLASS_BRENDAN_2, 59
+ .set TRAINER_CLASS_BRENDAN_3, 60
+ .set TRAINER_CLASS_MAY_1, 61
+ .set TRAINER_CLASS_MAY_2, 62
+ .set TRAINER_CLASS_MAY_3, 63
+ .set TRAINER_CLASS_POKEMON_BREEDER_M, 64
+ .set TRAINER_CLASS_POKEMON_BREEDER_F, 65
+ .set TRAINER_CLASS_POKEMON_RANGER_M, 66
+ .set TRAINER_CLASS_POKEMON_RANGER_F, 67
+ .set TRAINER_CLASS_MAGMA_LEADER, 68
+ .set TRAINER_CLASS_TEAM_MAGMA_M, 69
+ .set TRAINER_CLASS_TEAM_MAGMA_F, 70
+ .set TRAINER_CLASS_LASS, 71
+ .set TRAINER_CLASS_BUG_CATCHER, 72
+ .set TRAINER_CLASS_HIKER, 73
+ .set TRAINER_CLASS_YOUNG_COUPLE, 74
+ .set TRAINER_CLASS_OLD_COUPLE, 75
+ .set TRAINER_CLASS_SIS_AND_BRO, 76
- .set TRAINER_PIC_HIKER, 0
- .set TRAINER_PIC_AQUA_GRUNT_M, 1
- .set TRAINER_PIC_POKEMON_BREEDER_F, 2
- .set TRAINER_PIC_COOL_TRAINER_M, 3
- .set TRAINER_PIC_BIRD_KEEPER, 4
- .set TRAINER_PIC_COLLECTOR, 5
- .set TRAINER_PIC_AQUA_GRUNT_F, 6
- .set TRAINER_PIC_SWIMMER_M, 7
- .set TRAINER_PIC_MAGMA_GRUNT_M, 8
- .set TRAINER_PIC_EXPERT_M, 9
- .set TRAINER_PIC_AQUA_ADMIN_M, 10
- .set TRAINER_PIC_BLACK_BELT, 11
- .set TRAINER_PIC_AQUA_ADMIN_F, 12
- .set TRAINER_PIC_AQUA_LEADER_ARCHIE, 13
- .set TRAINER_PIC_HEX_MANIAC, 14
- .set TRAINER_PIC_AROMA_LADY, 15
- .set TRAINER_PIC_RUIN_MANIAC, 16
- .set TRAINER_PIC_INTERVIEWER, 17
- .set TRAINER_PIC_TUBER_F, 18
- .set TRAINER_PIC_TUBER_M, 19
- .set TRAINER_PIC_COOL_TRAINER_F, 20
- .set TRAINER_PIC_LADY, 21
- .set TRAINER_PIC_BEAUTY, 22
- .set TRAINER_PIC_RICH_BOY, 23
- .set TRAINER_PIC_EXPERT_F, 24
- .set TRAINER_PIC_POKEMANIAC, 25
- .set TRAINER_PIC_MAGMA_GRUNT_F, 26
+ .set TRAINER_PIC_BRENDAN, 0
+ .set TRAINER_PIC_MAY, 1
+ .set TRAINER_PIC_LASS, 2
+ .set TRAINER_PIC_YOUNGSTER, 3
+ .set TRAINER_PIC_HIKER, 4
+ .set TRAINER_PIC_BEAUTY, 5
+ .set TRAINER_PIC_FISHERMAN, 6
+ .set TRAINER_PIC_LADY, 7
+ .set TRAINER_PIC_CYCLING_TRIATHLETE_M, 8
+ .set TRAINER_PIC_AQUA_GRUNT_M, 9
+ .set TRAINER_PIC_TWINS, 10
+ .set TRAINER_PIC_SWIMMER_F, 11
+ .set TRAINER_PIC_BUG_CATCHER, 12
+ .set TRAINER_PIC_SCHOOL_KID_M, 13
+ .set TRAINER_PIC_RICH_BOY, 14
+ .set TRAINER_PIC_SR_AND_JR, 15
+ .set TRAINER_PIC_BLACK_BELT, 16
+ .set TRAINER_PIC_WALLY, 17
+ .set TRAINER_PIC_AQUA_GRUNT_F, 18
+ .set TRAINER_PIC_TUBER_F, 19
+ .set TRAINER_PIC_HEX_MANIAC, 20
+ .set TRAINER_PIC_POKEMON_BREEDER_F, 21
+ .set TRAINER_PIC_MAGMA_GRUNT_M, 22
+ .set TRAINER_PIC_MAGMA_GRUNT_F, 23
+ .set TRAINER_PIC_INTERVIEWER, 24
+ .set TRAINER_PIC_TUBER_M, 25
+ .set TRAINER_PIC_YOUNG_COUPLE, 26
.set TRAINER_PIC_GUITARIST, 27
- .set TRAINER_PIC_KINDLER, 28
- .set TRAINER_PIC_CAMPER, 29
- .set TRAINER_PIC_PICNICKER, 30
- .set TRAINER_PIC_BUG_MANIAC, 31
- .set TRAINER_PIC_POKEMON_BREEDER_M, 32
- .set TRAINER_PIC_PSYCHIC_M, 33
- .set TRAINER_PIC_PSYCHIC_F, 34
- .set TRAINER_PIC_GENTLEMAN, 35
- .set TRAINER_PIC_ELITE_FOUR_SIDNEY, 36
- .set TRAINER_PIC_ELITE_FOUR_PHOEBE, 37
- .set TRAINER_PIC_ELITE_FOUR_GLACIA, 38
- .set TRAINER_PIC_ELITE_FOUR_DRAKE, 39
- .set TRAINER_PIC_LEADER_ROXANNE, 40
- .set TRAINER_PIC_LEADER_BRAWLY, 41
- .set TRAINER_PIC_LEADER_WATTSON, 42
- .set TRAINER_PIC_LEADER_FLANNERY, 43
- .set TRAINER_PIC_LEADER_NORMAN, 44
- .set TRAINER_PIC_LEADER_WINONA, 45
- .set TRAINER_PIC_LEADER_TATE_AND_LIZA, 46
- .set TRAINER_PIC_LEADER_JUAN, 47
- .set TRAINER_PIC_SCHOOL_KID_M, 48
- .set TRAINER_PIC_SCHOOL_KID_F, 49
- .set TRAINER_PIC_SR_AND_JR, 50
- .set TRAINER_PIC_WINSTRATE_M, 51
- .set TRAINER_PIC_WINSTRATE_F, 52
- .set TRAINER_PIC_YOUNGSTER, 53
- .set TRAINER_PIC_CHAMPION_WALLACE, 54
- .set TRAINER_PIC_FISHERMAN, 55
- .set TRAINER_PIC_CYCLING_TRIATHLETE_M, 56
- .set TRAINER_PIC_CYCLING_TRIATHLETE_F, 57
- .set TRAINER_PIC_RUNNING_TRIATHLETE_M, 58
- .set TRAINER_PIC_RUNNING_TRIATHLETE_F, 59
- .set TRAINER_PIC_SWIMMING_TRIATHLETE_M, 60
- .set TRAINER_PIC_SWIMMING_TRIATHLETE_F, 61
- .set TRAINER_PIC_DRAGON_TAMER, 62
- .set TRAINER_PIC_NINJA_BOY, 63
- .set TRAINER_PIC_BATTLE_GIRL, 64
- .set TRAINER_PIC_PARASOL_LADY, 65
- .set TRAINER_PIC_SWIMMER_F, 66
- .set TRAINER_PIC_TWINS, 67
- .set TRAINER_PIC_SAILOR, 68
- .set TRAINER_PIC_MAGMA_ADMIN, 69
- .set TRAINER_PIC_WALLY, 70
- .set TRAINER_PIC_BRENDAN, 71
- .set TRAINER_PIC_MAY, 72
- .set TRAINER_PIC_BUG_CATCHER, 73
- .set TRAINER_PIC_POKEMON_RANGER_M, 74
- .set TRAINER_PIC_POKEMON_RANGER_F, 75
- .set TRAINER_PIC_MAGMA_LEADER_MAXIE, 76
- .set TRAINER_PIC_LASS, 77
- .set TRAINER_PIC_YOUNG_COUPLE, 78
- .set TRAINER_PIC_OLD_COUPLE, 79
- .set TRAINER_PIC_SIS_AND_BRO, 80
- .set TRAINER_PIC_STEVEN, 81
- .set TRAINER_PIC_SALON_MAIDEN_ANABEL, 82
- .set TRAINER_PIC_DOME_ACE_TUCKER, 83
- .set TRAINER_PIC_PALACE_MAVEN_SPENSER, 84
- .set TRAINER_PIC_ARENA_TYCOON_GRETA, 85
- .set TRAINER_PIC_FACTORY_HEAD_NOLAND, 86
- .set TRAINER_PIC_PIKE_QUEEN_LUCY, 87
- .set TRAINER_PIC_PYRAMID_KING_BRANDON, 88
- .set TRAINER_PIC_RED, 89
- .set TRAINER_PIC_LEAF, 90
- .set TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, 91
- .set TRAINER_PIC_RUBY_SAPPHIRE_MAY, 92
+ .set TRAINER_PIC_GENTLEMAN, 28
+ .set TRAINER_PIC_STEVEN, 29
+ .set TRAINER_PIC_MAXIE, 30
+ .set TRAINER_PIC_RUNNING_TRIATHLETE_F, 31
+ .set TRAINER_PIC_RUNNING_TRIATHLETE_M, 32
+ .set TRAINER_PIC_BATTLE_GIRL, 33
+ .set TRAINER_PIC_CYCLING_TRIATHLETE_F, 34
+ .set TRAINER_PIC_SWIMMER_M, 35
+ .set TRAINER_PIC_POKEFAN_F, 36
+ .set TRAINER_PIC_EXPERT_M, 37
+ .set TRAINER_PIC_EXPERT_F, 38
+ .set TRAINER_PIC_SWIMMING_TRIATHLETE_M, 39
+ .set TRAINER_PIC_SWIMMING_TRIATHLETE_F, 40
+ .set TRAINER_PIC_DRAGON_TAMER, 41
+ .set TRAINER_PIC_BIRD_KEEPER, 42
+ .set TRAINER_PIC_NINJA_BOY, 43
+ .set TRAINER_PIC_PARASOL_LADY, 44
+ .set TRAINER_PIC_BUG_MANIAC, 45
+ .set TRAINER_PIC_SAILOR, 46
+ .set TRAINER_PIC_COLLECTOR, 47
+ .set TRAINER_PIC_POKEMON_BREEDER_M, 48
+ .set TRAINER_PIC_POKEMON_RANGER_M, 49
+ .set TRAINER_PIC_POKEMON_RANGER_F, 50
+ .set TRAINER_PIC_MAGMA_ADMIN_M, 51
+ .set TRAINER_PIC_MAGMA_ADMIN_F, 52
+ .set TRAINER_PIC_AROMA_LADY, 53
+ .set TRAINER_PIC_RUIN_MANIAC, 54
+ .set TRAINER_PIC_COOL_TRAINER_M, 55
+ .set TRAINER_PIC_COOL_TRAINER_F, 56
+ .set TRAINER_PIC_POKEMANIAC, 57
+ .set TRAINER_PIC_KINDLER, 58
+ .set TRAINER_PIC_CAMPER, 59
+ .set TRAINER_PIC_PICNICKER, 60
+ .set TRAINER_PIC_PSYCHIC_M, 61
+ .set TRAINER_PIC_PSYCHIC_F, 62
+ .set TRAINER_PIC_SCHOOL_KID_F, 63
+ .set TRAINER_PIC_POKEFAN_M, 64
+ .set TRAINER_PIC_SIS_AND_BRO, 65
+ .set TRAINER_PIC_OLD_COUPLE, 66
+ .set TRAINER_PIC_AQUA_ADMIN_M, 67
+ .set TRAINER_PIC_AQUA_ADMIN_F, 68
+ .set TRAINER_PIC_UNUSED_AQUA, 69
+ .set TRAINER_PIC_ARCHIE, 70
+ .set TRAINER_PIC_ROXANNE, 71
+ .set TRAINER_PIC_BRAWLY, 72
+ .set TRAINER_PIC_WATTSON, 73
+ .set TRAINER_PIC_FLANNERY, 74
+ .set TRAINER_PIC_NORMAN, 75
+ .set TRAINER_PIC_WINONA, 76
+ .set TRAINER_PIC_TATE_AND_LIZA, 77
+ .set TRAINER_PIC_WALLACE, 78
+ .set TRAINER_PIC_SIDNEY, 79
+ .set TRAINER_PIC_PHOEBE, 80
+ .set TRAINER_PIC_GLACIA, 81
+ .set TRAINER_PIC_DRAKE, 82
- .set TRAINER_CLASS_HIKER, 0x0
- .set TRAINER_CLASS_TEAM_AQUA_1, 0x1
- .set TRAINER_CLASS_PKMN_BREEDER_1, 0x2
- .set TRAINER_CLASS_COOLTRAINER_1, 0x3
- .set TRAINER_CLASS_BIRD_KEEPER, 0x4
- .set TRAINER_CLASS_COLLECTOR, 0x5
- .set TRAINER_CLASS_TEAM_AQUA_2, 0x6
- .set TRAINER_CLASS_SWIMMER_M, 0x7
- .set TRAINER_CLASS_TEAM_MAGMA_1, 0x8
- .set TRAINER_CLASS_EXPERT_1, 0x9
- .set TRAINER_CLASS_BLACK_BELT, 0xa
- .set TRAINER_CLASS_AQUA_LEADER, 0xb
- .set TRAINER_CLASS_HEX_MANIAC, 0xc
- .set TRAINER_CLASS_AROMA_LADY, 0xd
- .set TRAINER_CLASS_RUIN_MANIAC, 0xe
- .set TRAINER_CLASS_INTERVIEWER, 0xf
- .set TRAINER_CLASS_TUBER_1, 0x10
- .set TRAINER_CLASS_TUBER_2, 0x11
- .set TRAINER_CLASS_COOLTRAINER_2, 0x12
- .set TRAINER_CLASS_LADY, 0x13
- .set TRAINER_CLASS_BEAUTY, 0x14
- .set TRAINER_CLASS_RICH_BOY, 0x15
- .set TRAINER_CLASS_EXPERT_2, 0x16
- .set TRAINER_CLASS_POKEMANIAC, 0x17
- .set TRAINER_CLASS_TEAM_MAGMA_2, 0x18
- .set TRAINER_CLASS_GUITARIST, 0x19
- .set TRAINER_CLASS_KINDLER, 0x1a
- .set TRAINER_CLASS_CAMPER, 0x1b
- .set TRAINER_CLASS_PICNICKER, 0x1c
- .set TRAINER_CLASS_BUG_MANIAC, 0x1d
- .set TRAINER_CLASS_PSYCHIC_1, 0x1e
- .set TRAINER_CLASS_PSYCHIC_2, 0x1f
- .set TRAINER_CLASS_GENTLEMAN, 0x20
- .set TRAINER_CLASS_ELITE_FOUR_1, 0x21
- .set TRAINER_CLASS_ELITE_FOUR_2, 0x22
- .set TRAINER_CLASS_LEADER_1, 0x23
- .set TRAINER_CLASS_LEADER_2, 0x24
- .set TRAINER_CLASS_LEADER_3, 0x25
- .set TRAINER_CLASS_SCHOOL_KID_1, 0x26
- .set TRAINER_CLASS_SCHOOL_KID_2, 0x27
- .set TRAINER_CLASS_SR_AND_JR, 0x28
- .set TRAINER_CLASS_POKEFAN_1, 0x29
- .set TRAINER_CLASS_POKEFAN_2, 0x2a
- .set TRAINER_CLASS_YOUNGSTER, 0x2b
- .set TRAINER_CLASS_CHAMPION, 0x2c
- .set TRAINER_CLASS_FISHERMAN, 0x2d
- .set TRAINER_CLASS_TRIATHLETE_1, 0x2e
- .set TRAINER_CLASS_TRIATHLETE_2, 0x2f
- .set TRAINER_CLASS_TRIATHLETE_3, 0x30
- .set TRAINER_CLASS_TRIATHLETE_4, 0x31
- .set TRAINER_CLASS_TRIATHLETE_5, 0x32
- .set TRAINER_CLASS_TRIATHLETE_6, 0x33
- .set TRAINER_CLASS_DRAGON_TAMER, 0x34
- .set TRAINER_CLASS_NINJA_BOY, 0x35
- .set TRAINER_CLASS_BATTLE_GIRL, 0x36
- .set TRAINER_CLASS_PARASOL_LADY, 0x37
- .set TRAINER_CLASS_SWIMMER_F, 0x38
- .set TRAINER_CLASS_TWINS, 0x39
- .set TRAINER_CLASS_SAILOR, 0x3a
- .set TRAINER_CLASS_PKMN_TRAINER_1, 0x3b
- .set TRAINER_CLASS_PKMN_TRAINER_2, 0x3c
- .set TRAINER_CLASS_PKMN_TRAINER_3, 0x3d
- .set TRAINER_CLASS_PKMN_TRAINER_4, 0x3e
- .set TRAINER_CLASS_PKMN_TRAINER_5, 0x3f
- .set TRAINER_CLASS_PKMN_TRAINER_6, 0x40
- .set TRAINER_CLASS_PKMN_TRAINER_7, 0x41
- .set TRAINER_CLASS_PKMN_BREEDER_2, 0x42
- .set TRAINER_CLASS_BUG_CATCHER, 0x43
- .set TRAINER_CLASS_PKMN_RANGER_1, 0x44
- .set TRAINER_CLASS_PKMN_RANGER_2, 0x45
- .set TRAINER_CLASS_MAGMA_LEADER, 0x46
- .set TRAINER_CLASS_LASS, 0x47
- .set TRAINER_CLASS_YOUNG_COUPLE, 0x48
- .set TRAINER_CLASS_OLD_COUPLE, 0x49
- .set TRAINER_CLASS_SIS_AND_BRO, 0x4a
- .set TRAINER_CLASS_PKMN_TRAINER_8, 0x4b
- .set TRAINER_CLASS_SALON_MAIDEN, 0x4c
- .set TRAINER_CLASS_DOME_ACE, 0x4d
- .set TRAINER_CLASS_PKMN_TRAINER_9, 0x4e
- .set TRAINER_CLASS_PKMN_TRAINER_10, 0x4f
- .set TRAINER_CLASS_PKMN_TRAINER_11, 0x50
- .set TRAINER_CLASS_PKMN_TRAINER_12, 0x51
-
- .set TRAINER_CLASS_NAME_PKMN_TRAINER_1, 0x0
- .set TRAINER_CLASS_NAME_PKMN_TRAINER_2, 0x1
- .set TRAINER_CLASS_NAME_HIKER, 0x2
- .set TRAINER_CLASS_NAME_TEAM_AQUA, 0x3
- .set TRAINER_CLASS_NAME_PKMN_BREEDER, 0x4
- .set TRAINER_CLASS_NAME_COOLTRAINER_1, 0x5
- .set TRAINER_CLASS_NAME_BIRD_KEEPER, 0x6
- .set TRAINER_CLASS_NAME_COLLECTOR, 0x7
- .set TRAINER_CLASS_NAME_SWIMMER_M, 0x8
- .set TRAINER_CLASS_NAME_TEAM_MAGMA, 0x9
- .set TRAINER_CLASS_NAME_EXPERT, 0xa
- .set TRAINER_CLASS_NAME_AQUA_ADMIN, 0xb
- .set TRAINER_CLASS_NAME_BLACK_BELT, 0xc
- .set TRAINER_CLASS_NAME_AQUA_LEADER, 0xd
- .set TRAINER_CLASS_NAME_HEX_MANIAC, 0xe
- .set TRAINER_CLASS_NAME_AROMA_LADY, 0xf
- .set TRAINER_CLASS_NAME_RUIN_MANIAC, 0x10
- .set TRAINER_CLASS_NAME_INTERVIEWER, 0x11
- .set TRAINER_CLASS_NAME_TUBER_1, 0x12
- .set TRAINER_CLASS_NAME_TUBER_2, 0x13
- .set TRAINER_CLASS_NAME_LADY, 0x14
- .set TRAINER_CLASS_NAME_BEAUTY, 0x15
- .set TRAINER_CLASS_NAME_RICH_BOY, 0x16
- .set TRAINER_CLASS_NAME_POKEMANIAC, 0x17
- .set TRAINER_CLASS_NAME_GUITARIST, 0x18
- .set TRAINER_CLASS_NAME_KINDLER, 0x19
- .set TRAINER_CLASS_NAME_CAMPER, 0x1a
- .set TRAINER_CLASS_NAME_PICNICKER, 0x1b
- .set TRAINER_CLASS_NAME_BUG_MANIAC, 0x1c
- .set TRAINER_CLASS_NAME_PSYCHIC, 0x1d
- .set TRAINER_CLASS_NAME_GENTLEMAN, 0x1e
- .set TRAINER_CLASS_NAME_ELITE_FOUR, 0x1f
- .set TRAINER_CLASS_NAME_LEADER, 0x20
- .set TRAINER_CLASS_NAME_SCHOOL_KID, 0x21
- .set TRAINER_CLASS_NAME_SR_AND_JR, 0x22
- .set TRAINER_CLASS_NAME_WINSTRATE, 0x23
- .set TRAINER_CLASS_NAME_POKEFAN, 0x24
- .set TRAINER_CLASS_NAME_YOUNGSTER, 0x25
- .set TRAINER_CLASS_NAME_CHAMPION, 0x26
- .set TRAINER_CLASS_NAME_FISHERMAN, 0x27
- .set TRAINER_CLASS_NAME_TRIATHLETE, 0x28
- .set TRAINER_CLASS_NAME_DRAGON_TAMER, 0x29
- .set TRAINER_CLASS_NAME_NINJA_BOY, 0x2a
- .set TRAINER_CLASS_NAME_BATTLE_GIRL, 0x2b
- .set TRAINER_CLASS_NAME_PARASOL_LADY, 0x2c
- .set TRAINER_CLASS_NAME_SWIMMER_F, 0x2d
- .set TRAINER_CLASS_NAME_TWINS, 0x2e
- .set TRAINER_CLASS_NAME_SAILOR, 0x2f
- .set TRAINER_CLASS_NAME_COOLTRAINER_2, 0x30
- .set TRAINER_CLASS_NAME_MAGMA_ADMIN, 0x31
- .set TRAINER_CLASS_NAME_PKMN_TRAINER_3, 0x32
- .set TRAINER_CLASS_NAME_BUG_CATCHER, 0x33
- .set TRAINER_CLASS_NAME_PKMN_RANGER, 0x34
- .set TRAINER_CLASS_NAME_MAGMA_LEADER, 0x35
- .set TRAINER_CLASS_NAME_LASS, 0x36
- .set TRAINER_CLASS_NAME_YOUNG_COUPLE, 0x37
- .set TRAINER_CLASS_NAME_OLD_COUPLE, 0x38
- .set TRAINER_CLASS_NAME_SIS_AND_BRO, 0x39
- .set TRAINER_CLASS_NAME_SALON_MAIDEN, 0x3a
- .set TRAINER_CLASS_NAME_DOME_ACE, 0x3b
- .set TRAINER_CLASS_NAME_PALACE_MAVEN, 0x3c
- .set TRAINER_CLASS_NAME_ARENA_TYCOON, 0x3d
- .set TRAINER_CLASS_NAME_FACTORY_HEAD, 0x3e
- .set TRAINER_CLASS_NAME_PIKE_QUEEN, 0x3f
- .set TRAINER_CLASS_NAME_PYRAMID_KING, 0x40
- .set TRAINER_CLASS_NAME_PKMN_TRAINER_4, 0x41
+ .set TRAINER_CLASS_NAME_POKEMON_TRAINER_1, 0
+ .set TRAINER_CLASS_NAME_POKEMON_TRAINER_2, 1
+ .set TRAINER_CLASS_NAME_AQUA_LEADER, 2
+ .set TRAINER_CLASS_NAME_TEAM_AQUA, 3
+ .set TRAINER_CLASS_NAME_AQUA_ADMIN, 4
+ .set TRAINER_CLASS_NAME_AROMA_LADY, 5
+ .set TRAINER_CLASS_NAME_RUIN_MANIAC, 6
+ .set TRAINER_CLASS_NAME_INTERVIEWER, 7
+ .set TRAINER_CLASS_NAME_TUBER_F, 8
+ .set TRAINER_CLASS_NAME_TUBER_M, 9
+ .set TRAINER_CLASS_NAME_COOL_TRAINER, 10
+ .set TRAINER_CLASS_NAME_HEX_MANIAC, 11
+ .set TRAINER_CLASS_NAME_LADY, 12
+ .set TRAINER_CLASS_NAME_BEAUTY, 13
+ .set TRAINER_CLASS_NAME_RICH_BOY, 14
+ .set TRAINER_CLASS_NAME_POKEMANIAC, 15
+ .set TRAINER_CLASS_NAME_SWIMMER_M, 16
+ .set TRAINER_CLASS_NAME_BLACK_BELT, 17
+ .set TRAINER_CLASS_NAME_GUITARIST, 18
+ .set TRAINER_CLASS_NAME_KINDLER, 19
+ .set TRAINER_CLASS_NAME_CAMPER, 20
+ .set TRAINER_CLASS_NAME_BUG_MANIAC, 21
+ .set TRAINER_CLASS_NAME_PSYCHIC, 22
+ .set TRAINER_CLASS_NAME_GENTLEMAN, 23
+ .set TRAINER_CLASS_NAME_ELITE_FOUR, 24
+ .set TRAINER_CLASS_NAME_LEADER, 25
+ .set TRAINER_CLASS_NAME_SCHOOL_KID, 26
+ .set TRAINER_CLASS_NAME_SR_AND_JR, 27
+ .set TRAINER_CLASS_NAME_WINSTRATE, 28
+ .set TRAINER_CLASS_NAME_POKEFAN, 29
+ .set TRAINER_CLASS_NAME_EXPERT, 30
+ .set TRAINER_CLASS_NAME_YOUNGSTER, 31
+ .set TRAINER_CLASS_NAME_CHAMPION, 32
+ .set TRAINER_CLASS_NAME_FISHERMAN, 33
+ .set TRAINER_CLASS_NAME_TRIATHLETE, 34
+ .set TRAINER_CLASS_NAME_DRAGON_TAMER, 35
+ .set TRAINER_CLASS_NAME_BIRD_KEEPER, 36
+ .set TRAINER_CLASS_NAME_NINJA_BOY, 37
+ .set TRAINER_CLASS_NAME_BATTLE_GIRL, 38
+ .set TRAINER_CLASS_NAME_PARASOL_LADY, 39
+ .set TRAINER_CLASS_NAME_SWIMMER_F, 40
+ .set TRAINER_CLASS_NAME_PICNICKER, 41
+ .set TRAINER_CLASS_NAME_TWINS, 42
+ .set TRAINER_CLASS_NAME_SAILOR, 43
+ .set TRAINER_CLASS_NAME_BOARDER, 44
+ .set TRAINER_CLASS_NAME_COLLECTOR, 45
+ .set TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 46
+ .set TRAINER_CLASS_NAME_POKEMON_BREEDER, 47
+ .set TRAINER_CLASS_NAME_POKEMON_RANGER, 48
+ .set TRAINER_CLASS_NAME_MAGMA_LEADER, 49
+ .set TRAINER_CLASS_NAME_TEAM_MAGMA, 50
+ .set TRAINER_CLASS_NAME_MAGMA_ADMIN, 51
+ .set TRAINER_CLASS_NAME_LASS, 52
+ .set TRAINER_CLASS_NAME_BUG_CATCHER, 53
+ .set TRAINER_CLASS_NAME_HIKER, 54
+ .set TRAINER_CLASS_NAME_YOUNG_COUPLE, 55
+ .set TRAINER_CLASS_NAME_OLD_COUPLE, 56
+ .set TRAINER_CLASS_NAME_SIS_AND_BRO, 57
.set TRAINER_ENCOUNTER_MUSIC_MALE, 0 ; standard male encounter music
.set TRAINER_ENCOUNTER_MUSIC_FEMALE, 1 ; standard female encounter music
diff --git a/data/data2.s b/data/data2.s
index e7ffa7f28..06f57bf7b 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -635,11 +635,8 @@ gUnknown_081FC1D0: ; 81FC1D0
; 81FD0F0
.include "data/tm_hm_learnsets.s"
-gUnknown_081FDDD0: ; 81FDDD0
- .incbin "baserom.gba", 0x001fddd0, 0x4d
-
-gUnknown_081FDE1D: ; 81FDE1D
- .incbin "baserom.gba", 0x001fde1d, 0x4d
+; 81FDDD0
+ .include "data/trainer_class_index_tables.s"
gUnknown_081FDE6A: ; 81FDE6A
.incbin "baserom.gba", 0x001fde6a, 0x10e
diff --git a/data/graphics/trainers/front_pic_palette_table.s b/data/graphics/trainers/front_pic_palette_table.s
index 8a8ed2eac..c8dae1c75 100644
--- a/data/graphics/trainers/front_pic_palette_table.s
+++ b/data/graphics/trainers/front_pic_palette_table.s
@@ -37,7 +37,7 @@ gTrainerFrontPicPaletteTable: ; 81EC7D4
obj_pal gTrainerPalette_BattleGirl, 33
obj_pal gTrainerPalette_CyclingTriathleteF, 34
obj_pal gTrainerPalette_SwimmerM, 35
- obj_pal gTrainerPalette_WinstrateF, 36
+ obj_pal gTrainerPalette_PokefanF, 36
obj_pal gTrainerPalette_ExpertM, 37
obj_pal gTrainerPalette_ExpertF, 38
obj_pal gTrainerPalette_SwimmingTriathleteM, 39
@@ -65,7 +65,7 @@ gTrainerFrontPicPaletteTable: ; 81EC7D4
obj_pal gTrainerPalette_PsychicM, 61
obj_pal gTrainerPalette_PsychicF, 62
obj_pal gTrainerPalette_SchoolKidF, 63
- obj_pal gTrainerPalette_WinstrateM, 64
+ obj_pal gTrainerPalette_PokefanM, 64
obj_pal gTrainerPalette_SisAndBro, 65
obj_pal gTrainerPalette_OldCouple, 66
obj_pal gTrainerPalette_AquaAdminM, 67
diff --git a/data/graphics/trainers/front_pic_table.s b/data/graphics/trainers/front_pic_table.s
index e91a072dd..03c9ef3e3 100644
--- a/data/graphics/trainers/front_pic_table.s
+++ b/data/graphics/trainers/front_pic_table.s
@@ -37,7 +37,7 @@ gTrainerFrontPicTable: ; 81EC53C
obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 33
obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 34
obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 35
- obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 36
+ obj_tiles gTrainerFrontPic_PokefanF, 0x800, 36
obj_tiles gTrainerFrontPic_ExpertM, 0x800, 37
obj_tiles gTrainerFrontPic_ExpertF, 0x800, 38
obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 39
@@ -65,7 +65,7 @@ gTrainerFrontPicTable: ; 81EC53C
obj_tiles gTrainerFrontPic_PsychicM, 0x800, 61
obj_tiles gTrainerFrontPic_PsychicF, 0x800, 62
obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 63
- obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 64
+ obj_tiles gTrainerFrontPic_PokefanM, 0x1000, 64
obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 65
obj_tiles gTrainerFrontPic_OldCouple, 0x800, 66
obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 67
diff --git a/data/graphics/trainers/graphics.s b/data/graphics/trainers/graphics.s
index 43fdce762..b33194e10 100644
--- a/data/graphics/trainers/graphics.s
+++ b/data/graphics/trainers/graphics.s
@@ -180,8 +180,8 @@ gTrainerFrontPic_SwimmerM: ; 8E500C8
.align 2
-gTrainerFrontPic_WinstrateF: ; 8E50388
- .incbin "graphics/trainers/winstrate_f/front.4bpp.lz"
+gTrainerFrontPic_PokefanF: ; 8E50388
+ .incbin "graphics/trainers/pokefan_f/front.4bpp.lz"
.align 2
@@ -320,8 +320,8 @@ gTrainerFrontPic_SchoolKidF: ; 8E55CE4
.align 2
-gTrainerFrontPic_WinstrateM: ; 8E55F80
- .incbin "graphics/trainers/winstrate_m/front.4bpp.lz"
+gTrainerFrontPic_PokefanM: ; 8E55F80
+ .incbin "graphics/trainers/pokefan_m/front.4bpp.lz"
.align 2
@@ -550,8 +550,8 @@ gTrainerPalette_SwimmerM: ; 8E5A550
.align 2
-gTrainerPalette_WinstrateF: ; 8E5A578
- .incbin "graphics/trainers/winstrate_f/palette.gbapal.lz"
+gTrainerPalette_PokefanF: ; 8E5A578
+ .incbin "graphics/trainers/pokefan_f/palette.gbapal.lz"
.align 2
@@ -690,8 +690,8 @@ gTrainerPalette_SchoolKidF: ; 8E5A9B0
.align 2
-gTrainerPalette_WinstrateM: ; 8E5A9D8
- .incbin "graphics/trainers/winstrate_m/palette.gbapal.lz"
+gTrainerPalette_PokefanM: ; 8E5A9D8
+ .incbin "graphics/trainers/pokefan_m/palette.gbapal.lz"
.align 2
diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.s
index 68f8545b3..bec24bcf5 100644
--- a/data/text/trainer_class_names.s
+++ b/data/text/trainer_class_names.s
@@ -7,8 +7,8 @@ gTrainerClassNames: ; 81F0208
.charmapstr "AROMA LADY$", 13
.charmapstr "RUIN MANIAC$", 13
.charmapstr "INTERVIEWER$", 13
- .charmapstr "TUBER$", 13
- .charmapstr "TUBER$", 13
+ .charmapstr "TUBER$", 13 ; うきわガール (Inner Tube Girl) in Japanese
+ .charmapstr "TUBER$", 13 ; うきわボーイ (Inner Tube Boy) in Japanese
.charmapstr "COOLTRAINER$", 13
.charmapstr "HEX MANIAC$", 13
.charmapstr "LADY$", 13
diff --git a/data/trainer_class_index_tables.s b/data/trainer_class_index_tables.s
new file mode 100644
index 000000000..f0edf1226
--- /dev/null
+++ b/data/trainer_class_index_tables.s
@@ -0,0 +1,157 @@
+gTrainerClassToPicIndex: ; 81FDDD0
+ .byte TRAINER_PIC_ARCHIE ; AQUA_LEADER
+ .byte TRAINER_PIC_AQUA_GRUNT_M ; TEAM_AQUA_M
+ .byte TRAINER_PIC_AQUA_GRUNT_F ; TEAM_AQUA_F
+ .byte TRAINER_PIC_AROMA_LADY ; AROMA_LADY
+ .byte TRAINER_PIC_RUIN_MANIAC ; RUIN_MANIAC
+ .byte TRAINER_PIC_INTERVIEWER ; INTERVIEWER
+ .byte TRAINER_PIC_TUBER_F ; TUBER_F
+ .byte TRAINER_PIC_TUBER_M ; TUBER_M
+ .byte TRAINER_PIC_COOL_TRAINER_M ; COOL_TRAINER_M
+ .byte TRAINER_PIC_COOL_TRAINER_F ; COOL_TRAINER_F
+ .byte TRAINER_PIC_HEX_MANIAC ; HEX_MANIAC
+ .byte TRAINER_PIC_LADY ; LADY
+ .byte TRAINER_PIC_BEAUTY ; BEAUTY
+ .byte TRAINER_PIC_RICH_BOY ; RICH_BOY
+ .byte TRAINER_PIC_POKEMANIAC ; POKEMANIAC
+ .byte TRAINER_PIC_SWIMMER_M ; SWIMMER_M
+ .byte TRAINER_PIC_BLACK_BELT ; BLACK_BELT
+ .byte TRAINER_PIC_GUITARIST ; GUITARIST
+ .byte TRAINER_PIC_KINDLER ; KINDLER
+ .byte TRAINER_PIC_CAMPER ; CAMPER
+ .byte TRAINER_PIC_BUG_MANIAC ; BUG_MANIAC
+ .byte TRAINER_PIC_PSYCHIC_M ; PSYCHIC_M
+ .byte TRAINER_PIC_PSYCHIC_F ; PSYCHIC_F
+ .byte TRAINER_PIC_GENTLEMAN ; GENTLEMAN
+ .byte TRAINER_PIC_SIDNEY ; ELITE_FOUR_M
+ .byte TRAINER_PIC_PHOEBE ; ELITE_FOUR_F
+ .byte TRAINER_PIC_ROXANNE ; LEADER_F
+ .byte TRAINER_PIC_BRAWLY ; LEADER_M
+ .byte TRAINER_PIC_TATE_AND_LIZA ; LEADER_MF
+ .byte TRAINER_PIC_SCHOOL_KID_M ; SCHOOL_KID_M
+ .byte TRAINER_PIC_SCHOOL_KID_F ; SCHOOL_KID_F
+ .byte TRAINER_PIC_SR_AND_JR ; SR_AND_JR
+ .byte TRAINER_PIC_POKEFAN_M ; POKEFAN_M
+ .byte TRAINER_PIC_POKEFAN_F ; POKEFAN_F
+ .byte TRAINER_PIC_EXPERT_M ; EXPERT_M
+ .byte TRAINER_PIC_EXPERT_F ; EXPERT_F
+ .byte TRAINER_PIC_YOUNGSTER ; YOUNGSTER
+ .byte TRAINER_PIC_STEVEN ; CHAMPION
+ .byte TRAINER_PIC_FISHERMAN ; FISHERMAN
+ .byte TRAINER_PIC_CYCLING_TRIATHLETE_M ; CYCLING_TRIATHLETE_M
+ .byte TRAINER_PIC_CYCLING_TRIATHLETE_F ; CYCLING_TRIATHLETE_F
+ .byte TRAINER_PIC_RUNNING_TRIATHLETE_M ; RUNNING_TRIATHLETE_M
+ .byte TRAINER_PIC_RUNNING_TRIATHLETE_F ; RUNNING_TRIATHLETE_F
+ .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M ; SWIMMING_TRIATHLETE_M
+ .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F ; SWIMMING_TRIATHLETE_F
+ .byte TRAINER_PIC_DRAGON_TAMER ; DRAGON_TAMER
+ .byte TRAINER_PIC_BIRD_KEEPER ; BIRD_KEEPER
+ .byte TRAINER_PIC_NINJA_BOY ; NINJA_BOY
+ .byte TRAINER_PIC_BATTLE_GIRL ; BATTLE_GIRL
+ .byte TRAINER_PIC_PARASOL_LADY ; PARASOL_LADY
+ .byte TRAINER_PIC_SWIMMER_F ; SWIMMER_F
+ .byte TRAINER_PIC_PICNICKER ; PICNICKER
+ .byte TRAINER_PIC_TWINS ; TWINS
+ .byte TRAINER_PIC_SAILOR ; SAILOR
+ .byte TRAINER_PIC_YOUNGSTER ; BOARDER_1
+ .byte TRAINER_PIC_YOUNGSTER ; BOARDER_2
+ .byte TRAINER_PIC_COLLECTOR ; COLLECTOR
+ .byte TRAINER_PIC_WALLY ; WALLY
+ .byte TRAINER_PIC_BRENDAN ; BRENDAN_1
+ .byte TRAINER_PIC_BRENDAN ; BRENDAN_2
+ .byte TRAINER_PIC_BRENDAN ; BRENDAN_3
+ .byte TRAINER_PIC_MAY ; MAY_1
+ .byte TRAINER_PIC_MAY ; MAY_2
+ .byte TRAINER_PIC_MAY ; MAY_3
+ .byte TRAINER_PIC_POKEMON_BREEDER_M ; POKEMON_BREEDER_M
+ .byte TRAINER_PIC_POKEMON_BREEDER_F ; POKEMON_BREEDER_F
+ .byte TRAINER_PIC_POKEMON_RANGER_M ; POKEMON_RANGER_M
+ .byte TRAINER_PIC_POKEMON_RANGER_F ; POKEMON_RANGER_F
+ .byte TRAINER_PIC_MAXIE ; MAGMA_LEADER
+ .byte TRAINER_PIC_MAGMA_GRUNT_M ; TEAM_MAGMA_M
+ .byte TRAINER_PIC_MAGMA_GRUNT_F ; TEAM_MAGMA_F
+ .byte TRAINER_PIC_LASS ; LASS
+ .byte TRAINER_PIC_BUG_CATCHER ; BUG_CATCHER
+ .byte TRAINER_PIC_HIKER ; HIKER
+ .byte TRAINER_PIC_YOUNG_COUPLE ; YOUNG_COUPLE
+ .byte TRAINER_PIC_OLD_COUPLE ; OLD_COUPLE
+ .byte TRAINER_PIC_SIS_AND_BRO ; SIS_AND_BRO
+
+gTrainerClassToNameIndex: ; 81FDE1D
+ .byte TRAINER_CLASS_NAME_AQUA_LEADER ; AQUA_LEADER
+ .byte TRAINER_CLASS_NAME_TEAM_AQUA ; TEAM_AQUA_M
+ .byte TRAINER_CLASS_NAME_TEAM_AQUA ; TEAM_AQUA_F
+ .byte TRAINER_CLASS_NAME_AROMA_LADY ; AROMA_LADY
+ .byte TRAINER_CLASS_NAME_RUIN_MANIAC ; RUIN_MANIAC
+ .byte TRAINER_CLASS_NAME_INTERVIEWER ; INTERVIEWER
+ .byte TRAINER_CLASS_NAME_TUBER_F ; TUBER_F
+ .byte TRAINER_CLASS_NAME_TUBER_M ; TUBER_M
+ .byte TRAINER_CLASS_NAME_COOL_TRAINER ; COOL_TRAINER_M
+ .byte TRAINER_CLASS_NAME_COOL_TRAINER ; COOL_TRAINER_F
+ .byte TRAINER_CLASS_NAME_HEX_MANIAC ; HEX_MANIAC
+ .byte TRAINER_CLASS_NAME_LADY ; LADY
+ .byte TRAINER_CLASS_NAME_BEAUTY ; BEAUTY
+ .byte TRAINER_CLASS_NAME_RICH_BOY ; RICH_BOY
+ .byte TRAINER_CLASS_NAME_POKEMANIAC ; POKEMANIAC
+ .byte TRAINER_CLASS_NAME_SWIMMER_M ; SWIMMER_M
+ .byte TRAINER_CLASS_NAME_BLACK_BELT ; BLACK_BELT
+ .byte TRAINER_CLASS_NAME_GUITARIST ; GUITARIST
+ .byte TRAINER_CLASS_NAME_KINDLER ; KINDLER
+ .byte TRAINER_CLASS_NAME_CAMPER ; CAMPER
+ .byte TRAINER_CLASS_NAME_BUG_MANIAC ; BUG_MANIAC
+ .byte TRAINER_CLASS_NAME_PSYCHIC ; PSYCHIC_M
+ .byte TRAINER_CLASS_NAME_PSYCHIC ; PSYCHIC_F
+ .byte TRAINER_CLASS_NAME_GENTLEMAN ; GENTLEMAN
+ .byte TRAINER_CLASS_NAME_ELITE_FOUR ; ELITE_FOUR_M
+ .byte TRAINER_CLASS_NAME_ELITE_FOUR ; ELITE_FOUR_F
+ .byte TRAINER_CLASS_NAME_LEADER ; LEADER_F
+ .byte TRAINER_CLASS_NAME_LEADER ; LEADER_M
+ .byte TRAINER_CLASS_NAME_LEADER ; LEADER_MF
+ .byte TRAINER_CLASS_NAME_SCHOOL_KID ; SCHOOL_KID_M
+ .byte TRAINER_CLASS_NAME_SCHOOL_KID ; SCHOOL_KID_F
+ .byte TRAINER_CLASS_NAME_SR_AND_JR ; SR_AND_JR
+ .byte TRAINER_CLASS_NAME_POKEFAN ; POKEFAN_M
+ .byte TRAINER_CLASS_NAME_POKEFAN ; POKEFAN_F
+ .byte TRAINER_CLASS_NAME_EXPERT ; EXPERT_M
+ .byte TRAINER_CLASS_NAME_EXPERT ; EXPERT_F
+ .byte TRAINER_CLASS_NAME_YOUNGSTER ; YOUNGSTER
+ .byte TRAINER_CLASS_NAME_CHAMPION ; CHAMPION
+ .byte TRAINER_CLASS_NAME_FISHERMAN ; FISHERMAN
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; CYCLING_TRIATHLETE_M
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; CYCLING_TRIATHLETE_F
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; RUNNING_TRIATHLETE_M
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; RUNNING_TRIATHLETE_F
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; SWIMMING_TRIATHLETE_M
+ .byte TRAINER_CLASS_NAME_TRIATHLETE ; SWIMMING_TRIATHLETE_F
+ .byte TRAINER_CLASS_NAME_DRAGON_TAMER ; DRAGON_TAMER
+ .byte TRAINER_CLASS_NAME_BIRD_KEEPER ; BIRD_KEEPER
+ .byte TRAINER_CLASS_NAME_NINJA_BOY ; NINJA_BOY
+ .byte TRAINER_CLASS_NAME_BATTLE_GIRL ; BATTLE_GIRL
+ .byte TRAINER_CLASS_NAME_PARASOL_LADY ; PARASOL_LADY
+ .byte TRAINER_CLASS_NAME_SWIMMER_F ; SWIMMER_F
+ .byte TRAINER_CLASS_NAME_PICNICKER ; PICNICKER
+ .byte TRAINER_CLASS_NAME_TWINS ; TWINS
+ .byte TRAINER_CLASS_NAME_SAILOR ; SAILOR
+ .byte TRAINER_CLASS_NAME_BOARDER ; BOARDER_1
+ .byte TRAINER_CLASS_NAME_BOARDER ; BOARDER_2
+ .byte TRAINER_CLASS_NAME_COLLECTOR ; COLLECTOR
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; WALLY
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_1
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_2
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_3
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_1
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_2
+ .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_3
+ .byte TRAINER_CLASS_NAME_POKEMON_BREEDER ; POKEMON_BREEDER_M
+ .byte TRAINER_CLASS_NAME_POKEMON_BREEDER ; POKEMON_BREEDER_F
+ .byte TRAINER_CLASS_NAME_POKEMON_RANGER ; POKEMON_RANGER_M
+ .byte TRAINER_CLASS_NAME_POKEMON_RANGER ; POKEMON_RANGER_F
+ .byte TRAINER_CLASS_NAME_MAGMA_LEADER ; MAGMA_LEADER
+ .byte TRAINER_CLASS_NAME_TEAM_MAGMA ; TEAM_MAGMA_M
+ .byte TRAINER_CLASS_NAME_TEAM_MAGMA ; TEAM_MAGMA_F
+ .byte TRAINER_CLASS_NAME_LASS ; LASS
+ .byte TRAINER_CLASS_NAME_BUG_CATCHER ; BUG_CATCHER
+ .byte TRAINER_CLASS_NAME_HIKER ; HIKER
+ .byte TRAINER_CLASS_NAME_YOUNG_COUPLE ; YOUNG_COUPLE
+ .byte TRAINER_CLASS_NAME_OLD_COUPLE ; OLD_COUPLE
+ .byte TRAINER_CLASS_NAME_SIS_AND_BRO ; SIS_AND_BRO
diff --git a/graphics/trainers/winstrate_f/front.png b/graphics/trainers/pokefan_f/front.png
index 4d4f9cffe..4d4f9cffe 100644
--- a/graphics/trainers/winstrate_f/front.png
+++ b/graphics/trainers/pokefan_f/front.png
Binary files differ
diff --git a/graphics/trainers/winstrate_f/palette.pal b/graphics/trainers/pokefan_f/palette.pal
index 09728f005..09728f005 100644
--- a/graphics/trainers/winstrate_f/palette.pal
+++ b/graphics/trainers/pokefan_f/palette.pal
diff --git a/graphics/trainers/winstrate_m/front.png b/graphics/trainers/pokefan_m/front.png
index a6dc4a18e..a6dc4a18e 100644
--- a/graphics/trainers/winstrate_m/front.png
+++ b/graphics/trainers/pokefan_m/front.png
Binary files differ
diff --git a/graphics/trainers/winstrate_m/palette.pal b/graphics/trainers/pokefan_m/palette.pal
index 1d1f48875..1d1f48875 100644
--- a/graphics/trainers/winstrate_m/palette.pal
+++ b/graphics/trainers/pokefan_m/palette.pal
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 22:56:46 +0000