Sync/update trainer classes

5 files changed, 346 insertions, 352 deletions

diff --git a/include/constants/facility_trainer_classes.h b/include/constants/facility_trainer_classes.h
deleted file mode 100644
index fe94608dd..000000000
--- a/include/constants/facility_trainer_classes.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H
-#define GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H
-
-#define FACILITY_CLASS_AQUA_LEADER 0x00
-#define FACILITY_CLASS_TEAM_AQUA 0x01
-#define FACILITY_CLASS_TEAM_AQUA_2 0x02
-#define FACILITY_CLASS_AROMA_LADY 0x03
-#define FACILITY_CLASS_RUIN_MANIAC 0x04
-#define FACILITY_CLASS_INTERVIEWER 0x05
-#define FACILITY_CLASS_TUBER 0x06
-#define FACILITY_CLASS_TUBER_2 0x07
-#define FACILITY_CLASS_COOLTRAINER 0x08
-#define FACILITY_CLASS_COOLTRAINER_2 0x09
-#define FACILITY_CLASS_HEX_MANIAC 0x0A
-#define FACILITY_CLASS_LADY 0x0B
-#define FACILITY_CLASS_BEAUTY 0x0C
-#define FACILITY_CLASS_RICH_BOY 0x0D
-#define FACILITY_CLASS_POKEMANIAC 0x0E
-#define FACILITY_CLASS_SWIMMER_MALE 0x0F
-#define FACILITY_CLASS_BLACK_BELT 0x10
-#define FACILITY_CLASS_GUITARIST 0x11
-#define FACILITY_CLASS_KINDLER 0x12
-#define FACILITY_CLASS_CAMPER 0x13
-#define FACILITY_CLASS_BUG_MANIAC 0x14
-#define FACILITY_CLASS_PSYCHIC 0x15
-#define FACILITY_CLASS_PSYCHIC_2 0x16
-#define FACILITY_CLASS_GENTLEMAN 0x17
-#define FACILITY_CLASS_ELITE_FOUR 0x18
-#define FACILITY_CLASS_ELITE_FOUR_2 0x19
-#define FACILITY_CLASS_LEADER 0x1A
-#define FACILITY_CLASS_LEADER_2 0x1B
-#define FACILITY_CLASS_LEADER_3 0x1C
-#define FACILITY_CLASS_SCHOOL_KID 0x1D
-#define FACILITY_CLASS_SCHOOL_KID_2 0x1E
-#define FACILITY_CLASS_SR_AND_JR 0x1F
-#define FACILITY_CLASS_POKEFAN 0x20
-#define FACILITY_CLASS_POKEFAN_2 0x21
-#define FACILITY_CLASS_EXPERT 0x22
-#define FACILITY_CLASS_EXPERT_2 0x23
-#define FACILITY_CLASS_YOUNGSTER 0x24
-#define FACILITY_CLASS_CHAMPION 0x25
-#define FACILITY_CLASS_FISHERMAN 0x26
-#define FACILITY_CLASS_TRIATHLETE 0x27
-#define FACILITY_CLASS_TRIATHLETE_2 0x28
-#define FACILITY_CLASS_TRIATHLETE_3 0x29
-#define FACILITY_CLASS_TRIATHLETE_4 0x2A
-#define FACILITY_CLASS_TRIATHLETE_5 0x2B
-#define FACILITY_CLASS_TRIATHLETE_6 0x2C
-#define FACILITY_CLASS_DRAGON_TAMER 0x2D
-#define FACILITY_CLASS_BIRD_KEEPER 0x2E
-#define FACILITY_CLASS_NINJA_BOY 0x2F
-#define FACILITY_CLASS_BATTLE_GIRL 0x30
-#define FACILITY_CLASS_PARASOL_LADY 0x31
-#define FACILITY_CLASS_SWIMMER_FEMALE 0x32
-#define FACILITY_CLASS_PICNICKER 0x33
-#define FACILITY_CLASS_TWINS 0x34
-#define FACILITY_CLASS_SAILOR 0x35
-#define FACILITY_CLASS_BOARDER 0x36
-#define FACILITY_CLASS_BOARDER_2 0x37
-#define FACILITY_CLASS_COLLECTOR 0x38
-#define FACILITY_CLASS_PKMN_TRAINER 0x39
-#define FACILITY_CLASS_PKMN_TRAINER_2 0x3A
-#define FACILITY_CLASS_PKMN_TRAINER_3 0x3B
-#define FACILITY_CLASS_PKMN_TRAINER_4 0x3C
-#define FACILITY_CLASS_PKMN_TRAINER_5 0x3D
-#define FACILITY_CLASS_PKMN_TRAINER_6 0x3E
-#define FACILITY_CLASS_PKMN_TRAINER_7 0x3F
-#define FACILITY_CLASS_PKMN_BREEDER 0x40
-#define FACILITY_CLASS_PKMN_BREEDER_2 0x41
-#define FACILITY_CLASS_PKMN_RANGER 0x42
-#define FACILITY_CLASS_PKMN_RANGER_2 0x43
-#define FACILITY_CLASS_MAGMA_LEADER 0x44
-#define FACILITY_CLASS_TEAM_MAGMA 0x45
-#define FACILITY_CLASS_TEAM_MAGMA_2 0x46
-#define FACILITY_CLASS_LASS 0x47
-#define FACILITY_CLASS_BUG_CATCHER 0x48
-#define FACILITY_CLASS_HIKER 0x49
-#define FACILITY_CLASS_YOUNG_COUPLE 0x4A
-#define FACILITY_CLASS_OLD_COUPLE 0x4B
-#define FACILITY_CLASS_SIS_AND_BRO 0x4C
-#define FACILITY_CLASS_AQUA_ADMIN 0x4D
-#define FACILITY_CLASS_AQUA_ADMIN_2 0x4E
-#define FACILITY_CLASS_MAGMA_ADMIN 0x4F
-#define FACILITY_CLASS_MAGMA_ADMIN_2 0x50
-#define FACILITY_CLASS_LEADER_4 0x51
-#define FACILITY_CLASS_LEADER_5 0x52
-#define FACILITY_CLASS_LEADER_6 0x53
-#define FACILITY_CLASS_LEADER_7 0x54
-#define FACILITY_CLASS_LEADER_8 0x55
-#define FACILITY_CLASS_ELITE_FOUR_3 0x56
-#define FACILITY_CLASS_ELITE_FOUR_4 0x57
-#define FACILITY_CLASS_YOUNGSTER_2 0x58
-#define FACILITY_CLASS_BUG_CATCHER_2 0x59
-#define FACILITY_CLASS_LASS_2 0x5A
-#define FACILITY_CLASS_SAILOR_2 0x5B
-#define FACILITY_CLASS_CAMPER_2 0x5C
-#define FACILITY_CLASS_PICNICKER_2 0x5D
-#define FACILITY_CLASS_POKEMANIAC_2 0x5E
-#define FACILITY_CLASS_SUPER_NERD 0x5F
-#define FACILITY_CLASS_HIKER_2 0x60
-#define FACILITY_CLASS_BIKER 0x61
-#define FACILITY_CLASS_BURGLAR 0x62
-#define FACILITY_CLASS_ENGINEER 0x63
-#define FACILITY_CLASS_FISHERMAN_2 0x64
-#define FACILITY_CLASS_SWIMMER_MALE_2 0x65
-#define FACILITY_CLASS_CUE_BALL 0x66
-#define FACILITY_CLASS_GAMER 0x67
-#define FACILITY_CLASS_BEAUTY_2 0x68
-#define FACILITY_CLASS_SWIMMER_FEMALE_2 0x69
-#define FACILITY_CLASS_PSYCHIC_3 0x6A
-#define FACILITY_CLASS_ROCKER 0x6B
-#define FACILITY_CLASS_JUGGLER 0x6C
-#define FACILITY_CLASS_TAMER 0x6D
-#define FACILITY_CLASS_BIRD_KEEPER_2 0x6E
-#define FACILITY_CLASS_BLACK_BELT_2 0x6F
-#define FACILITY_CLASS_RIVAL 0x70
-#define FACILITY_CLASS_SCIENTIST 0x71
-#define FACILITY_CLASS_BOSS 0x72
-#define FACILITY_CLASS_TEAM_ROCKET 0x73
-#define FACILITY_CLASS_COOLTRAINER_3 0x74
-#define FACILITY_CLASS_COOLTRAINER_4 0x75
-#define FACILITY_CLASS_ELITE_FOUR_5 0x76
-#define FACILITY_CLASS_ELITE_FOUR_6 0x77
-#define FACILITY_CLASS_LEADER_9 0x78
-#define FACILITY_CLASS_LEADER_10 0x79
-#define FACILITY_CLASS_GENTLEMAN_2 0x7A
-#define FACILITY_CLASS_RIVAL_2 0x7B
-#define FACILITY_CLASS_CHAMPION_2 0x7C
-#define FACILITY_CLASS_CHANNELER 0x7D
-#define FACILITY_CLASS_TWINS_2 0x7E
-#define FACILITY_CLASS_COOL_COUPLE 0x7F
-#define FACILITY_CLASS_YOUNG_COUPLE_2 0x80
-#define FACILITY_CLASS_CRUSH_KIN 0x81
-#define FACILITY_CLASS_SIS_AND_BRO_2 0x82
-#define FACILITY_CLASS_PKMN_PROF 0x83
-#define FACILITY_CLASS_BRENDAN 0x84
-#define FACILITY_CLASS_MAY 0x85
-#define FACILITY_CLASS_RED 0x86
-#define FACILITY_CLASS_LEAF 0x87
-#define FACILITY_CLASS_TEAM_ROCKET_2 0x88
-#define FACILITY_CLASS_PSYCHIC_4 0x89
-#define FACILITY_CLASS_CRUSH_GIRL 0x8A
-#define FACILITY_CLASS_TUBER_3 0x8B
-#define FACILITY_CLASS_PKMN_BREEDER_3 0x8C
-#define FACILITY_CLASS_PKMN_RANGER_3 0x8D
-#define FACILITY_CLASS_PKMN_RANGER_4 0x8E
-#define FACILITY_CLASS_AROMA_LADY_2 0x8F
-#define FACILITY_CLASS_RUIN_MANIAC_2 0x90
-#define FACILITY_CLASS_LADY_2 0x91
-#define FACILITY_CLASS_PAINTER 0x92
-#define FACILITY_CLASS_ELITE_FOUR_7 0x93
-#define FACILITY_CLASS_ELITE_FOUR_8 0x94
-#define FACILITY_CLASS_CHAMPION_3 0x95
-
-#endif //GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 6262ab817..6c6081ef0 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -2,83 +2,84 @@
 #define GUARD_CONSTANTS_OPPONENTS_H
 
 #define TRAINER_NONE                               0
