dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename rival trainer constants

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 11:06:53 -04:00
parent 85a033f350
commit 7e8da8845b
10 changed files with 810 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/trainers.h
+27 -27
View File
@@ -642,15 +642,15 @@
#define TRAINER_BLACK_BELT_KIYO 323
#define TRAINER_BLACK_BELT_TAKASHI 324
#define TRAINER_BLACK_BELT_DAISUKE 325
#define TRAINER_RIVAL_TERRY 326
#define TRAINER_RIVAL_TERRY_2 327
#define TRAINER_RIVAL_TERRY_3 328
#define TRAINER_RIVAL_TERRY_4 329
#define TRAINER_RIVAL_TERRY_5 330
#define TRAINER_RIVAL_TERRY_6 331
#define TRAINER_RIVAL_TERRY_7 332
#define TRAINER_RIVAL_TERRY_8 333
#define TRAINER_RIVAL_TERRY_9 334
#define TRAINER_RIVAL_OAKS_LAB_SQUIRTLE 326
#define TRAINER_RIVAL_OAKS_LAB_BULBASAUR 327
#define TRAINER_RIVAL_OAKS_LAB_CHARMANDER 328
#define TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE 329
#define TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR 330
#define TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER 331
#define TRAINER_RIVAL_CERULEAN_SQUIRTLE 332
#define TRAINER_RIVAL_CERULEAN_BULBASAUR 333
#define TRAINER_RIVAL_CERULEAN_CHARMANDER 334
#define TRAINER_SCIENTIST_TED 335
#define TRAINER_SCIENTIST_CONNOR 336
#define TRAINER_SCIENTIST_JERRY 337
@@ -742,21 +742,21 @@
#define TRAINER_GENTLEMAN_TUCKER 423
#define TRAINER_GENTLEMAN_NORTON 424
#define TRAINER_GENTLEMAN_WALTER 425
#define TRAINER_RIVAL_TERRY_10 426
#define TRAINER_RIVAL_TERRY_11 427
#define TRAINER_RIVAL_TERRY_12 428
#define TRAINER_RIVAL_TERRY_13 429
#define TRAINER_RIVAL_TERRY_14 430
#define TRAINER_RIVAL_TERRY_15 431
#define TRAINER_RIVAL_TERRY_16 432
#define TRAINER_RIVAL_TERRY_17 433
#define TRAINER_RIVAL_TERRY_18 434
#define TRAINER_RIVAL_TERRY_19 435
#define TRAINER_RIVAL_TERRY_20 436
#define TRAINER_RIVAL_TERRY_21 437
#define TRAINER_CHAMPION_TERRY 438
#define TRAINER_CHAMPION_TERRY_2 439
#define TRAINER_CHAMPION_TERRY_3 440
#define TRAINER_RIVAL_SS_ANNE_SQUIRTLE 426
#define TRAINER_RIVAL_SS_ANNE_BULBASAUR 427
#define TRAINER_RIVAL_SS_ANNE_CHARMANDER 428
#define TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE 429
#define TRAINER_RIVAL_POKENON_TOWER_BULBASAUR 430
#define TRAINER_RIVAL_POKENON_TOWER_CHARMANDER 431
#define TRAINER_RIVAL_SILPH_SQUIRTLE 432
#define TRAINER_RIVAL_SILPH_BULBASAUR 433
#define TRAINER_RIVAL_SILPH_CHARMANDER 434
#define TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE 435
#define TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR 436
#define TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER 437
#define TRAINER_CHAMPION_FIRST_SQUIRTLE 438
#define TRAINER_CHAMPION_FIRST_BULBASAUR 439
#define TRAINER_CHAMPION_FIRST_CHARMANDER 440
#define TRAINER_CHANNELER_PATRICIA 441
#define TRAINER_CHANNELER_CARLY 442
#define TRAINER_CHANNELER_HOPE 443
@@ -1055,9 +1055,9 @@
#define TRAINER_ELITE_FOUR_BRUNO_2 736
#define TRAINER_ELITE_FOUR_AGATHA_2 737
#define TRAINER_ELITE_FOUR_LANCE_2 738
#define TRAINER_CHAMPION_TERRY_4 739
#define TRAINER_CHAMPION_TERRY_5 740
#define TRAINER_CHAMPION_TERRY_6 741
#define TRAINER_CHAMPION_REMATCH_SQUIRTLE 739
#define TRAINER_CHAMPION_REMATCH_BULBASAUR 740
#define TRAINER_CHAMPION_REMATCH_CHARMANDER 741
#define TRAINER_CUE_BALL_PAXTON 742
#define NUM_TRAINERS 743