diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/opponents.h | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 9917b84ba..e7315f141 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -33,8 +33,8 @@ #define TRAINER_FREDRICK 29 #define TRAINER_MATT 30 #define TRAINER_ZANDER 31 -#define TRAINER_SHELLY_1 32 -#define TRAINER_SHELLY_2 33 +#define TRAINER_SHELLY_WEATHER_INSTITUTE 32 +#define TRAINER_SHELLY_SEAFLOOR_CAVERN 33 #define TRAINER_ARCHIE 34 #define TRAINER_LEAH 35 #define TRAINER_DAISY 36 @@ -515,30 +515,30 @@ #define TRAINER_CONOR 511 #define TRAINER_EDWIN_1 512 #define TRAINER_HECTOR 513 -#define TRAINER_TABITHA_1 514 +#define TRAINER_TABITHA_MOSSDEEP 514 #define TRAINER_EDWIN_2 515 #define TRAINER_EDWIN_3 516 #define TRAINER_EDWIN_4 517 #define TRAINER_EDWIN_5 518 -#define TRAINER_WALLY_1 519 -#define TRAINER_BRENDAN_1 520 -#define TRAINER_BRENDAN_2 521 -#define TRAINER_BRENDAN_3 522 -#define TRAINER_BRENDAN_4 523 -#define TRAINER_BRENDAN_5 524 -#define TRAINER_BRENDAN_6 525 -#define TRAINER_BRENDAN_7 526 -#define TRAINER_BRENDAN_8 527 -#define TRAINER_BRENDAN_9 528 -#define TRAINER_MAY_1 529 -#define TRAINER_MAY_2 530 -#define TRAINER_MAY_3 531 -#define TRAINER_MAY_4 532 -#define TRAINER_MAY_5 533 -#define TRAINER_MAY_6 534 -#define TRAINER_MAY_7 535 -#define TRAINER_MAY_8 536 -#define TRAINER_MAY_9 537 +#define TRAINER_WALLY_VR_1 519 +#define TRAINER_BRENDAN_ROUTE_103_MUDKIP 520 +#define TRAINER_BRENDAN_ROUTE_110_MUDKIP 521 +#define TRAINER_BRENDAN_ROUTE_119_MUDKIP 522 +#define TRAINER_BRENDAN_ROUTE_103_TREECKO 523 +#define TRAINER_BRENDAN_ROUTE_110_TREECKO 524 +#define TRAINER_BRENDAN_ROUTE_119_TREECKO 525 +#define TRAINER_BRENDAN_ROUTE_103_TORCHIC 526 +#define TRAINER_BRENDAN_ROUTE_110_TORCHIC 527 +#define TRAINER_BRENDAN_ROUTE_119_TORCHIC 528 +#define TRAINER_MAY_ROUTE_103_MUDKIP 529 +#define TRAINER_MAY_ROUTE_110_MUDKIP 530 +#define TRAINER_MAY_ROUTE_119_MUDKIP 531 +#define TRAINER_MAY_ROUTE_103_TREECKO 532 +#define TRAINER_MAY_ROUTE_110_TREECKO 533 +#define TRAINER_MAY_ROUTE_119_TREECKO 534 +#define TRAINER_MAY_ROUTE_103_TORCHIC 535 +#define TRAINER_MAY_ROUTE_110_TORCHIC 536 +#define TRAINER_MAY_ROUTE_119_TORCHIC 537 #define TRAINER_ISAAC_1 538 #define TRAINER_DAVIS 539 #define TRAINER_MITCHELL 540 @@ -593,17 +593,17 @@ #define TRAINER_GRUNT_SPACE_CENTER_6 589 #define TRAINER_GRUNT_SPACE_CENTER_7 590 #define TRAINER_MACEY 591 -#define TRAINER_BRENDAN_10 592 -#define TRAINER_BRENDAN_11 593 +#define TRAINER_BRENDAN_RUSTBORO_TREECKO 592 +#define TRAINER_BRENDAN_RUSTBORO_MUDKIP 593 #define TRAINER_PAXTON 594 #define TRAINER_ISABELLA 595 #define TRAINER_GRUNT_WEATHER_INST_5 596 -#define TRAINER_TABITHA_2 597 +#define TRAINER_TABITHA_MT_CHIMNEY 597 #define TRAINER_JONATHAN 598 -#define TRAINER_BRENDAN_12 599 -#define TRAINER_MAY_10 600 -#define TRAINER_MAXIE_1 601 -#define TRAINER_MAXIE_2 602 +#define TRAINER_BRENDAN_RUSTBORO_TORCHIC 599 +#define TRAINER_MAY_RUSTBORO_MUDKIP 600 +#define TRAINER_MAXIE_MAGMA_HIDEOUT 601 +#define TRAINER_MAXIE_MT_CHIMNEY 602 #define TRAINER_TIANA 603 #define TRAINER_HALEY_1 604 #define TRAINER_JANICE 605 @@ -657,17 +657,17 @@ #define TRAINER_RILEY 653 #define TRAINER_FLINT 654 #define TRAINER_ASHLEY 655 -#define TRAINER_WALLY_2 656 -#define TRAINER_WALLY_3 657 -#define TRAINER_WALLY_4 658 -#define TRAINER_WALLY_5 659 -#define TRAINER_WALLY_6 660 -#define TRAINER_BRENDAN_13 661 -#define TRAINER_BRENDAN_14 662 -#define TRAINER_BRENDAN_15 663 -#define TRAINER_MAY_11 664 -#define TRAINER_MAY_12 665 -#define TRAINER_MAY_13 666 +#define TRAINER_WALLY_MAUVILLE 656 +#define TRAINER_WALLY_VR_2 657 +#define TRAINER_WALLY_VR_3 658 +#define TRAINER_WALLY_VR_4 659 +#define TRAINER_WALLY_VR_5 660 +#define TRAINER_BRENDAN_LILYCOVE_MUDKIP 661 +#define TRAINER_BRENDAN_LILYCOVE_TREECKO 662 +#define TRAINER_BRENDAN_LILYCOVE_TORCHIC 663 +#define TRAINER_MAY_LILYCOVE_MUDKIP 664 +#define TRAINER_MAY_LILYCOVE_TREECKO 665 +#define TRAINER_MAY_LILYCOVE_TORCHIC 666 #define TRAINER_JONAH 667 #define TRAINER_HENRY 668 #define TRAINER_ROGER 669 @@ -733,9 +733,9 @@ #define TRAINER_GRUNT_MAGMA_HIDEOUT_14 729 #define TRAINER_GRUNT_MAGMA_HIDEOUT_15 730 #define TRAINER_GRUNT_MAGMA_HIDEOUT_16 731 -#define TRAINER_TABITHA_3 732 +#define TRAINER_TABITHA_MAGMA_HIDEOUT 732 #define TRAINER_DARCY 733 -#define TRAINER_MAXIE_3 734 +#define TRAINER_MAXIE_MOSSDEEP 734 #define TRAINER_PETE 735 #define TRAINER_ISABELLE 736 #define TRAINER_ANDRES_1 737 @@ -769,8 +769,8 @@ #define TRAINER_MYLES 765 #define TRAINER_PAT 766 #define TRAINER_CRISTIN_1 767 -#define TRAINER_MAY_14 768 -#define TRAINER_MAY_15 769 +#define TRAINER_MAY_RUSTBORO_TREECKO 768 +#define TRAINER_MAY_RUSTBORO_TORCHIC 769 #define TRAINER_ROXANNE_2 770 #define TRAINER_ROXANNE_3 771 #define TRAINER_ROXANNE_4 772 @@ -854,8 +854,8 @@ #define TRAINER_EVERETT 850 #define TRAINER_RED 851 #define TRAINER_LEAF 852 -#define TRAINER_BRENDAN_16 853 -#define TRAINER_MAY_16 854 +#define TRAINER_BRENDAN_PLACEHOLDER 853 +#define TRAINER_MAY_PLACEHOLDER 854 #define TRAINERS_COUNT 855 |