-#define TRAINER_AQUA_LEADER_1                      1
-#define TRAINER_TEAM_AQUA_1                        2
-#define TRAINER_TEAM_AQUA_2                        3
-#define TRAINER_AROMA_LADY_1                       4
-#define TRAINER_RUIN_MANIAC_1                      5
-#define TRAINER_INTERVIEWER_1                      6
-#define TRAINER_TUBER_1                            7
-#define TRAINER_TUBER_2                            8
-#define TRAINER_COOLTRAINER_1                      9
-#define TRAINER_COOLTRAINER_2                     10
-#define TRAINER_HEX_MANIAC_1                      11
-#define TRAINER_LADY_1                            12
-#define TRAINER_BEAUTY_1                          13
-#define TRAINER_RICH_BOY_1                        14
-#define TRAINER_POKEMANIAC_1                      15
-#define TRAINER_SWIMMER_MALE_1                    16
-#define TRAINER_BLACK_BELT_1                      17
-#define TRAINER_GUITARIST_1                       18
-#define TRAINER_KINDLER_1                         19
-#define TRAINER_CAMPER_1                          20
-#define TRAINER_BUG_MANIAC_1                      21
-#define TRAINER_PSYCHIC_1                         22
-#define TRAINER_PSYCHIC_2                         23
-#define TRAINER_GENTLEMAN_1                       24
+// Dummy trainers for all the RS trainer classes
+#define TRAINER_AQUA_LEADER                        1
+#define TRAINER_AQUA_GRUNT_M                       2
+#define TRAINER_AQUA_GRUNT_F                       3
+#define TRAINER_RS_AROMA_LADY                      4
+#define TRAINER_RS_RUIN_MANIAC                     5
+#define TRAINER_INTERVIEWER                        6
+#define TRAINER_RS_TUBER_F                         7
+#define TRAINER_RS_TUBER_M                         8
+#define TRAINER_RS_COOLTRAINER_M                   9
+#define TRAINER_RS_COOLTRAINER_F                  10
+#define TRAINER_HEX_MANIAC                        11
+#define TRAINER_RS_LADY                           12
+#define TRAINER_RS_BEAUTY                         13
+#define TRAINER_RICH_BOY                          14
+#define TRAINER_RS_POKEMANIAC                     15
+#define TRAINER_RS_SWIMMER_M                      16
+#define TRAINER_RS_BLACK_BELT                     17
+#define TRAINER_GUITARIST                         18
+#define TRAINER_KINDLER                           19
+#define TRAINER_RS_CAMPER                         20
+#define TRAINER_BUG_MANIAC                        21
+#define TRAINER_RS_PSYCHIC_M                      22
+#define TRAINER_RS_PSYCHIC_F                      23
+#define TRAINER_RS_GENTLEMAN                      24
 #define TRAINER_ELITE_FOUR_SIDNEY                 25
 #define TRAINER_ELITE_FOUR_PHOEBE                 26
 #define TRAINER_LEADER_ROXANNE                    27
 #define TRAINER_LEADER_BRAWLY                     28
 #define TRAINER_LEADER_TATE_LIZA                  29
-#define TRAINER_SCHOOL_KID_1                      30
-#define TRAINER_SCHOOL_KID_2                      31
-#define TRAINER_SR_AND_JR_1                       32
-#define TRAINER_POKEFAN_1                         33
-#define TRAINER_POKEFAN_2                         34
-#define TRAINER_EXPERT_1                          35
-#define TRAINER_EXPERT_2                          36
-#define TRAINER_YOUNGSTER_1                       37
-#define TRAINER_CHAMPION_1                        38
-#define TRAINER_FISHERMAN_1                       39
-#define TRAINER_TRIATHLETE_1                      40
-#define TRAINER_TRIATHLETE_2                      41
-#define TRAINER_TRIATHLETE_3                      42
-#define TRAINER_TRIATHLETE_4                      43
-#define TRAINER_TRIATHLETE_5                      44
-#define TRAINER_TRIATHLETE_6                      45
-#define TRAINER_DRAGON_TAMER_1                    46
-#define TRAINER_BIRD_KEEPER_1                     47
-#define TRAINER_NINJA_BOY_1                       48
-#define TRAINER_BATTLE_GIRL_1                     49
-#define TRAINER_PARASOL_LADY_1                    50
-#define TRAINER_SWIMMER_FEMALE_1                  51
-#define TRAINER_PICNICKER_1                       52
-#define TRAINER_TWINS_1                           53
-#define TRAINER_SAILOR_1                          54
-#define TRAINER_BOARDER_1                         55
-#define TRAINER_BOARDER_2                         56
-#define TRAINER_COLLECTOR_1                       57
-#define TRAINER_PKMN_TRAINER_2                    58
-#define TRAINER_PKMN_TRAINER_3                    59
-#define TRAINER_PKMN_TRAINER_4                    60
-#define TRAINER_PKMN_TRAINER_5                    61
-#define TRAINER_PKMN_TRAINER_6                    62
-#define TRAINER_PKMN_TRAINER_7                    63
-#define TRAINER_PKMN_TRAINER_8                    64
-#define TRAINER_PKMN_BREEDER_1                    65
-#define TRAINER_PKMN_BREEDER_2                    66
-#define TRAINER_PKMN_RANGER_1                     67
-#define TRAINER_PKMN_RANGER_2                     68
-#define TRAINER_MAGMA_LEADER_1                    69
-#define TRAINER_TEAM_MAGMA_1                      70
-#define TRAINER_TEAM_MAGMA_2                      71
-#define TRAINER_LASS_1                            72
-#define TRAINER_BUG_CATCHER_1                     73
-#define TRAINER_HIKER_1                           74
-#define TRAINER_YOUNG_COUPLE_1                    75
-#define TRAINER_OLD_COUPLE_1                      76
-#define TRAINER_SIS_AND_BRO_1                     77
+#define TRAINER_SCHOOL_KID_M                      30
+#define TRAINER_SCHOOL_KID_F                      31
+#define TRAINER_SR_AND_JR                         32
+#define TRAINER_POKEFAN_M                         33
+#define TRAINER_POKEFAN_F                         34
+#define TRAINER_EXPERT_M                          35
+#define TRAINER_EXPERT_F                          36
+#define TRAINER_RS_YOUNGSTER                      37
+#define TRAINER_RS_CHAMPION                       38
+#define TRAINER_RS_FISHERMAN                      39
+#define TRAINER_CYCLING_TRIATHLETE_M              40
+#define TRAINER_CYCLING_TRIATHLETE_F              41
+#define TRAINER_RUNNING_TRIATHLETE_M              42
+#define TRAINER_RUNNING_TRIATHLETE_F              43
+#define TRAINER_SWIMMING_TRIATHLETE_M             44
+#define TRAINER_SWIMMING_TRIATHLETE_F             45
+#define TRAINER_DRAGON_TAMER                      46
+#define TRAINER_RS_BIRD_KEEPER                    47
+#define TRAINER_NINJA_BOY                         48
+#define TRAINER_BATTLE_GIRL                       49
+#define TRAINER_PARASOL_LADY                      50
+#define TRAINER_RS_SWIMMER_F                      51
+#define TRAINER_RS_PICNICKER                      52
+#define TRAINER_RS_TWINS                          53
+#define TRAINER_RS_SAILOR                         54
+#define TRAINER_BOARDER_M                         55
+#define TRAINER_BOARDER_F                         56
+#define TRAINER_COLLECTOR                         57
+#define TRAINER_WALLY                             58
+#define TRAINER_BRENDAN                           59
+#define TRAINER_BRENDAN_2                         60
+#define TRAINER_BRENDAN_3                         61
+#define TRAINER_MAY                               62
+#define TRAINER_MAY_2                             63
+#define TRAINER_MAY_3                             64
+#define TRAINER_RS_PKMN_BREEDER_M                 65
+#define TRAINER_RS_PKMN_BREEDER_F                 66
+#define TRAINER_RS_PKMN_RANGER_M                  67
+#define TRAINER_RS_PKMN_RANGER_F                  68
+#define TRAINER_MAGMA_LEADER                      69
+#define TRAINER_MAGMA_GRUNT_M                     70
+#define TRAINER_MAMGA_GRUNT_F                     71
+#define TRAINER_RS_LASS                           72
+#define TRAINER_RS_BUG_CATCHER                    73
+#define TRAINER_RS_HIKER                          74
+#define TRAINER_RS_YOUNG_COUPLE                   75
+#define TRAINER_OLD_COUPLE                        76
+#define TRAINER_RS_SIS_AND_BRO                    77
 #define TRAINER_AQUA_ADMIN_MATT                   78
 #define TRAINER_AQUA_ADMIN_SHELLY                 79
 #define TRAINER_MAGMA_ADMIN_TABITHA               80
@@ -90,6 +91,7 @@
 #define TRAINER_LEADER_WALLACE                    86
 #define TRAINER_ELITE_FOUR_GLACIA                 87
 #define TRAINER_ELITE_FOUR_DRAKE                  88
+// Actual FRLG trainers start here
 #define TRAINER_YOUNGSTER_BEN                     89
 #define TRAINER_YOUNGSTER_CALVIN                  90
 #define TRAINER_YOUNGSTER_JOSH                    91
diff --git a/include/constants/trainer_classes.h b/include/constants/trainer_classes.h
deleted file mode 100644
index f0c6d4123..000000000
--- a/include/constants/trainer_classes.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef GUARD_TRAINER_CLASSES_H
-#define GUARD_TRAINER_CLASSES_H
-
-#define CLASS_PKMN_TRAINER 0x00
-#define CLASS_PKMN_TRAINER_2 0x01
-#define CLASS_AQUA_LEADER 0x02
-#define CLASS_TEAM_AQUA 0x03
-#define CLASS_AROMA_LADY 0x04
-#define CLASS_RUIN_MANIAC 0x05
-#define CLASS_INTERVIEWER 0x06
-#define CLASS_TUBER 0x07
-#define CLASS_TUBER_2 0x08
-#define CLASS_COOLTRAINER 0x09
-#define CLASS_HEX_MANIAC 0x0A
-#define CLASS_LADY 0x0B
-#define CLASS_BEAUTY 0x0C
-#define CLASS_RICH_BOY 0x0D
-#define CLASS_POKEMANIAC 0x0E
-#define CLASS_SWIMMER_MALE 0x0F
-#define CLASS_BLACK_BELT 0x10
-#define CLASS_GUITARIST 0x11
-#define CLASS_KINDLER 0x12
-#define CLASS_CAMPER 0x13
-#define CLASS_BUG_MANIAC 0x14
-#define CLASS_PSYCHIC 0x15
-#define CLASS_GENTLEMAN 0x16
-#define CLASS_ELITE_FOUR 0x17
-#define CLASS_LEADER 0x18
-#define CLASS_SCHOOL_KID 0x19
-#define CLASS_SR_AND_JR 0x1A
-#define CLASS_POKEFAN 0x1B
-#define CLASS_EXPERT 0x1C
-#define CLASS_YOUNGSTER 0x1D
-#define CLASS_CHAMPION 0x1E
-#define CLASS_FISHERMAN 0x1F
-#define CLASS_TRIATHLETE 0x20
-#define CLASS_DRAGON_TAMER 0x21
-#define CLASS_BIRD_KEEPER 0x22
-#define CLASS_NINJA_BOY 0x23
-#define CLASS_BATTLE_GIRL 0x24
-#define CLASS_PARASOL_LADY 0x25
-#define CLASS_SWIMMER_FEMALE 0x26
-#define CLASS_PICNICKER 0x27
-#define CLASS_TWINS 0x28
-#define CLASS_SAILOR 0x29
-#define CLASS_BOARDER 0x2A
-#define CLASS_COLLECTOR 0x2B
-#define CLASS_PKMN_TRAINER_3 0x2C
-#define CLASS_PKMN_BREEDER 0x2D
-#define CLASS_PKMN_RANGER 0x2E
-#define CLASS_MAGMA_LEADER 0x2F
-#define CLASS_TEAM_MAGMA 0x30
-#define CLASS_LASS 0x31
-#define CLASS_BUG_CATCHER 0x32
-#define CLASS_HIKER 0x33
-#define CLASS_YOUNG_COUPLE 0x34
-#define CLASS_OLD_COUPLE 0x35
-#define CLASS_SIS_AND_BRO 0x36
-#define CLASS_AQUA_ADMIN 0x37
-#define CLASS_MAGMA_ADMIN 0x38
-#define CLASS_YOUNGSTER_2 0x39
-#define CLASS_BUG_CATCHER_2 0x3A
-#define CLASS_LASS_2 0x3B
-#define CLASS_SAILOR_2 0x3C
-#define CLASS_CAMPER_2 0x3D
-#define CLASS_PICNICKER_2 0x3E
-#define CLASS_POKEMANIAC_2 0x3F
-#define CLASS_SUPER_NERD 0x40
-#define CLASS_HIKER_2 0x41
-#define CLASS_BIKER 0x42
-#define CLASS_BURGLAR 0x43
-#define CLASS_ENGINEER 0x44
-#define CLASS_FISHERMAN_2 0x45
-#define CLASS_SWIMMER_MALE_2 0x46
-#define CLASS_CUE_BALL 0x47
-#define CLASS_GAMER 0x48
-#define CLASS_BEAUTY_2 0x49
-#define CLASS_SWIMMER_FEMALE_2 0x4A
-#define CLASS_PSYCHIC_2 0x4B
-#define CLASS_ROCKER 0x4C
-#define CLASS_JUGGLER 0x4D
-#define CLASS_TAMER 0x4E
-#define CLASS_BIRD_KEEPER_2 0x4F
-#define CLASS_BLACK_BELT_2 0x50
-#define CLASS_RIVAL 0x51
-#define CLASS_SCIENTIST 0x52
-#define CLASS_BOSS 0x53
-#define CLASS_LEADER_2 0x54
-#define CLASS_TEAM_ROCKET 0x55
-#define CLASS_COOLTRAINER_2 0x56
-#define CLASS_ELITE_FOUR_2 0x57
-#define CLASS_GENTLEMAN_2 0x58
-#define CLASS_RIVAL_2 0x59
-#define CLASS_CHAMPION_2 0x5A
-#define CLASS_CHANNELER 0x5B
-#define CLASS_TWINS_2 0x5C
-#define CLASS_COOL_COUPLE 0x5D
-#define CLASS_YOUNG_COUPLE_2 0x5E
-#define CLASS_CRUSH_KIN 0x5F
-#define CLASS_SIS_AND_BRO_2 0x60
-#define CLASS_PKMN_PROF 0x61
-#define CLASS_PLAYER 0x62
-#define CLASS_CRUSH_GIRL 0x63
-#define CLASS_TUBER_3 0x64
-#define CLASS_PKMN_BREEDER_2 0x65
-#define CLASS_PKMN_RANGER_2 0x66
-#define CLASS_AROMA_LADY_2 0x67
-#define CLASS_RUIN_MANIAC_2 0x68
-#define CLASS_LADY_2 0x69
-#define CLASS_PAINTER 0x6A
-
-#endif // GUARD_TRAINER_CLASSES_H
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index cc62fbcbe..9563bf8b4 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -25,7 +25,7 @@
 #define TRAINER_PIC_RS_RUIN_MANIAC          4
 #define TRAINER_PIC_INTERVIEWER             5
 #define TRAINER_PIC_RS_TUBER_F              6
-#define TRAINER_PIC_TUBER_M                 7
+#define TRAINER_PIC_RS_TUBER_M              7
 #define TRAINER_PIC_RS_COOLTRAINER_M        8
 #define TRAINER_PIC_RS_COOLTRAINER_F        9
 #define TRAINER_PIC_HEX_MANIAC             10
@@ -76,7 +76,7 @@
 #define TRAINER_PIC_WALLY                  55
 #define TRAINER_PIC_RS_BRENDAN_1           56
 #define TRAINER_PIC_RS_MAY_1               57
-#define TRAINER_PIC_POKEMON_BREEDER_M      58
+#define TRAINER_PIC_RS_POKEMON_BREEDER_M   58
 #define TRAINER_PIC_RS_POKEMON_BREEDER_F   59
 #define TRAINER_PIC_RS_POKEMON_RANGER_M    60
 #define TRAINER_PIC_RS_POKEMON_RANGER_F    61
@@ -124,7 +124,7 @@
 #define TRAINER_PIC_TAMER                 103
 #define TRAINER_PIC_BIRD_KEEPER           104
 #define TRAINER_PIC_BLACK_BELT            105
-#define TRAINER_PIC_RIVAL_1               106
+#define TRAINER_PIC_RIVAL_EARLY           106
 #define TRAINER_PIC_SCIENTIST             107
 #define TRAINER_PIC_LEADER_GIOVANNI       108
 #define TRAINER_PIC_ROCKET_GRUNT_M        109
@@ -142,7 +142,7 @@
 #define TRAINER_PIC_LEADER_BLAINE         121
 #define TRAINER_PIC_LEADER_SABRINA        122
 #define TRAINER_PIC_GENTLEMAN             123
-#define TRAINER_PIC_RIVAL_2               124
+#define TRAINER_PIC_RIVAL_LATE            124
 #define TRAINER_PIC_CHAMPION_RIVAL        125
 #define TRAINER_PIC_CHANNELER             126
 #define TRAINER_PIC_TWINS                 127
@@ -159,7 +159,7 @@
 #define TRAINER_PIC_PSYCHIC_F             138
 #define TRAINER_PIC_CRUSH_GIRL            139
 #define TRAINER_PIC_TUBER_F               140
-#define TRAINER_PIC_POKEMON_BREEDER_F     141
+#define TRAINER_PIC_POKEMON_BREEDER       141
 #define TRAINER_PIC_POKEMON_RANGER_M      142
 #define TRAINER_PIC_POKEMON_RANGER_F      143
 #define TRAINER_PIC_AROMA_LADY            144
@@ -170,6 +170,265 @@
 // Leftover from R/S
 #define TRAINER_SECRET_BASE                 1024
 
+#define TRAINER_CLASS_NONE                0
+#define TRAINER_CLASS_PKMN_TRAINER_UNUSED 1
+#define TRAINER_CLASS_AQUA_LEADER         2
+#define TRAINER_CLASS_TEAM_AQUA           3
+#define TRAINER_CLASS_RS_AROMA_LADY       4
+#define TRAINER_CLASS_RS_RUIN_MANIAC      5
+#define TRAINER_CLASS_INTERVIEWER         6
+#define TRAINER_CLASS_RS_TUBER_F          7
+#define TRAINER_CLASS_RS_TUBER_M          8
+#define TRAINER_CLASS_RS_COOLTRAINER      9
+#define TRAINER_CLASS_HEX_MANIAC          10
+#define TRAINER_CLASS_RS_LADY             11
+#define TRAINER_CLASS_RS_BEAUTY           12
+#define TRAINER_CLASS_RICH_BOY            13
+#define TRAINER_CLASS_RS_POKEMANIAC       14
+#define TRAINER_CLASS_RS_SWIMMER_M        15
+#define TRAINER_CLASS_RS_BLACK_BELT       16
+#define TRAINER_CLASS_GUITARIST           17
+#define TRAINER_CLASS_KINDLER             18
+#define TRAINER_CLASS_RS_CAMPER           19
+#define TRAINER_CLASS_BUG_MANIAC          20
+#define TRAINER_CLASS_RS_PSYCHIC          21
+#define TRAINER_CLASS_RS_GENTLEMAN        22
+#define TRAINER_CLASS_RS_ELITE_FOUR       23
+#define TRAINER_CLASS_RS_LEADER           24
+#define TRAINER_CLASS_SCHOOL_KID          25
+#define TRAINER_CLASS_SR_AND_JR           26
+#define TRAINER_CLASS_POKEFAN             27
+#define TRAINER_CLASS_EXPERT              28
+#define TRAINER_CLASS_RS_YOUNGSTER        29
+#define TRAINER_CLASS_RS_CHAMPION         30
+#define TRAINER_CLASS_RS_FISHERMAN        31
+#define TRAINER_CLASS_TRIATHLETE          32
+#define TRAINER_CLASS_DRAGON_TAMER        33
+#define TRAINER_CLASS_RS_BIRD_KEEPER      34
+#define TRAINER_CLASS_NINJA_BOY           35
+#define TRAINER_CLASS_BATTLE_GIRL         36
+#define TRAINER_CLASS_PARASOL_LADY        37
+#define TRAINER_CLASS_RS_SWIMMER_F        38
+#define TRAINER_CLASS_RS_PICNICKER        39
+#define TRAINER_CLASS_RS_TWINS            40
+#define TRAINER_CLASS_RS_SAILOR           41
+#define TRAINER_CLASS_BOARDER             42
+#define TRAINER_CLASS_COLLECTOR           43
+#define TRAINER_CLASS_PKMN_TRAINER        44
+#define TRAINER_CLASS_RS_PKMN_BREEDER     45
+#define TRAINER_CLASS_RS_PKMN_RANGER      46
+#define TRAINER_CLASS_MAGMA_LEADER        47
+#define TRAINER_CLASS_TEAM_MAGMA          48
+#define TRAINER_CLASS_RS_LASS             49
+#define TRAINER_CLASS_RS_BUG_CATCHER      50
+#define TRAINER_CLASS_RS_HIKER            51
+#define TRAINER_CLASS_RS_YOUNG_COUPLE     52
+#define TRAINER_CLASS_OLD_COUPLE          53
+#define TRAINER_CLASS_RS_SIS_AND_BRO      54
+#define TRAINER_CLASS_AQUA_ADMIN          55
+#define TRAINER_CLASS_MAGMA_ADMIN         56
+#define TRAINER_CLASS_YOUNGSTER           57
+#define TRAINER_CLASS_BUG_CATCHER         58
+#define TRAINER_CLASS_LASS                59
+#define TRAINER_CLASS_SAILOR              60
+#define TRAINER_CLASS_CAMPER              61
+#define TRAINER_CLASS_PICNICKER           62
+#define TRAINER_CLASS_POKEMANIAC          63
+#define TRAINER_CLASS_SUPER_NERD          64
+#define TRAINER_CLASS_HIKER               65
+#define TRAINER_CLASS_BIKER               66
+#define TRAINER_CLASS_BURGLAR             67
+#define TRAINER_CLASS_ENGINEER            68
+#define TRAINER_CLASS_FISHERMAN           69
+#define TRAINER_CLASS_SWIMMER_M           70
+#define TRAINER_CLASS_CUE_BALL            71
+#define TRAINER_CLASS_GAMER               72
+#define TRAINER_CLASS_BEAUTY              73
+#define TRAINER_CLASS_SWIMMER_F           74
+#define TRAINER_CLASS_PSYCHIC             75
+#define TRAINER_CLASS_ROCKER              76
+#define TRAINER_CLASS_JUGGLER             77
+#define TRAINER_CLASS_TAMER               78
+#define TRAINER_CLASS_BIRD_KEEPER         79
+#define TRAINER_CLASS_BLACK_BELT          80
+#define TRAINER_CLASS_RIVAL_EARLY         81
+#define TRAINER_CLASS_SCIENTIST           82
+#define TRAINER_CLASS_BOSS                83
+#define TRAINER_CLASS_LEADER              84
+#define TRAINER_CLASS_TEAM_ROCKET         85
+#define TRAINER_CLASS_COOLTRAINER         86
+#define TRAINER_CLASS_ELITE_FOUR          87
+#define TRAINER_CLASS_GENTLEMAN           88
+#define TRAINER_CLASS_RIVAL_LATE          89
+#define TRAINER_CLASS_CHAMPION            90
+#define TRAINER_CLASS_CHANNELER           91
+#define TRAINER_CLASS_TWINS               92
+#define TRAINER_CLASS_COOL_COUPLE         93
+#define TRAINER_CLASS_YOUNG_COUPLE        94
+#define TRAINER_CLASS_CRUSH_KIN           95
+#define TRAINER_CLASS_SIS_AND_BRO         96
+#define TRAINER_CLASS_PKMN_PROF           97
+#define TRAINER_CLASS_PLAYER              98
+#define TRAINER_CLASS_CRUSH_GIRL          99
+#define TRAINER_CLASS_TUBER               100
+#define TRAINER_CLASS_PKMN_BREEDER        101
+#define TRAINER_CLASS_PKMN_RANGER         102
+#define TRAINER_CLASS_AROMA_LADY          103
+#define TRAINER_CLASS_RUIN_MANIAC         104
+#define TRAINER_CLASS_LADY                105
+#define TRAINER_CLASS_PAINTER             106
+
+#define FACILITY_CLASS_AQUA_LEADER_ARCHIE     0
+#define FACILITY_CLASS_AQUA_GRUNT_M           1
+#define FACILITY_CLASS_AQUA_GRUNT_F           2
+#define FACILITY_CLASS_RS_AROMA_LADY          3
+#define FACILITY_CLASS_RS_RUIN_MANIAC         4
+#define FACILITY_CLASS_INTERVIEWER            5
+#define FACILITY_CLASS_RS_TUBER_F             6
+#define FACILITY_CLASS_RS_TUBER_M             7
+#define FACILITY_CLASS_RS_COOLTRAINER_M       8
+#define FACILITY_CLASS_RS_COOLTRAINER_F       9
+#define FACILITY_CLASS_HEX_MANIAC             10
+#define FACILITY_CLASS_RS_LADY                11
+#define FACILITY_CLASS_RS_BEAUTY              12
+#define FACILITY_CLASS_RICH_BOY               13
+#define FACILITY_CLASS_RS_POKEMANIAC          14
+#define FACILITY_CLASS_RS_SWIMMER_M           15
+#define FACILITY_CLASS_RS_BLACK_BELT          16
+#define FACILITY_CLASS_GUITARIST              17
+#define FACILITY_CLASS_KINDLER                18
+#define FACILITY_CLASS_RS_CAMPER              19
+#define FACILITY_CLASS_BUG_MANIAC             20
+#define FACILITY_CLASS_RS_PSYCHIC_M           21
+#define FACILITY_CLASS_RS_PSYCHIC_F           22
+#define FACILITY_CLASS_RS_GENTLEMAN           23
+#define FACILITY_CLASS_ELITE_FOUR_SIDNEY      24
+#define FACILITY_CLASS_ELITE_FOUR_PHOEBE      25
+#define FACILITY_CLASS_LEADER_ROXANNE         26
+#define FACILITY_CLASS_LEADER_BRAWLY          27
+#define FACILITY_CLASS_LEADER_TATE_AND_LIZA   28
+#define FACILITY_CLASS_SCHOOL_KID_M           29
+#define FACILITY_CLASS_SCHOOL_KID_F           30
+#define FACILITY_CLASS_SR_AND_JR              31
+#define FACILITY_CLASS_POKEFAN_M              32
+#define FACILITY_CLASS_POKEFAN_F              33
+#define FACILITY_CLASS_EXPERT_M               34
+#define FACILITY_CLASS_EXPERT_F               35
+#define FACILITY_CLASS_RS_YOUNGSTER           36
+#define FACILITY_CLASS_CHAMPION_STEVEN        37
+#define FACILITY_CLASS_RS_FISHERMAN           38
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_M   39
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_F   40
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_M   41
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_F   42
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M  43
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F  44
+#define FACILITY_CLASS_DRAGON_TAMER           45
+#define FACILITY_CLASS_RS_BIRD_KEEPER         46
+#define FACILITY_CLASS_NINJA_BOY              47
+#define FACILITY_CLASS_BATTLE_GIRL            48
+#define FACILITY_CLASS_PARASOL_LADY           49
+#define FACILITY_CLASS_RS_SWIMMER_F           50
+#define FACILITY_CLASS_RS_PICNICKER           51
+#define FACILITY_CLASS_RS_TWINS               52
+#define FACILITY_CLASS_RS_SAILOR              53
+#define FACILITY_CLASS_BOARDER_M              54
+#define FACILITY_CLASS_BOARDER_F              55
+#define FACILITY_CLASS_COLLECTOR              56
+#define FACILITY_CLASS_PKMN_TRAINER_WALLY     57
+#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN   58
+#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 59
+#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 60
+#define FACILITY_CLASS_PKMN_TRAINER_MAY       61
+#define FACILITY_CLASS_PKMN_TRAINER_MAY_2     62
+#define FACILITY_CLASS_PKMN_TRAINER_MAY_3     63
+#define FACILITY_CLASS_RS_PKMN_BREEDER_M      64
+#define FACILITY_CLASS_RS_PKMN_BREEDER_F      65
+#define FACILITY_CLASS_RS_PKMN_RANGER_M       66
+#define FACILITY_CLASS_RS_PKMN_RANGER_F       67
+#define FACILITY_CLASS_MAGMA_LEADER_MAXIE     68
+#define FACILITY_CLASS_MAGMA_GRUNT_M          69
+#define FACILITY_CLASS_MAGMA_GRUNT_F          70
+#define FACILITY_CLASS_RS_LASS                71
+#define FACILITY_CLASS_RS_BUG_CATCHER         72
+#define FACILITY_CLASS_RS_HIKER               73
+#define FACILITY_CLASS_RS_YOUNG_COUPLE        74
+#define FACILITY_CLASS_OLD_COUPLE             75
+#define FACILITY_CLASS_RS_SIS_AND_BRO         76
+#define FACILITY_CLASS_AQUA_ADMIN_M           77
+#define FACILITY_CLASS_AQUA_ADMIN_F           78
+#define FACILITY_CLASS_MAGMA_ADMIN_M          79
+#define FACILITY_CLASS_MAGMA_ADMIN_F          80
+#define FACILITY_CLASS_LEADER_WATTSON         81
+#define FACILITY_CLASS_LEADER_FLANNERY        82
+#define FACILITY_CLASS_LEADER_NORMAN          83
+#define FACILITY_CLASS_LEADER_WINONA          84
+#define FACILITY_CLASS_LEADER_WALLACE         85
+#define FACILITY_CLASS_ELITE_FOUR_GLACIA      86
+#define FACILITY_CLASS_ELITE_FOUR_DRAKE       87
+#define FACILITY_CLASS_YOUNGSTER              88
+#define FACILITY_CLASS_BUG_CATCHER            89
+#define FACILITY_CLASS_LASS                   90
+#define FACILITY_CLASS_SAILOR                 91
+#define FACILITY_CLASS_CAMPER                 92
+#define FACILITY_CLASS_PICNICKER              93
+#define FACILITY_CLASS_POKEMANIAC             94
+#define FACILITY_CLASS_SUPER_NERD             95
+#define FACILITY_CLASS_HIKER                  96
+#define FACILITY_CLASS_BIKER                  97
+#define FACILITY_CLASS_BURGLAR                98
+#define FACILITY_CLASS_ENGINEER               99
+#define FACILITY_CLASS_FISHERMAN              100
+#define FACILITY_CLASS_SWIMMER_M              101
+#define FACILITY_CLASS_CUE_BALL               102
+#define FACILITY_CLASS_GAMER                  103
+#define FACILITY_CLASS_BEAUTY                 104
+#define FACILITY_CLASS_SWIMMER_F              105
+#define FACILITY_CLASS_PSYCHIC_M              106
+#define FACILITY_CLASS_ROCKER                 107
+#define FACILITY_CLASS_JUGGLER                108
+#define FACILITY_CLASS_TAMER                  109
+#define FACILITY_CLASS_BIRD_KEEPER            110
+#define FACILITY_CLASS_BLACK_BELT             111
+#define FACILITY_CLASS_RIVAL_EARLY            112
+#define FACILITY_CLASS_SCIENTIST              113
+#define FACILITY_CLASS_BOSS                   114
+#define FACILITY_CLASS_ROCKET_GRUNT_M         115
+#define FACILITY_CLASS_COOLTRAINER_M          116
+#define FACILITY_CLASS_COOLTRAINER_F          117
+#define FACILITY_CLASS_ELITE_FOUR_LORELEI     118
+#define FACILITY_CLASS_ELITE_FOUR_BRUNO       119
+#define FACILITY_CLASS_LEADER_M               120
+#define FACILITY_CLASS_LEADER_F               121
+#define FACILITY_CLASS_GENTLEMAN              122
+#define FACILITY_CLASS_RIVAL_LATE             123
+#define FACILITY_CLASS_CHAMPION_RIVAL         124
+#define FACILITY_CLASS_CHANNELER              125
+#define FACILITY_CLASS_TWINS                  126
+#define FACILITY_CLASS_COOL_COUPLE            127
+#define FACILITY_CLASS_YOUNG_COUPLE           128
+#define FACILITY_CLASS_CRUSH_KIN              129
+#define FACILITY_CLASS_SIS_AND_BRO            130
+#define FACILITY_CLASS_PKMN_PROF              131
+#define FACILITY_CLASS_BRENDAN                132
+#define FACILITY_CLASS_MAY                    133
+#define FACILITY_CLASS_RED                    134
+#define FACILITY_CLASS_LEAF                   135
+#define FACILITY_CLASS_ROCKET_GRUNT_F         136
+#define FACILITY_CLASS_PSYCHIC_F              137
+#define FACILITY_CLASS_CRUSH_GIRL             138
+#define FACILITY_CLASS_TUBER                  139
+#define FACILITY_CLASS_PKMN_BREEDER           140
+#define FACILITY_CLASS_PKMN_RANGER_M          141
+#define FACILITY_CLASS_PKMN_RANGER_F          142
+#define FACILITY_CLASS_AROMA_LADY             143
+#define FACILITY_CLASS_RUIN_MANIAC            144
+#define FACILITY_CLASS_LADY                   145
+#define FACILITY_CLASS_PAINTER                146
+#define FACILITY_CLASS_ELITE_FOUR_AGATHA      147
+#define FACILITY_CLASS_ELITE_FOUR_LANCE       148
+#define FACILITY_CLASS_CHAMPION_RIVAL_2       149
+
 #define F_TRAINER_FEMALE (1 << 7)
 
 // All trainer parties specify the IV, level, and species for each Pokémon in the
diff --git a/include/graphics.h b/include/graphics.h
index a92b798ae..ded24bd7b 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2501,7 +2501,7 @@ extern const u32 gTrainerFrontPic_Collector[];
 extern const u32 gTrainerFrontPic_Wally[];
 extern const u32 gTrainerFrontPic_RSBrendan1[];
 extern const u32 gTrainerFrontPic_RSMay1[];
-extern const u32 gTrainerFrontPic_PokemonBreederM[];
+extern const u32 gTrainerFrontPic_RSPokemonBreederM[];
 extern const u32 gTrainerFrontPic_RSPokemonBreederF[];
 extern const u32 gTrainerFrontPic_RSPokemonRangerM[];
 extern const u32 gTrainerFrontPic_RSPokemonRangerF[];
@@ -2549,7 +2549,7 @@ extern const u32 gTrainerFrontPic_Juggler[];
 extern const u32 gTrainerFrontPic_Tamer[];
 extern const u32 gTrainerFrontPic_BirdKeeper[];
 extern const u32 gTrainerFrontPic_BlackBelt[];
-extern const u32 gTrainerFrontPic_Rival1[];
+extern const u32 gTrainerFrontPic_RivalEarly[];
 extern const u32 gTrainerFrontPic_Scientist[];
 extern const u32 gTrainerFrontPic_LeaderGiovanni[];
 extern const u32 gTrainerFrontPic_RocketGruntM[];
@@ -2567,7 +2567,7 @@ extern const u32 gTrainerFrontPic_LeaderKoga[];
 extern const u32 gTrainerFrontPic_LeaderBlaine[];
 extern const u32 gTrainerFrontPic_LeaderSabrina[];
 extern const u32 gTrainerFrontPic_Gentleman[];
-extern const u32 gTrainerFrontPic_Rival2[];
+extern const u32 gTrainerFrontPic_RivalLate[];
 extern const u32 gTrainerFrontPic_ChampionRival[];
 extern const u32 gTrainerFrontPic_Channeler[];
 extern const u32 gTrainerFrontPic_Twins[];
@@ -2584,7 +2584,7 @@ extern const u32 gTrainerFrontPic_RocketGruntF[];
 extern const u32 gTrainerFrontPic_PsychicF[];
 extern const u32 gTrainerFrontPic_CrushGirl[];
 extern const u32 gTrainerFrontPic_TuberF[];
-extern const u32 gTrainerFrontPic_PokemonBreederF[];
+extern const u32 gTrainerFrontPic_PokemonBreeder[];
 extern const u32 gTrainerFrontPic_PokemonRangerM[];
 extern const u32 gTrainerFrontPic_PokemonRangerF[];
 extern const u32 gTrainerFrontPic_AromaLady[];
@@ -2654,7 +2654,7 @@ extern const u32 gTrainerPalette_LeafBackPic[];
 extern const u32 gTrainerPalette_RedBackPic[];
 extern const u32 gTrainerPalette_PokedudeBackPic[];
 extern const u32 gTrainerPalette_OldManBackPic[];
-extern const u32 gTrainerPalette_PokemonBreederM[];
+extern const u32 gTrainerPalette_RSPokemonBreederM[];
 extern const u32 gTrainerPalette_RSPokemonBreederF[];
 extern const u32 gTrainerPalette_RSPokemonRangerM[];
 extern const u32 gTrainerPalette_RSPokemonRangerF[];
@@ -2702,7 +2702,7 @@ extern const u32 gTrainerPalette_Juggler[];
 extern const u32 gTrainerPalette_Tamer[];
 extern const u32 gTrainerPalette_BirdKeeper[];
 extern const u32 gTrainerPalette_BlackBelt[];
-extern const u32 gTrainerPalette_Rival1[];
+extern const u32 gTrainerPalette_RivalEarly[];
 extern const u32 gTrainerPalette_Scientist[];
 extern const u32 gTrainerPalette_LeaderGiovanni[];
 extern const u32 gTrainerPalette_RocketGruntM[];
@@ -2720,7 +2720,7 @@ extern const u32 gTrainerPalette_LeaderKoga[];
 extern const u32 gTrainerPalette_LeaderBlaine[];
 extern const u32 gTrainerPalette_LeaderSabrina[];
 extern const u32 gTrainerPalette_Gentleman[];
-extern const u32 gTrainerPalette_Rival2[];
+extern const u32 gTrainerPalette_RivalLate[];
 extern const u32 gTrainerPalette_ChampionRival[];
 extern const u32 gTrainerPalette_Channeler[];
 extern const u32 gTrainerPalette_Twins[];
@@ -2737,7 +2737,7 @@ extern const u32 gTrainerPalette_RocketGruntF[];
 extern const u32 gTrainerPalette_PsychicF[];
 extern const u32 gTrainerPalette_CrushGirl[];
 extern const u32 gTrainerPalette_TuberF[];
-extern const u32 gTrainerPalette_PokemonBreederF[];
+extern const u32 gTrainerPalette_PokemonBreeder[];
 extern const u32 gTrainerPalette_PokemonRangerM[];
 extern const u32 gTrainerPalette_PokemonRangerF[];
 extern const u32 gTrainerPalette_AromaLady[];