Merge pull request #481 from GriffinRichards/sync-classes

Sync/update trainer classes
2022-01-21 19:26:14 -05:00
commit bef2668d8b
@@ -11,7 +11,6 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "constants/trainer_classes.h"
 #include "constants/vars.h"
 #include "constants/battle.h"
 #include "constants/heal_locations.h"
@@ -1,107 +0,0 @@
-	.string "{PKMN} TRAINER$", 13
-	.string "{PKMN} TRAINER$", 13
-	.string "AQUA LEADER$", 13
-	.string "TEAM AQUA$", 13
-	.string "AROMA LADY$", 13
-	.string "RUIN MANIAC$", 13
-	.string "INTERVIEWER$", 13
-	.string "TUBER$", 13
-	.string "TUBER$", 13
-	.string "COOLTRAINER$", 13
-	.string "HEX MANIAC$", 13
-	.string "LADY$", 13
-	.string "BEAUTY$", 13
-	.string "RICH BOY$", 13
-	.string "POKéMANIAC$", 13
-	.string "SWIMMER♂$", 13
-	.string "BLACK BELT$", 13
-	.string "GUITARIST$", 13
-	.string "KINDLER$", 13
-	.string "CAMPER$", 13
-	.string "BUG MANIAC$", 13
-	.string "PSYCHIC$", 13
-	.string "GENTLEMAN$", 13
-	.string "ELITE FOUR$", 13
-	.string "LEADER$", 13
-	.string "SCHOOL KID$", 13
-	.string "SR. AND JR.$", 13
-	.string "POKéFAN$", 13
-	.string "EXPERT$", 13
-	.string "YOUNGSTER$", 13
-	.string "CHAMPION$", 13
-	.string "FISHERMAN$", 13
-	.string "TRIATHLETE$", 13
-	.string "DRAGON TAMER$", 13
-	.string "BIRD KEEPER$", 13
-	.string "NINJA BOY$", 13
-	.string "BATTLE GIRL$", 13
-	.string "PARASOL LADY$", 13
-	.string "SWIMMER♀$", 13
-	.string "PICNICKER$", 13
-	.string "TWINS$", 13
-	.string "SAILOR$", 13
-	.string "BOARDER$", 13
-	.string "COLLECTOR$", 13
-	.string "{PKMN} TRAINER$", 13
-	.string "{PKMN} BREEDER$", 13
-	.string "{PKMN} RANGER$", 13
-	.string "MAGMA LEADER$", 13
-	.string "TEAM MAGMA$", 13
-	.string "LASS$", 13
-	.string "BUG CATCHER$", 13
-	.string "HIKER$", 13
-	.string "YOUNG COUPLE$", 13
-	.string "OLD COUPLE$", 13
-	.string "SIS AND BRO$", 13
-	.string "AQUA ADMIN$", 13
-	.string "MAGMA ADMIN$", 13
-	.string "YOUNGSTER$", 13
-	.string "BUG CATCHER$", 13
-	.string "LASS$", 13
-	.string "SAILOR$", 13
-	.string "CAMPER$", 13
-	.string "PICNICKER$", 13
-	.string "POKéMANIAC$", 13
-	.string "SUPER NERD$", 13
-	.string "HIKER$", 13
-	.string "BIKER$", 13
-	.string "BURGLAR$", 13
-	.string "ENGINEER$", 13
-	.string "FISHERMAN$", 13
-	.string "SWIMMER♂$", 13
-	.string "CUE BALL$", 13
-	.string "GAMER$", 13
-	.string "BEAUTY$", 13
-	.string "SWIMMER♀$", 13
-	.string "PSYCHIC$", 13
-	.string "ROCKER$", 13
-	.string "JUGGLER$", 13
-	.string "TAMER$", 13
-	.string "BIRD KEEPER$", 13
-	.string "BLACK BELT$", 13
-	.string "RIVAL$", 13
-	.string "SCIENTIST$", 13
-	.string "BOSS$", 13
-	.string "LEADER$", 13
-	.string "TEAM ROCKET$", 13
-	.string "COOLTRAINER$", 13
-	.string "ELITE FOUR$", 13
-	.string "GENTLEMAN$", 13
-	.string "RIVAL$", 13
-	.string "CHAMPION$", 13
-	.string "CHANNELER$", 13
-	.string "TWINS$", 13
-	.string "COOL COUPLE$", 13
-	.string "YOUNG COUPLE$", 13
-	.string "CRUSH KIN$", 13
-	.string "SIS AND BRO$", 13
-	.string "{PKMN} PROF.$", 13
-	.string "PLAYER$", 13
-	.string "CRUSH GIRL$", 13
-	.string "TUBER$", 13
-	.string "{PKMN} BREEDER$", 13
-	.string "{PKMN} RANGER$", 13
-	.string "AROMA LADY$", 13
-	.string "RUIN MANIAC$", 13
-	.string "LADY$", 13
-	.string "PAINTER$", 13
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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[];
@@ -12,7 +12,7 @@
 #include "trig.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 #define TAG_VS_LETTERS 10000

@@ -992,12 +992,12 @@ void DrawBattleEntryBackground(void)
        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
        {
            u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-            if (trainerClass == CLASS_LEADER_2)
+            if (trainerClass == TRAINER_CLASS_LEADER)
            {
                LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING);
                return;
            }
-            else if (trainerClass == CLASS_CHAMPION_2)
+            else if (trainerClass == TRAINER_CLASS_CHAMPION)
            {
                LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING);
                return;
@@ -1029,14 +1029,10 @@ static u8 GetBattleTerrainOverride(void)
    }
    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
    {
-        if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER_2)
-        {
+        if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER)
            return BATTLE_TERRAIN_LEADER;
-        }
-        else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2)
-        {
+        else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)
            return BATTLE_TERRAIN_CHAMPION;
-        }
    }
    battleScene = GetCurrentMapBattleScene();
    if (battleScene == MAP_BATTLE_SCENE_NORMAL)
@@ -13,7 +13,7 @@
 #include "battle_message.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
-#include "constants/facility_trainer_classes.h"
+#include "constants/trainers.h"

 static void LinkOpponentHandleGetMonData(void);
 static void LinkOpponentHandleGetRawMonData(void);
@@ -1117,9 +1117,9 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_EMERALD)
        {
            if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_5];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY];
            else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_2];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN];
        }
        else if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
        {
@@ -1142,9 +1142,9 @@ static void LinkOpponentHandleDrawTrainerPic(void)
              || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_EMERALD)
        {
            if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_5];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY];
            else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_2];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN];
        }
        else if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
        {
@@ -42,7 +42,7 @@
 #include "constants/moves.h"
 #include "constants/pokemon.h"
 #include "constants/songs.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 static void SpriteCB_UnusedDebugSprite(struct Sprite *sprite);
 static void HandleAction_UseMove(void);
@@ -450,110 +450,110 @@ const u8 gTypeNames[][TYPE_NAME_LENGTH + 1] =
 // This is a factor in how much money you get for beating a trainer.
 const struct TrainerMoney gTrainerMoneyTable[] =
 {
-    { CLASS_LEADER_2, 25 },
-    { CLASS_ELITE_FOUR_2, 25 },
-    { CLASS_PKMN_PROF, 25 },
-    { CLASS_RIVAL, 4 },
-    { CLASS_RIVAL_2, 9 },
-    { CLASS_CHAMPION_2, 25 },
-    { CLASS_YOUNGSTER_2, 4 },
-    { CLASS_BUG_CATCHER_2, 3 },
-    { CLASS_HIKER_2, 9 },
-    { CLASS_BIRD_KEEPER_2, 6 },
-    { CLASS_PICNICKER_2, 5 },
-    { CLASS_SUPER_NERD, 6 },
-    { CLASS_FISHERMAN_2, 9 },
-    { CLASS_TEAM_ROCKET, 8 },
-    { CLASS_LASS_2, 4 },
-    { CLASS_BEAUTY_2, 18 },
-    { CLASS_BLACK_BELT_2, 6 },
-    { CLASS_CUE_BALL, 6 },
-    { CLASS_CHANNELER, 8 },
-    { CLASS_ROCKER, 6 },
-    { CLASS_GENTLEMAN_2, 18 },
-    { CLASS_BURGLAR, 22 },
-    { CLASS_SWIMMER_MALE_2, 1 },
-    { CLASS_ENGINEER, 12 },
-    { CLASS_JUGGLER, 10 },
-    { CLASS_SAILOR_2, 8 },
-    { CLASS_COOLTRAINER_2, 9 },
-    { CLASS_POKEMANIAC_2, 12 },
-    { CLASS_TAMER, 10 },
-    { CLASS_CAMPER_2, 5 },
-    { CLASS_PSYCHIC_2, 5 },
-    { CLASS_BIKER, 5 },
-    { CLASS_GAMER, 18 },
-    { CLASS_SCIENTIST, 12 },
-    { CLASS_CRUSH_GIRL, 6 },
-    { CLASS_TUBER_3, 1 },
-    { CLASS_PKMN_BREEDER_2, 7 },
-    { CLASS_PKMN_RANGER_2, 9 },
-    { CLASS_AROMA_LADY_2, 7 },
-    { CLASS_RUIN_MANIAC_2, 12 },
-    { CLASS_LADY_2, 50 },
-    { CLASS_PAINTER, 4 },
-    { CLASS_TWINS_2, 3 },
-    { CLASS_YOUNG_COUPLE_2, 7 },
-    { CLASS_SIS_AND_BRO_2, 1 },
-    { CLASS_COOL_COUPLE, 6 },
-    { CLASS_CRUSH_KIN, 6 },
-    { CLASS_SWIMMER_FEMALE_2, 1 },
-    { CLASS_PLAYER, 1 },
-    { CLASS_LEADER, 25 },
-    { CLASS_ELITE_FOUR, 25 },
-    { CLASS_LASS, 4 },
-    { CLASS_YOUNGSTER, 4 },
-    { CLASS_PKMN_TRAINER_3, 15 },
-    { CLASS_HIKER, 10 },
-    { CLASS_BEAUTY, 20 },
-    { CLASS_FISHERMAN, 10 },
-    { CLASS_LADY, 50 },
-    { CLASS_TRIATHLETE, 10 },
-    { CLASS_TEAM_AQUA, 5 },
-    { CLASS_TWINS, 3 },
-    { CLASS_SWIMMER_FEMALE, 2 },
-    { CLASS_BUG_CATCHER, 4 },
-    { CLASS_SCHOOL_KID, 5 },
-    { CLASS_RICH_BOY, 50 },
-    { CLASS_SR_AND_JR, 4 },
-    { CLASS_BLACK_BELT, 8 },
-    { CLASS_TUBER, 1 },
-    { CLASS_HEX_MANIAC, 6 },
-    { CLASS_PKMN_BREEDER, 10 },
-    { CLASS_TEAM_MAGMA, 5 },
-    { CLASS_INTERVIEWER, 12 },
-    { CLASS_TUBER_2, 1 },
-    { CLASS_YOUNG_COUPLE, 8 },
-    { CLASS_GUITARIST, 8 },
-    { CLASS_GENTLEMAN, 20 },
-    { CLASS_CHAMPION, 50 },
-    { CLASS_MAGMA_LEADER, 20 },
-    { CLASS_BATTLE_GIRL, 6 },
-    { CLASS_SWIMMER_MALE, 2 },
-    { CLASS_POKEFAN, 20 },
-    { CLASS_EXPERT, 10 },
-    { CLASS_DRAGON_TAMER, 12 },
-    { CLASS_BIRD_KEEPER, 8 },
-    { CLASS_NINJA_BOY, 3 },
-    { CLASS_PARASOL_LADY, 10 },
-    { CLASS_BUG_MANIAC, 15 },
-    { CLASS_SAILOR, 8 },
-    { CLASS_COLLECTOR, 15 },
-    { CLASS_PKMN_RANGER, 12 },
-    { CLASS_MAGMA_ADMIN, 10 },
-    { CLASS_AROMA_LADY, 10 },
-    { CLASS_RUIN_MANIAC, 15 },
-    { CLASS_COOLTRAINER, 12 },
-    { CLASS_POKEMANIAC, 15 },
-    { CLASS_KINDLER, 8 },
-    { CLASS_CAMPER, 4 },
-    { CLASS_PICNICKER, 4 },
-    { CLASS_PSYCHIC, 6 },
-    { CLASS_SIS_AND_BRO, 3 },
-    { CLASS_OLD_COUPLE, 10 },
-    { CLASS_AQUA_ADMIN, 10 },
-    { CLASS_AQUA_LEADER, 20 },
-    { CLASS_BOSS, 25 },
+    { TRAINER_CLASS_LEADER, 25 },
+    { TRAINER_CLASS_ELITE_FOUR, 25 },
+    { TRAINER_CLASS_PKMN_PROF, 25 },
+    { TRAINER_CLASS_RIVAL_EARLY, 4 },
+    { TRAINER_CLASS_RIVAL_LATE, 9 },
+    { TRAINER_CLASS_CHAMPION, 25 },
+    { TRAINER_CLASS_YOUNGSTER, 4 },
+    { TRAINER_CLASS_BUG_CATCHER, 3 },
+    { TRAINER_CLASS_HIKER, 9 },
+    { TRAINER_CLASS_BIRD_KEEPER, 6 },
+    { TRAINER_CLASS_PICNICKER, 5 },
+    { TRAINER_CLASS_SUPER_NERD, 6 },
+    { TRAINER_CLASS_FISHERMAN, 9 },
+    { TRAINER_CLASS_TEAM_ROCKET, 8 },
+    { TRAINER_CLASS_LASS, 4 },
+    { TRAINER_CLASS_BEAUTY, 18 },
+    { TRAINER_CLASS_BLACK_BELT, 6 },
+    { TRAINER_CLASS_CUE_BALL, 6 },
+    { TRAINER_CLASS_CHANNELER, 8 },
+    { TRAINER_CLASS_ROCKER, 6 },
+    { TRAINER_CLASS_GENTLEMAN, 18 },
+    { TRAINER_CLASS_BURGLAR, 22 },
+    { TRAINER_CLASS_SWIMMER_M, 1 },
+    { TRAINER_CLASS_ENGINEER, 12 },
+    { TRAINER_CLASS_JUGGLER, 10 },
+    { TRAINER_CLASS_SAILOR, 8 },
+    { TRAINER_CLASS_COOLTRAINER, 9 },
+    { TRAINER_CLASS_POKEMANIAC, 12 },
+    { TRAINER_CLASS_TAMER, 10 },
+    { TRAINER_CLASS_CAMPER, 5 },
+    { TRAINER_CLASS_PSYCHIC, 5 },
+    { TRAINER_CLASS_BIKER, 5 },
+    { TRAINER_CLASS_GAMER, 18 },
+    { TRAINER_CLASS_SCIENTIST, 12 },
+    { TRAINER_CLASS_CRUSH_GIRL, 6 },
+    { TRAINER_CLASS_TUBER, 1 },
+    { TRAINER_CLASS_PKMN_BREEDER, 7 },
+    { TRAINER_CLASS_PKMN_RANGER, 9 },
+    { TRAINER_CLASS_AROMA_LADY, 7 },
+    { TRAINER_CLASS_RUIN_MANIAC, 12 },
+    { TRAINER_CLASS_LADY, 50 },
+    { TRAINER_CLASS_PAINTER, 4 },
+    { TRAINER_CLASS_TWINS, 3 },
+    { TRAINER_CLASS_YOUNG_COUPLE, 7 },
+    { TRAINER_CLASS_SIS_AND_BRO, 1 },
+    { TRAINER_CLASS_COOL_COUPLE, 6 },
+    { TRAINER_CLASS_CRUSH_KIN, 6 },
+    { TRAINER_CLASS_SWIMMER_F, 1 },
+    { TRAINER_CLASS_PLAYER, 1 },
+    { TRAINER_CLASS_RS_LEADER, 25 },
+    { TRAINER_CLASS_RS_ELITE_FOUR, 25 },
+    { TRAINER_CLASS_RS_LASS, 4 },
+    { TRAINER_CLASS_RS_YOUNGSTER, 4 },
+    { TRAINER_CLASS_PKMN_TRAINER, 15 },
+    { TRAINER_CLASS_RS_HIKER, 10 },
+    { TRAINER_CLASS_RS_BEAUTY, 20 },
+    { TRAINER_CLASS_RS_FISHERMAN, 10 },
+    { TRAINER_CLASS_RS_LADY, 50 },
+    { TRAINER_CLASS_TRIATHLETE, 10 },
+    { TRAINER_CLASS_TEAM_AQUA, 5 },
+    { TRAINER_CLASS_RS_TWINS, 3 },
+    { TRAINER_CLASS_RS_SWIMMER_F, 2 },
+    { TRAINER_CLASS_RS_BUG_CATCHER, 4 },
+    { TRAINER_CLASS_SCHOOL_KID, 5 },
+    { TRAINER_CLASS_RICH_BOY, 50 },
+    { TRAINER_CLASS_SR_AND_JR, 4 },
+    { TRAINER_CLASS_RS_BLACK_BELT, 8 },
+    { TRAINER_CLASS_RS_TUBER_F, 1 },
+    { TRAINER_CLASS_HEX_MANIAC, 6 },
+    { TRAINER_CLASS_RS_PKMN_BREEDER, 10 },
+    { TRAINER_CLASS_TEAM_MAGMA, 5 },
+    { TRAINER_CLASS_INTERVIEWER, 12 },
+    { TRAINER_CLASS_RS_TUBER_M, 1 },
+    { TRAINER_CLASS_RS_YOUNG_COUPLE, 8 },
+    { TRAINER_CLASS_GUITARIST, 8 },
+    { TRAINER_CLASS_RS_GENTLEMAN, 20 },
+    { TRAINER_CLASS_RS_CHAMPION, 50 },
+    { TRAINER_CLASS_MAGMA_LEADER, 20 },
+    { TRAINER_CLASS_BATTLE_GIRL, 6 },
+    { TRAINER_CLASS_RS_SWIMMER_M, 2 },
+    { TRAINER_CLASS_POKEFAN, 20 },
+    { TRAINER_CLASS_EXPERT, 10 },
+    { TRAINER_CLASS_DRAGON_TAMER, 12 },
+    { TRAINER_CLASS_RS_BIRD_KEEPER, 8 },
+    { TRAINER_CLASS_NINJA_BOY, 3 },
+    { TRAINER_CLASS_PARASOL_LADY, 10 },
+    { TRAINER_CLASS_BUG_MANIAC, 15 },
+    { TRAINER_CLASS_RS_SAILOR, 8 },
+    { TRAINER_CLASS_COLLECTOR, 15 },
+    { TRAINER_CLASS_RS_PKMN_RANGER, 12 },
+    { TRAINER_CLASS_MAGMA_ADMIN, 10 },
+    { TRAINER_CLASS_RS_AROMA_LADY, 10 },
+    { TRAINER_CLASS_RS_RUIN_MANIAC, 15 },
+    { TRAINER_CLASS_RS_COOLTRAINER, 12 },
+    { TRAINER_CLASS_RS_POKEMANIAC, 15 },
+    { TRAINER_CLASS_KINDLER, 8 },
+    { TRAINER_CLASS_RS_CAMPER, 4 },
+    { TRAINER_CLASS_RS_PICNICKER, 4 },
+    { TRAINER_CLASS_RS_PSYCHIC, 6 },
+    { TRAINER_CLASS_RS_SIS_AND_BRO, 3 },
+    { TRAINER_CLASS_OLD_COUPLE, 10 },
+    { TRAINER_CLASS_AQUA_ADMIN, 10 },
+    { TRAINER_CLASS_AQUA_LEADER, 20 },
+    { TRAINER_CLASS_BOSS, 25 },
    { 0xFF, 5 },
 };

@@ -3644,15 +3644,15 @@ static void HandleEndTurn_BattleWon(void)
        gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
        switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
        {
-        case CLASS_LEADER_2:
-        case CLASS_CHAMPION_2:
+        case TRAINER_CLASS_LEADER:
+        case TRAINER_CLASS_CHAMPION:
            PlayBGM(MUS_VICTORY_GYM_LEADER);
            break;
-        case CLASS_BOSS:
-        case CLASS_TEAM_ROCKET:
-        case CLASS_COOLTRAINER_2:
-        case CLASS_ELITE_FOUR_2:
-        case CLASS_GENTLEMAN_2:
+        case TRAINER_CLASS_BOSS:
+        case TRAINER_CLASS_TEAM_ROCKET:
+        case TRAINER_CLASS_COOLTRAINER:
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_GENTLEMAN:
        default:
            PlayBGM(MUS_VICTORY_TRAINER);
            break;
@@ -18,7 +18,7 @@
 #include "graphics.h"
 #include "constants/moves.h"
 #include "constants/items.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 struct BattleWindowText
 {
@@ -2021,9 +2021,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                }
                else
                {
-                    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL
-                     || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL_2
-                     || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2)
+                    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_EARLY
+                     || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_LATE
+                     || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)
                        toCpy = GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL);
                    else
                        toCpy = gTrainers[gTrainerBattleOpponent_A].trainerName;
@@ -31,7 +31,7 @@
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/pokemon.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 enum
 {
@@ -613,7 +613,7 @@ static u8 GetTrainerBattleTransition(void)

    if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE)
        return B_TRANSITION_BLUE;
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR)
    {
        if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI_2)
            return B_TRANSITION_LORELEI;
@@ -625,7 +625,7 @@ static u8 GetTrainerBattleTransition(void)
            return B_TRANSITION_LANCE;
        return B_TRANSITION_BLUE;
    }
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)
        return B_TRANSITION_BLUE;
    if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE)
        minPartyCount = 2; // double battles always at least have 2 pokemon.
@@ -49,7 +49,10 @@ const u8 unref_83FFAAC[] = {

 const u8 unref_83FFABF[] = _("100");

-#include "data/battle_tower/trainers.h"
+static const struct BattleTowerTrainer sBattleTowerTrainers[] =
+{
+
+};

 static const u16 sBattleTowerHeldItems[] = {
    ITEM_NONE,
@@ -488,7 +491,7 @@ u8 GetBattleTowerTrainerFrontSpriteId(void)
    }
    else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID)
    {
-        return gFacilityClassToPicIndex[gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass];
+        return gFacilityClassToPicIndex[sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass];
    }
    else
    {
@@ -508,7 +511,7 @@ u8 GetBattleTowerTrainerClassNameId(void)
    }
    else
    {
-        return gFacilityClassToTrainerClass[gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass];
+        return gFacilityClassToTrainerClass[sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass];
    }
 }

@@ -523,7 +526,7 @@ void GetBattleTowerTrainerName(u8 *dest)
    else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID)
    {
        for (i = 0; i < 3; i++)
-            dest[i] = gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].name[i];
+            dest[i] = sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].name[i];
    }
    else
    {
@@ -630,7 +633,7 @@ static void FillBattleTowerTrainerParty(void)
        level = 50;
    }

-    teamFlags = gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].teamFlags;
+    teamFlags = sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].teamFlags;

    // Attempt to fill the trainer's party with random Pokemon until 3 have been
    // successfully chosen. The trainer's party may not have duplicate pokemon species
@@ -847,7 +850,7 @@ void PrintBattleTowerTrainerGreeting(void)
    if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId == BATTLE_TOWER_EREADER_TRAINER_ID)
        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting);
    else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID)
-        BufferBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting);
+        BufferBattleTowerTrainerMessage(sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting);
    else
        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting);
 }
@@ -6,7 +6,7 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/battle_ai.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[] =
 {
@@ -1,4 +0,0 @@
-const struct BattleTowerTrainer gBattleTowerTrainers[] =
-{
-
-};
@@ -172,8 +172,8 @@ const u32 gTrainerPalette_RSBrendan1[] = INCBIN_U32("graphics/trainers/palettes/
 const u32 gTrainerFrontPic_RSMay1[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz");
 const u32 gTrainerPalette_RSMay1[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz");

-const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz");
-const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz");
+const u32 gTrainerFrontPic_RSPokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_breeder_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPokemonBreederM[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_breeder_m.gbapal.lz");

 const u32 gTrainerFrontPic_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz");
 const u32 gTrainerPalette_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz");
@@ -316,8 +316,8 @@ const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/palettes/
 const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz");
 const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/palettes/black_belt.gbapal.lz");

-const u32 gTrainerFrontPic_Rival1[] = INCBIN_U32("graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz");
-const u32 gTrainerPalette_Rival1[] = INCBIN_U32("graphics/trainers/palettes/rival_1.gbapal.lz");
+const u32 gTrainerFrontPic_RivalEarly[] = INCBIN_U32("graphics/trainers/front_pics/rival_early_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RivalEarly[] = INCBIN_U32("graphics/trainers/palettes/rival_early.gbapal.lz");

 const u32 gTrainerFrontPic_Scientist[] = INCBIN_U32("graphics/trainers/front_pics/scientist_front_pic.4bpp.lz");
 const u32 gTrainerPalette_Scientist[] = INCBIN_U32("graphics/trainers/palettes/scientist.gbapal.lz");
@@ -370,8 +370,8 @@ const u32 gTrainerPalette_LeaderSabrina[] = INCBIN_U32("graphics/trainers/palett
 const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz");
 const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/palettes/gentleman.gbapal.lz");

-const u32 gTrainerFrontPic_Rival2[] = INCBIN_U32("graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz");
-const u32 gTrainerPalette_Rival2[] = INCBIN_U32("graphics/trainers/palettes/rival_2.gbapal.lz");
+const u32 gTrainerFrontPic_RivalLate[] = INCBIN_U32("graphics/trainers/front_pics/rival_late_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RivalLate[] = INCBIN_U32("graphics/trainers/palettes/rival_late.gbapal.lz");

 const u32 gTrainerFrontPic_ChampionRival[] = INCBIN_U32("graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz");
 const u32 gTrainerPalette_ChampionRival[] = INCBIN_U32("graphics/trainers/palettes/champion_rival.gbapal.lz");
@@ -421,8 +421,8 @@ const u32 gTrainerPalette_CrushGirl[] = INCBIN_U32("graphics/trainers/palettes/c
 const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz");
 const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/palettes/tuber_f.gbapal.lz");

-const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz");
-const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz");
+const u32 gTrainerFrontPic_PokemonBreeder[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokemonBreeder[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder.gbapal.lz");

 const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz");
 const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz");
@@ -1,308 +1,312 @@
-// TODO: document trainer pic indices with macro
 const u8 gFacilityClassToPicIndex[] =
 {
-    [FACILITY_CLASS_AQUA_LEADER] = 0,
-    [FACILITY_CLASS_TEAM_AQUA] = 1,
-    [FACILITY_CLASS_TEAM_AQUA_2] = 2,
-    [FACILITY_CLASS_AROMA_LADY] = 3,
-    [FACILITY_CLASS_RUIN_MANIAC] = 4,
-    [FACILITY_CLASS_INTERVIEWER] = 5,
-    [FACILITY_CLASS_TUBER] = 6,
-    [FACILITY_CLASS_TUBER_2] = 7,
-    [FACILITY_CLASS_COOLTRAINER] = 8,
-    [FACILITY_CLASS_COOLTRAINER_2] = 9,
-    [FACILITY_CLASS_HEX_MANIAC] = 10,
-    [FACILITY_CLASS_LADY] = 11,
-    [FACILITY_CLASS_BEAUTY] = 12,
-    [FACILITY_CLASS_RICH_BOY] = 13,
-    [FACILITY_CLASS_POKEMANIAC] = 14,
-    [FACILITY_CLASS_SWIMMER_MALE] = 15,
-    [FACILITY_CLASS_BLACK_BELT] = 16,
-    [FACILITY_CLASS_GUITARIST] = 17,
-    [FACILITY_CLASS_KINDLER] = 18,
-    [FACILITY_CLASS_CAMPER] = 19,
-    [FACILITY_CLASS_BUG_MANIAC] = 20,
-    [FACILITY_CLASS_PSYCHIC] = 21,
-    [FACILITY_CLASS_PSYCHIC_2] = 22,
-    [FACILITY_CLASS_GENTLEMAN] = 23,
-    [FACILITY_CLASS_ELITE_FOUR] = 24,
-    [FACILITY_CLASS_ELITE_FOUR_2] = 25,
-    [FACILITY_CLASS_LEADER] = 26,
-    [FACILITY_CLASS_LEADER_2] = 27,
-    [FACILITY_CLASS_LEADER_3] = 28,
-    [FACILITY_CLASS_SCHOOL_KID] = 29,
-    [FACILITY_CLASS_SCHOOL_KID_2] = 30,
-    [FACILITY_CLASS_SR_AND_JR] = 31,
-    [FACILITY_CLASS_POKEFAN] = 32,
-    [FACILITY_CLASS_POKEFAN_2] = 33,
-    [FACILITY_CLASS_EXPERT] = 34,
-    [FACILITY_CLASS_EXPERT_2] = 35,
-    [FACILITY_CLASS_YOUNGSTER] = 36,
-    [FACILITY_CLASS_CHAMPION] = 37,
-    [FACILITY_CLASS_FISHERMAN] = 38,
-    [FACILITY_CLASS_TRIATHLETE] = 39,
-    [FACILITY_CLASS_TRIATHLETE_2] = 40,
-    [FACILITY_CLASS_TRIATHLETE_3] = 41,
-    [FACILITY_CLASS_TRIATHLETE_4] = 42,
-    [FACILITY_CLASS_TRIATHLETE_5] = 43,
-    [FACILITY_CLASS_TRIATHLETE_6] = 44,
-    [FACILITY_CLASS_DRAGON_TAMER] = 45,
-    [FACILITY_CLASS_BIRD_KEEPER] = 46,
-    [FACILITY_CLASS_NINJA_BOY] = 47,
-    [FACILITY_CLASS_BATTLE_GIRL] = 48,
-    [FACILITY_CLASS_PARASOL_LADY] = 49,
-    [FACILITY_CLASS_SWIMMER_FEMALE] = 50,
-    [FACILITY_CLASS_PICNICKER] = 51,
-    [FACILITY_CLASS_TWINS] = 52,
-    [FACILITY_CLASS_SAILOR] = 53,
-    [FACILITY_CLASS_BOARDER] = 36,
-    [FACILITY_CLASS_BOARDER_2] = 36,
-    [FACILITY_CLASS_COLLECTOR] = 54,
-    [FACILITY_CLASS_PKMN_TRAINER] = 55,
-    [FACILITY_CLASS_PKMN_TRAINER_2] = 56,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = 56,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = 56,
-    [FACILITY_CLASS_PKMN_TRAINER_5] = 57,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = 57,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = 57,
-    [FACILITY_CLASS_PKMN_BREEDER] = 58,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = 59,
-    [FACILITY_CLASS_PKMN_RANGER] = 60,
-    [FACILITY_CLASS_PKMN_RANGER_2] = 61,
-    [FACILITY_CLASS_MAGMA_LEADER] = 62,
-    [FACILITY_CLASS_TEAM_MAGMA] = 63,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = 64,
-    [FACILITY_CLASS_LASS] = 65,
-    [FACILITY_CLASS_BUG_CATCHER] = 66,
-    [FACILITY_CLASS_HIKER] = 67,
-    [FACILITY_CLASS_YOUNG_COUPLE] = 68,
-    [FACILITY_CLASS_OLD_COUPLE] = 69,
-    [FACILITY_CLASS_SIS_AND_BRO] = 70,
-    [FACILITY_CLASS_AQUA_ADMIN] = 71,
-    [FACILITY_CLASS_AQUA_ADMIN_2] = 72,
-    [FACILITY_CLASS_MAGMA_ADMIN] = 73,
-    [FACILITY_CLASS_MAGMA_ADMIN_2] = 74,
-    [FACILITY_CLASS_LEADER_4] = 75,
-    [FACILITY_CLASS_LEADER_5] = 76,
-    [FACILITY_CLASS_LEADER_6] = 77,
-    [FACILITY_CLASS_LEADER_7] = 78,
-    [FACILITY_CLASS_LEADER_8] = 79,
-    [FACILITY_CLASS_ELITE_FOUR_3] = 80,
-    [FACILITY_CLASS_ELITE_FOUR_4] = 81,
-    [FACILITY_CLASS_YOUNGSTER_2] = 82,
-    [FACILITY_CLASS_BUG_CATCHER_2] = 83,
-    [FACILITY_CLASS_LASS_2] = 84,
-    [FACILITY_CLASS_SAILOR_2] = 85,
-    [FACILITY_CLASS_CAMPER_2] = 86,
-    [FACILITY_CLASS_PICNICKER_2] = 87,
-    [FACILITY_CLASS_POKEMANIAC_2] = 88,
-    [FACILITY_CLASS_SUPER_NERD] = 89,
-    [FACILITY_CLASS_HIKER_2] = 90,
-    [FACILITY_CLASS_BIKER] = 91,
-    [FACILITY_CLASS_BURGLAR] = 92,
-    [FACILITY_CLASS_ENGINEER] = 93,
-    [FACILITY_CLASS_FISHERMAN_2] = 94,
-    [FACILITY_CLASS_SWIMMER_MALE_2] = 95,
-    [FACILITY_CLASS_CUE_BALL] = 96,
-    [FACILITY_CLASS_GAMER] = 97,
-    [FACILITY_CLASS_BEAUTY_2] = 98,
-    [FACILITY_CLASS_SWIMMER_FEMALE_2] = 99,
-    [FACILITY_CLASS_PSYCHIC_3] = 100,
-    [FACILITY_CLASS_ROCKER] = 101,
-    [FACILITY_CLASS_JUGGLER] = 102,
-    [FACILITY_CLASS_TAMER] = 103,
-    [FACILITY_CLASS_BIRD_KEEPER_2] = 104,
-    [FACILITY_CLASS_BLACK_BELT_2] = 105,
-    [FACILITY_CLASS_RIVAL] = 106,
-    [FACILITY_CLASS_SCIENTIST] = 107,
-    [FACILITY_CLASS_BOSS] = 108,
-    [FACILITY_CLASS_TEAM_ROCKET] = 109,
-    [FACILITY_CLASS_COOLTRAINER_3] = 110,
-    [FACILITY_CLASS_COOLTRAINER_4] = 111,
-    [FACILITY_CLASS_ELITE_FOUR_5] = 112,
-    [FACILITY_CLASS_ELITE_FOUR_6] = 113,
-    [FACILITY_CLASS_LEADER_9] = 116,
-    [FACILITY_CLASS_LEADER_10] = 117,
-    [FACILITY_CLASS_GENTLEMAN_2] = 123,
-    [FACILITY_CLASS_RIVAL_2] = 124,
-    [FACILITY_CLASS_CHAMPION_2] = 125,
-    [FACILITY_CLASS_CHANNELER] = 126,
-    [FACILITY_CLASS_TWINS_2] = 127,
-    [FACILITY_CLASS_COOL_COUPLE] = 128,
-    [FACILITY_CLASS_YOUNG_COUPLE_2] = 129,
-    [FACILITY_CLASS_CRUSH_KIN] = 130,
-    [FACILITY_CLASS_SIS_AND_BRO_2] = 131,
-    [FACILITY_CLASS_PKMN_PROF] = 132,
-    [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_RS_BRENDAN_2,
-    [FACILITY_CLASS_MAY] = TRAINER_PIC_RS_MAY_2,
-    [FACILITY_CLASS_RED] = TRAINER_PIC_RED,
-    [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF,
-    [FACILITY_CLASS_TEAM_ROCKET_2] = 137,
-    [FACILITY_CLASS_PSYCHIC_4] = 138,
-    [FACILITY_CLASS_CRUSH_GIRL] = 139,
-    [FACILITY_CLASS_TUBER_3] = 140,
-    [FACILITY_CLASS_PKMN_BREEDER_3] = 141,
-    [FACILITY_CLASS_PKMN_RANGER_3] = 142,
-    [FACILITY_CLASS_PKMN_RANGER_4] = 143,
-    [FACILITY_CLASS_AROMA_LADY_2] = 144,
-    [FACILITY_CLASS_RUIN_MANIAC_2] = 145,
-    [FACILITY_CLASS_LADY_2] = 146,
-    [FACILITY_CLASS_PAINTER] = 147,
-    [FACILITY_CLASS_ELITE_FOUR_7] = 112,
-    [FACILITY_CLASS_ELITE_FOUR_8] = 113,
-    [FACILITY_CLASS_CHAMPION_3] = 125,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE]     = TRAINER_PIC_AQUA_LEADER_ARCHIE,
+    [FACILITY_CLASS_AQUA_GRUNT_M]           = TRAINER_PIC_AQUA_GRUNT_M,
+    [FACILITY_CLASS_AQUA_GRUNT_F]           = TRAINER_PIC_AQUA_GRUNT_F,
+    [FACILITY_CLASS_RS_AROMA_LADY]          = TRAINER_PIC_RS_AROMA_LADY,
+    [FACILITY_CLASS_RS_RUIN_MANIAC]         = TRAINER_PIC_RS_RUIN_MANIAC,
+    [FACILITY_CLASS_INTERVIEWER]            = TRAINER_PIC_INTERVIEWER,
+    [FACILITY_CLASS_RS_TUBER_F]             = TRAINER_PIC_RS_TUBER_F,
+    [FACILITY_CLASS_RS_TUBER_M]             = TRAINER_PIC_RS_TUBER_M,
+    [FACILITY_CLASS_RS_COOLTRAINER_M]       = TRAINER_PIC_RS_COOLTRAINER_M,
+    [FACILITY_CLASS_RS_COOLTRAINER_F]       = TRAINER_PIC_RS_COOLTRAINER_F,
+    [FACILITY_CLASS_HEX_MANIAC]             = TRAINER_PIC_HEX_MANIAC,
+    [FACILITY_CLASS_RS_LADY]                = TRAINER_PIC_RS_LADY,
+    [FACILITY_CLASS_RS_BEAUTY]              = TRAINER_PIC_RS_BEAUTY,
+    [FACILITY_CLASS_RICH_BOY]               = TRAINER_PIC_RICH_BOY,
+    [FACILITY_CLASS_RS_POKEMANIAC]          = TRAINER_PIC_RS_POKEMANIAC,
+    [FACILITY_CLASS_RS_SWIMMER_M]           = TRAINER_PIC_RS_SWIMMER_M,
+    [FACILITY_CLASS_RS_BLACK_BELT]          = TRAINER_PIC_RS_BLACK_BELT,
+    [FACILITY_CLASS_GUITARIST]              = TRAINER_PIC_GUITARIST,
+    [FACILITY_CLASS_KINDLER]                = TRAINER_PIC_KINDLER,
+    [FACILITY_CLASS_RS_CAMPER]              = TRAINER_PIC_RS_CAMPER,
+    [FACILITY_CLASS_BUG_MANIAC]             = TRAINER_PIC_BUG_MANIAC,
+    [FACILITY_CLASS_RS_PSYCHIC_M]           = TRAINER_PIC_RS_PSYCHIC_M,
+    [FACILITY_CLASS_RS_PSYCHIC_F]           = TRAINER_PIC_RS_PSYCHIC_F,
+    [FACILITY_CLASS_RS_GENTLEMAN]           = TRAINER_PIC_RS_GENTLEMAN,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY]      = TRAINER_PIC_ELITE_FOUR_SIDNEY,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE]      = TRAINER_PIC_ELITE_FOUR_PHOEBE,
+    [FACILITY_CLASS_LEADER_ROXANNE]         = TRAINER_PIC_LEADER_ROXANNE,
+    [FACILITY_CLASS_LEADER_BRAWLY]          = TRAINER_PIC_LEADER_BRAWLY,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA]   = TRAINER_PIC_LEADER_TATE_AND_LIZA,
+    [FACILITY_CLASS_SCHOOL_KID_M]           = TRAINER_PIC_SCHOOL_KID_M,
+    [FACILITY_CLASS_SCHOOL_KID_F]           = TRAINER_PIC_SCHOOL_KID_F,
+    [FACILITY_CLASS_SR_AND_JR]              = TRAINER_PIC_SR_AND_JR,
+    [FACILITY_CLASS_POKEFAN_M]              = TRAINER_PIC_POKEFAN_M,
+    [FACILITY_CLASS_POKEFAN_F]              = TRAINER_PIC_POKEFAN_F,
+    [FACILITY_CLASS_EXPERT_M]               = TRAINER_PIC_EXPERT_M,
+    [FACILITY_CLASS_EXPERT_F]               = TRAINER_PIC_EXPERT_F,
+    [FACILITY_CLASS_RS_YOUNGSTER]           = TRAINER_PIC_RS_YOUNGSTER,
+    [FACILITY_CLASS_CHAMPION_STEVEN]        = TRAINER_PIC_CHAMPION_STEVEN,
+    [FACILITY_CLASS_RS_FISHERMAN]           = TRAINER_PIC_RS_FISHERMAN,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M]   = TRAINER_PIC_CYCLING_TRIATHLETE_M,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F]   = TRAINER_PIC_CYCLING_TRIATHLETE_F,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M]   = TRAINER_PIC_RUNNING_TRIATHLETE_M,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F]   = TRAINER_PIC_RUNNING_TRIATHLETE_F,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M]  = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F]  = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
+    [FACILITY_CLASS_DRAGON_TAMER]           = TRAINER_PIC_DRAGON_TAMER,
+    [FACILITY_CLASS_RS_BIRD_KEEPER]         = TRAINER_PIC_RS_BIRD_KEEPER,
+    [FACILITY_CLASS_NINJA_BOY]              = TRAINER_PIC_NINJA_BOY,
+    [FACILITY_CLASS_BATTLE_GIRL]            = TRAINER_PIC_BATTLE_GIRL,
+    [FACILITY_CLASS_PARASOL_LADY]           = TRAINER_PIC_PARASOL_LADY,
+    [FACILITY_CLASS_RS_SWIMMER_F]           = TRAINER_PIC_RS_SWIMMER_F,
+    [FACILITY_CLASS_RS_PICNICKER]           = TRAINER_PIC_RS_PICNICKER,
+    [FACILITY_CLASS_RS_TWINS]               = TRAINER_PIC_RS_TWINS,
+    [FACILITY_CLASS_RS_SAILOR]              = TRAINER_PIC_RS_SAILOR,
+    [FACILITY_CLASS_BOARDER_M]              = TRAINER_PIC_RS_YOUNGSTER,
+    [FACILITY_CLASS_BOARDER_F]              = TRAINER_PIC_RS_YOUNGSTER,
+    [FACILITY_CLASS_COLLECTOR]              = TRAINER_PIC_COLLECTOR,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY]     = TRAINER_PIC_WALLY,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN]   = TRAINER_PIC_RS_BRENDAN_1,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_RS_BRENDAN_1,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_RS_BRENDAN_1,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY]       = TRAINER_PIC_RS_MAY_1,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2]     = TRAINER_PIC_RS_MAY_1,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3]     = TRAINER_PIC_RS_MAY_1,
+    [FACILITY_CLASS_RS_PKMN_BREEDER_M]      = TRAINER_PIC_RS_POKEMON_BREEDER_M,
+    [FACILITY_CLASS_RS_PKMN_BREEDER_F]      = TRAINER_PIC_RS_POKEMON_BREEDER_F,
+    [FACILITY_CLASS_RS_PKMN_RANGER_M]       = TRAINER_PIC_RS_POKEMON_RANGER_M,
+    [FACILITY_CLASS_RS_PKMN_RANGER_F]       = TRAINER_PIC_RS_POKEMON_RANGER_F,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE]     = TRAINER_PIC_MAGMA_LEADER_MAXIE,
+    [FACILITY_CLASS_MAGMA_GRUNT_M]          = TRAINER_PIC_MAGMA_GRUNT_M,
+    [FACILITY_CLASS_MAGMA_GRUNT_F]          = TRAINER_PIC_MAGMA_GRUNT_F,
+    [FACILITY_CLASS_RS_LASS]                = TRAINER_PIC_RS_LASS,
+    [FACILITY_CLASS_RS_BUG_CATCHER]         = TRAINER_PIC_RS_BUG_CATCHER,
+    [FACILITY_CLASS_RS_HIKER]               = TRAINER_PIC_RS_HIKER,
+    [FACILITY_CLASS_RS_YOUNG_COUPLE]        = TRAINER_PIC_RS_YOUNG_COUPLE,
+    [FACILITY_CLASS_OLD_COUPLE]             = TRAINER_PIC_OLD_COUPLE,
+    [FACILITY_CLASS_RS_SIS_AND_BRO]         = TRAINER_PIC_RS_SIS_AND_BRO,
+    [FACILITY_CLASS_AQUA_ADMIN_M]           = TRAINER_PIC_AQUA_ADMIN_M,
+    [FACILITY_CLASS_AQUA_ADMIN_F]           = TRAINER_PIC_AQUA_ADMIN_F,
+    [FACILITY_CLASS_MAGMA_ADMIN_M]          = TRAINER_PIC_MAGMA_ADMIN_M,
+    [FACILITY_CLASS_MAGMA_ADMIN_F]          = TRAINER_PIC_MAGMA_ADMIN_F,
+    [FACILITY_CLASS_LEADER_WATTSON]         = TRAINER_PIC_LEADER_WATTSON,
+    [FACILITY_CLASS_LEADER_FLANNERY]        = TRAINER_PIC_LEADER_FLANNERY,
+    [FACILITY_CLASS_LEADER_NORMAN]          = TRAINER_PIC_LEADER_NORMAN,
+    [FACILITY_CLASS_LEADER_WINONA]          = TRAINER_PIC_LEADER_WINONA,
+    [FACILITY_CLASS_LEADER_WALLACE]         = TRAINER_PIC_LEADER_WALLACE,
+    [FACILITY_CLASS_ELITE_FOUR_GLACIA]      = TRAINER_PIC_ELITE_FOUR_GLACIA,
+    [FACILITY_CLASS_ELITE_FOUR_DRAKE]       = TRAINER_PIC_ELITE_FOUR_DRAKE,
+    [FACILITY_CLASS_YOUNGSTER]              = TRAINER_PIC_YOUNGSTER,
+    [FACILITY_CLASS_BUG_CATCHER]            = TRAINER_PIC_BUG_CATCHER,
+    [FACILITY_CLASS_LASS]                   = TRAINER_PIC_LASS,
+    [FACILITY_CLASS_SAILOR]                 = TRAINER_PIC_SAILOR,
+    [FACILITY_CLASS_CAMPER]                 = TRAINER_PIC_CAMPER,
+    [FACILITY_CLASS_PICNICKER]              = TRAINER_PIC_PICNICKER,
+    [FACILITY_CLASS_POKEMANIAC]             = TRAINER_PIC_POKEMANIAC,
+    [FACILITY_CLASS_SUPER_NERD]             = TRAINER_PIC_SUPER_NERD,
+    [FACILITY_CLASS_HIKER]                  = TRAINER_PIC_HIKER,
+    [FACILITY_CLASS_BIKER]                  = TRAINER_PIC_BIKER,
+    [FACILITY_CLASS_BURGLAR]                = TRAINER_PIC_BURGLAR,
+    [FACILITY_CLASS_ENGINEER]               = TRAINER_PIC_ENGINEER,
+    [FACILITY_CLASS_FISHERMAN]              = TRAINER_PIC_FISHERMAN,
+    [FACILITY_CLASS_SWIMMER_M]              = TRAINER_PIC_SWIMMER_M,
+    [FACILITY_CLASS_CUE_BALL]               = TRAINER_PIC_CUE_BALL,
+    [FACILITY_CLASS_GAMER]                  = TRAINER_PIC_GAMER,
+    [FACILITY_CLASS_BEAUTY]                 = TRAINER_PIC_BEAUTY,
+    [FACILITY_CLASS_SWIMMER_F]              = TRAINER_PIC_SWIMMER_F,
+    [FACILITY_CLASS_PSYCHIC_M]              = TRAINER_PIC_PSYCHIC_M,
+    [FACILITY_CLASS_ROCKER]                 = TRAINER_PIC_ROCKER,
+    [FACILITY_CLASS_JUGGLER]                = TRAINER_PIC_JUGGLER,
+    [FACILITY_CLASS_TAMER]                  = TRAINER_PIC_TAMER,
+    [FACILITY_CLASS_BIRD_KEEPER]            = TRAINER_PIC_BIRD_KEEPER,
+    [FACILITY_CLASS_BLACK_BELT]             = TRAINER_PIC_BLACK_BELT,
+    [FACILITY_CLASS_RIVAL_EARLY]            = TRAINER_PIC_RIVAL_EARLY,
+    [FACILITY_CLASS_SCIENTIST]              = TRAINER_PIC_SCIENTIST,
+    [FACILITY_CLASS_BOSS]                   = TRAINER_PIC_LEADER_GIOVANNI,
+    [FACILITY_CLASS_ROCKET_GRUNT_M]         = TRAINER_PIC_ROCKET_GRUNT_M,
+    [FACILITY_CLASS_COOLTRAINER_M]          = TRAINER_PIC_COOLTRAINER_M,
+    [FACILITY_CLASS_COOLTRAINER_F]          = TRAINER_PIC_COOLTRAINER_F,
+    [FACILITY_CLASS_ELITE_FOUR_LORELEI]     = TRAINER_PIC_ELITE_FOUR_LORELEI,
+    [FACILITY_CLASS_ELITE_FOUR_BRUNO]       = TRAINER_PIC_ELITE_FOUR_BRUNO,
+    [FACILITY_CLASS_LEADER_M]               = TRAINER_PIC_LEADER_BROCK,
+    [FACILITY_CLASS_LEADER_F]               = TRAINER_PIC_LEADER_MISTY,
+    [FACILITY_CLASS_GENTLEMAN]              = TRAINER_PIC_GENTLEMAN,
+    [FACILITY_CLASS_RIVAL_LATE]             = TRAINER_PIC_RIVAL_LATE,
+    [FACILITY_CLASS_CHAMPION_RIVAL]         = TRAINER_PIC_CHAMPION_RIVAL,
+    [FACILITY_CLASS_CHANNELER]              = TRAINER_PIC_CHANNELER,
+    [FACILITY_CLASS_TWINS]                  = TRAINER_PIC_TWINS,
+    [FACILITY_CLASS_COOL_COUPLE]            = TRAINER_PIC_COOL_COUPLE,
+    [FACILITY_CLASS_YOUNG_COUPLE]           = TRAINER_PIC_YOUNG_COUPLE,
+    [FACILITY_CLASS_CRUSH_KIN]              = TRAINER_PIC_CRUSH_KIN,
+    [FACILITY_CLASS_SIS_AND_BRO]            = TRAINER_PIC_SIS_AND_BRO,
+    [FACILITY_CLASS_PKMN_PROF]              = TRAINER_PIC_PROFESSOR_OAK,
+    [FACILITY_CLASS_BRENDAN]                = TRAINER_PIC_RS_BRENDAN_2,
+    [FACILITY_CLASS_MAY]                    = TRAINER_PIC_RS_MAY_2,
+    [FACILITY_CLASS_RED]                    = TRAINER_PIC_RED,
+    [FACILITY_CLASS_LEAF]                   = TRAINER_PIC_LEAF,
+    [FACILITY_CLASS_ROCKET_GRUNT_F]         = TRAINER_PIC_ROCKET_GRUNT_F,
+    [FACILITY_CLASS_PSYCHIC_F]              = TRAINER_PIC_PSYCHIC_F,
+    [FACILITY_CLASS_CRUSH_GIRL]             = TRAINER_PIC_CRUSH_GIRL,
+    [FACILITY_CLASS_TUBER]                  = TRAINER_PIC_TUBER_F,
+    [FACILITY_CLASS_PKMN_BREEDER]           = TRAINER_PIC_POKEMON_BREEDER,
+    [FACILITY_CLASS_PKMN_RANGER_M]          = TRAINER_PIC_POKEMON_RANGER_M,
+    [FACILITY_CLASS_PKMN_RANGER_F]          = TRAINER_PIC_POKEMON_RANGER_F,
+    [FACILITY_CLASS_AROMA_LADY]             = TRAINER_PIC_AROMA_LADY,
+    [FACILITY_CLASS_RUIN_MANIAC]            = TRAINER_PIC_RUIN_MANIAC,
+    [FACILITY_CLASS_LADY]                   = TRAINER_PIC_LADY,
+    [FACILITY_CLASS_PAINTER]                = TRAINER_PIC_PAINTER,
+#ifdef BUGFIX
+    [FACILITY_CLASS_ELITE_FOUR_AGATHA]      = TRAINER_PIC_ELITE_FOUR_AGATHA,
+    [FACILITY_CLASS_ELITE_FOUR_LANCE]       = TRAINER_PIC_ELITE_FOUR_LANCE,
+#else
+    [FACILITY_CLASS_ELITE_FOUR_AGATHA]      = TRAINER_PIC_ELITE_FOUR_LORELEI,
+    [FACILITY_CLASS_ELITE_FOUR_LANCE]       = TRAINER_PIC_ELITE_FOUR_BRUNO,
+#endif  
+    [FACILITY_CLASS_CHAMPION_RIVAL_2]       = TRAINER_PIC_CHAMPION_RIVAL,
 };

 const u8 gFacilityClassToTrainerClass[] =
 {
-    [FACILITY_CLASS_AQUA_LEADER] = CLASS_AQUA_LEADER,
-    [FACILITY_CLASS_TEAM_AQUA] = CLASS_TEAM_AQUA,
-    [FACILITY_CLASS_TEAM_AQUA_2] = CLASS_TEAM_AQUA,
-    [FACILITY_CLASS_AROMA_LADY] = CLASS_AROMA_LADY,
-    [FACILITY_CLASS_RUIN_MANIAC] = CLASS_RUIN_MANIAC,
-    [FACILITY_CLASS_INTERVIEWER] = CLASS_INTERVIEWER,
-    [FACILITY_CLASS_TUBER] = CLASS_TUBER,
-    [FACILITY_CLASS_TUBER_2] = CLASS_TUBER_2,
-    [FACILITY_CLASS_COOLTRAINER] = CLASS_COOLTRAINER,
-    [FACILITY_CLASS_COOLTRAINER_2] = CLASS_COOLTRAINER,
-    [FACILITY_CLASS_HEX_MANIAC] = CLASS_HEX_MANIAC,
-    [FACILITY_CLASS_LADY] = CLASS_LADY,
-    [FACILITY_CLASS_BEAUTY] = CLASS_BEAUTY,
-    [FACILITY_CLASS_RICH_BOY] = CLASS_RICH_BOY,
-    [FACILITY_CLASS_POKEMANIAC] = CLASS_POKEMANIAC,
-    [FACILITY_CLASS_SWIMMER_MALE] = CLASS_SWIMMER_MALE,
-    [FACILITY_CLASS_BLACK_BELT] = CLASS_BLACK_BELT,
-    [FACILITY_CLASS_GUITARIST] = CLASS_GUITARIST,
-    [FACILITY_CLASS_KINDLER] = CLASS_KINDLER,
-    [FACILITY_CLASS_CAMPER] = CLASS_CAMPER,
-    [FACILITY_CLASS_BUG_MANIAC] = CLASS_BUG_MANIAC,
-    [FACILITY_CLASS_PSYCHIC] = CLASS_PSYCHIC,
-    [FACILITY_CLASS_PSYCHIC_2] = CLASS_PSYCHIC,
-    [FACILITY_CLASS_GENTLEMAN] = CLASS_GENTLEMAN,
-    [FACILITY_CLASS_ELITE_FOUR] = CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_ELITE_FOUR_2] = CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_LEADER] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_2] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_3] = CLASS_LEADER,
-    [FACILITY_CLASS_SCHOOL_KID] = CLASS_SCHOOL_KID,
-    [FACILITY_CLASS_SCHOOL_KID_2] = CLASS_SCHOOL_KID,
-    [FACILITY_CLASS_SR_AND_JR] = CLASS_SR_AND_JR,
-    [FACILITY_CLASS_POKEFAN] = CLASS_POKEFAN,
-    [FACILITY_CLASS_POKEFAN_2] = CLASS_POKEFAN,
-    [FACILITY_CLASS_EXPERT] = CLASS_EXPERT,
-    [FACILITY_CLASS_EXPERT_2] = CLASS_EXPERT,
-    [FACILITY_CLASS_YOUNGSTER] = CLASS_YOUNGSTER,
-    [FACILITY_CLASS_CHAMPION] = CLASS_CHAMPION,
-    [FACILITY_CLASS_FISHERMAN] = CLASS_FISHERMAN,
-    [FACILITY_CLASS_TRIATHLETE] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_2] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_3] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_4] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_5] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_6] = CLASS_TRIATHLETE,
-    [FACILITY_CLASS_DRAGON_TAMER] = CLASS_DRAGON_TAMER,
-    [FACILITY_CLASS_BIRD_KEEPER] = CLASS_BIRD_KEEPER,
-    [FACILITY_CLASS_NINJA_BOY] = CLASS_NINJA_BOY,
-    [FACILITY_CLASS_BATTLE_GIRL] = CLASS_BATTLE_GIRL,
-    [FACILITY_CLASS_PARASOL_LADY] = CLASS_PARASOL_LADY,
-    [FACILITY_CLASS_SWIMMER_FEMALE] = CLASS_SWIMMER_FEMALE,
-    [FACILITY_CLASS_PICNICKER] = CLASS_PICNICKER,
-    [FACILITY_CLASS_TWINS] = CLASS_TWINS,
-    [FACILITY_CLASS_SAILOR] = CLASS_SAILOR,
-    [FACILITY_CLASS_BOARDER] = CLASS_BOARDER,
-    [FACILITY_CLASS_BOARDER_2] = CLASS_BOARDER,
-    [FACILITY_CLASS_COLLECTOR] = CLASS_COLLECTOR,
-    [FACILITY_CLASS_PKMN_TRAINER] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_2] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_5] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_BREEDER] = CLASS_PKMN_BREEDER,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = CLASS_PKMN_BREEDER,
-    [FACILITY_CLASS_PKMN_RANGER] = CLASS_PKMN_RANGER,
-    [FACILITY_CLASS_PKMN_RANGER_2] = CLASS_PKMN_RANGER,
-    [FACILITY_CLASS_MAGMA_LEADER] = CLASS_MAGMA_LEADER,
-    [FACILITY_CLASS_TEAM_MAGMA] = CLASS_TEAM_MAGMA,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = CLASS_TEAM_MAGMA,
-    [FACILITY_CLASS_LASS] = CLASS_LASS,
-    [FACILITY_CLASS_BUG_CATCHER] = CLASS_BUG_CATCHER,
-    [FACILITY_CLASS_HIKER] = CLASS_HIKER,
-    [FACILITY_CLASS_YOUNG_COUPLE] = CLASS_YOUNG_COUPLE,
-    [FACILITY_CLASS_OLD_COUPLE] = CLASS_OLD_COUPLE,
-    [FACILITY_CLASS_SIS_AND_BRO] = CLASS_SIS_AND_BRO,
-    [FACILITY_CLASS_AQUA_ADMIN] = CLASS_AQUA_ADMIN,
-    [FACILITY_CLASS_AQUA_ADMIN_2] = CLASS_AQUA_ADMIN,
-    [FACILITY_CLASS_MAGMA_ADMIN] = CLASS_MAGMA_ADMIN,
-    [FACILITY_CLASS_MAGMA_ADMIN_2] = CLASS_MAGMA_ADMIN,
-    [FACILITY_CLASS_LEADER_4] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_5] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_6] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_7] = CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_8] = CLASS_LEADER,
-    [FACILITY_CLASS_ELITE_FOUR_3] = CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_ELITE_FOUR_4] = CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_YOUNGSTER_2] = CLASS_YOUNGSTER_2,
-    [FACILITY_CLASS_BUG_CATCHER_2] = CLASS_BUG_CATCHER_2,
-    [FACILITY_CLASS_LASS_2] = CLASS_LASS_2,
-    [FACILITY_CLASS_SAILOR_2] = CLASS_SAILOR_2,
-    [FACILITY_CLASS_CAMPER_2] = CLASS_CAMPER_2,
-    [FACILITY_CLASS_PICNICKER_2] = CLASS_PICNICKER_2,
-    [FACILITY_CLASS_POKEMANIAC_2] = CLASS_POKEMANIAC_2,
-    [FACILITY_CLASS_SUPER_NERD] = CLASS_SUPER_NERD,
-    [FACILITY_CLASS_HIKER_2] = CLASS_HIKER_2,
-    [FACILITY_CLASS_BIKER] = CLASS_BIKER,
-    [FACILITY_CLASS_BURGLAR] = CLASS_BURGLAR,
-    [FACILITY_CLASS_ENGINEER] = CLASS_ENGINEER,
-    [FACILITY_CLASS_FISHERMAN_2] = CLASS_FISHERMAN_2,
-    [FACILITY_CLASS_SWIMMER_MALE_2] = CLASS_SWIMMER_MALE_2,
-    [FACILITY_CLASS_CUE_BALL] = CLASS_CUE_BALL,
-    [FACILITY_CLASS_GAMER] = CLASS_GAMER,
-    [FACILITY_CLASS_BEAUTY_2] = CLASS_BEAUTY_2,
-    [FACILITY_CLASS_SWIMMER_FEMALE_2] = CLASS_SWIMMER_FEMALE_2,
-    [FACILITY_CLASS_PSYCHIC_3] = CLASS_PSYCHIC_2,
-    [FACILITY_CLASS_ROCKER] = CLASS_ROCKER,
-    [FACILITY_CLASS_JUGGLER] = CLASS_JUGGLER,
-    [FACILITY_CLASS_TAMER] = CLASS_TAMER,
-    [FACILITY_CLASS_BIRD_KEEPER_2] = CLASS_BIRD_KEEPER_2,
-    [FACILITY_CLASS_BLACK_BELT_2] = CLASS_BLACK_BELT_2,
-    [FACILITY_CLASS_RIVAL] = CLASS_RIVAL,
-    [FACILITY_CLASS_SCIENTIST] = CLASS_SCIENTIST,
-    [FACILITY_CLASS_BOSS] = CLASS_BOSS,
-    [FACILITY_CLASS_TEAM_ROCKET] = CLASS_TEAM_ROCKET,
-    [FACILITY_CLASS_COOLTRAINER_3] = CLASS_COOLTRAINER_2,
-    [FACILITY_CLASS_COOLTRAINER_4] = CLASS_COOLTRAINER_2,
-    [FACILITY_CLASS_ELITE_FOUR_5] = CLASS_ELITE_FOUR_2,
-    [FACILITY_CLASS_ELITE_FOUR_6] = CLASS_ELITE_FOUR_2,
-    [FACILITY_CLASS_LEADER_9] = CLASS_LEADER_2,
-    [FACILITY_CLASS_LEADER_10] = CLASS_LEADER_2,
-    [FACILITY_CLASS_GENTLEMAN_2] = CLASS_GENTLEMAN_2,
-    [FACILITY_CLASS_RIVAL_2] = CLASS_RIVAL_2,
-    [FACILITY_CLASS_CHAMPION_2] = CLASS_CHAMPION_2,
-    [FACILITY_CLASS_CHANNELER] = CLASS_CHANNELER,
-    [FACILITY_CLASS_TWINS_2] = CLASS_TWINS_2,
-    [FACILITY_CLASS_COOL_COUPLE] = CLASS_COOL_COUPLE,
-    [FACILITY_CLASS_YOUNG_COUPLE_2] = CLASS_YOUNG_COUPLE_2,
-    [FACILITY_CLASS_CRUSH_KIN] = CLASS_CRUSH_KIN,
-    [FACILITY_CLASS_SIS_AND_BRO_2] = CLASS_SIS_AND_BRO_2,
-    [FACILITY_CLASS_PKMN_PROF] = CLASS_PKMN_PROF,
-    [FACILITY_CLASS_BRENDAN] = CLASS_PLAYER,
-    [FACILITY_CLASS_MAY] = CLASS_PLAYER,
-    [FACILITY_CLASS_RED] = CLASS_PLAYER,
-    [FACILITY_CLASS_LEAF] = CLASS_PLAYER,
-    [FACILITY_CLASS_TEAM_ROCKET_2] = CLASS_TEAM_ROCKET,
-    [FACILITY_CLASS_PSYCHIC_4] = CLASS_PSYCHIC_2,
-    [FACILITY_CLASS_CRUSH_GIRL] = CLASS_CRUSH_GIRL,
-    [FACILITY_CLASS_TUBER_3] = CLASS_TUBER_3,
-    [FACILITY_CLASS_PKMN_BREEDER_3] = CLASS_PKMN_BREEDER_2,
-    [FACILITY_CLASS_PKMN_RANGER_3] = CLASS_PKMN_RANGER_2,
-    [FACILITY_CLASS_PKMN_RANGER_4] = CLASS_PKMN_RANGER_2,
-    [FACILITY_CLASS_AROMA_LADY_2] = CLASS_AROMA_LADY_2,
-    [FACILITY_CLASS_RUIN_MANIAC_2] = CLASS_RUIN_MANIAC_2,
-    [FACILITY_CLASS_LADY_2] = CLASS_LADY_2,
-    [FACILITY_CLASS_PAINTER] = CLASS_PAINTER,
-    [FACILITY_CLASS_ELITE_FOUR_7] = CLASS_ELITE_FOUR_2,
-    [FACILITY_CLASS_ELITE_FOUR_8] = CLASS_ELITE_FOUR_2,
-    [FACILITY_CLASS_CHAMPION_3] = CLASS_CHAMPION_2,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE]     = TRAINER_CLASS_AQUA_LEADER,
+    [FACILITY_CLASS_AQUA_GRUNT_M]           = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_AQUA_GRUNT_F]           = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_RS_AROMA_LADY]          = TRAINER_CLASS_RS_AROMA_LADY,
+    [FACILITY_CLASS_RS_RUIN_MANIAC]         = TRAINER_CLASS_RS_RUIN_MANIAC,
+    [FACILITY_CLASS_INTERVIEWER]            = TRAINER_CLASS_INTERVIEWER,
+    [FACILITY_CLASS_RS_TUBER_F]             = TRAINER_CLASS_RS_TUBER_F,
+    [FACILITY_CLASS_RS_TUBER_M]             = TRAINER_CLASS_RS_TUBER_M,
+    [FACILITY_CLASS_RS_COOLTRAINER_M]       = TRAINER_CLASS_RS_COOLTRAINER,
+    [FACILITY_CLASS_RS_COOLTRAINER_F]       = TRAINER_CLASS_RS_COOLTRAINER,
+    [FACILITY_CLASS_HEX_MANIAC]             = TRAINER_CLASS_HEX_MANIAC,
+    [FACILITY_CLASS_RS_LADY]                = TRAINER_CLASS_RS_LADY,
+    [FACILITY_CLASS_RS_BEAUTY]              = TRAINER_CLASS_RS_BEAUTY,
+    [FACILITY_CLASS_RICH_BOY]               = TRAINER_CLASS_RICH_BOY,
+    [FACILITY_CLASS_RS_POKEMANIAC]          = TRAINER_CLASS_RS_POKEMANIAC,
+    [FACILITY_CLASS_RS_SWIMMER_M]           = TRAINER_CLASS_RS_SWIMMER_M,
+    [FACILITY_CLASS_RS_BLACK_BELT]          = TRAINER_CLASS_RS_BLACK_BELT,
+    [FACILITY_CLASS_GUITARIST]              = TRAINER_CLASS_GUITARIST,
+    [FACILITY_CLASS_KINDLER]                = TRAINER_CLASS_KINDLER,
+    [FACILITY_CLASS_RS_CAMPER]              = TRAINER_CLASS_RS_CAMPER,
+    [FACILITY_CLASS_BUG_MANIAC]             = TRAINER_CLASS_BUG_MANIAC,
+    [FACILITY_CLASS_RS_PSYCHIC_M]           = TRAINER_CLASS_RS_PSYCHIC,
+    [FACILITY_CLASS_RS_PSYCHIC_F]           = TRAINER_CLASS_RS_PSYCHIC,
+    [FACILITY_CLASS_RS_GENTLEMAN]           = TRAINER_CLASS_RS_GENTLEMAN,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY]      = TRAINER_CLASS_RS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE]      = TRAINER_CLASS_RS_ELITE_FOUR,
+    [FACILITY_CLASS_LEADER_ROXANNE]         = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_BRAWLY]          = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA]   = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_SCHOOL_KID_M]           = TRAINER_CLASS_SCHOOL_KID,
+    [FACILITY_CLASS_SCHOOL_KID_F]           = TRAINER_CLASS_SCHOOL_KID,
+    [FACILITY_CLASS_SR_AND_JR]              = TRAINER_CLASS_SR_AND_JR,
+    [FACILITY_CLASS_POKEFAN_M]              = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_F]              = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_EXPERT_M]               = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_EXPERT_F]               = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_RS_YOUNGSTER]           = TRAINER_CLASS_RS_YOUNGSTER,
+    [FACILITY_CLASS_CHAMPION_STEVEN]        = TRAINER_CLASS_RS_CHAMPION,
+    [FACILITY_CLASS_RS_FISHERMAN]           = TRAINER_CLASS_RS_FISHERMAN,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M]   = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F]   = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M]   = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F]   = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M]  = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F]  = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_DRAGON_TAMER]           = TRAINER_CLASS_DRAGON_TAMER,
+    [FACILITY_CLASS_RS_BIRD_KEEPER]         = TRAINER_CLASS_RS_BIRD_KEEPER,
+    [FACILITY_CLASS_NINJA_BOY]              = TRAINER_CLASS_NINJA_BOY,
+    [FACILITY_CLASS_BATTLE_GIRL]            = TRAINER_CLASS_BATTLE_GIRL,
+    [FACILITY_CLASS_PARASOL_LADY]           = TRAINER_CLASS_PARASOL_LADY,
+    [FACILITY_CLASS_RS_SWIMMER_F]           = TRAINER_CLASS_RS_SWIMMER_F,
+    [FACILITY_CLASS_RS_PICNICKER]           = TRAINER_CLASS_RS_PICNICKER,
+    [FACILITY_CLASS_RS_TWINS]               = TRAINER_CLASS_RS_TWINS,
+    [FACILITY_CLASS_RS_SAILOR]              = TRAINER_CLASS_RS_SAILOR,
+    [FACILITY_CLASS_BOARDER_M]              = TRAINER_CLASS_BOARDER,
+    [FACILITY_CLASS_BOARDER_F]              = TRAINER_CLASS_BOARDER,
+    [FACILITY_CLASS_COLLECTOR]              = TRAINER_CLASS_COLLECTOR,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY]     = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN]   = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY]       = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2]     = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3]     = TRAINER_CLASS_PKMN_TRAINER,
+    [FACILITY_CLASS_RS_PKMN_BREEDER_M]      = TRAINER_CLASS_RS_PKMN_BREEDER,
+    [FACILITY_CLASS_RS_PKMN_BREEDER_F]      = TRAINER_CLASS_RS_PKMN_BREEDER,
+    [FACILITY_CLASS_RS_PKMN_RANGER_M]       = TRAINER_CLASS_RS_PKMN_RANGER,
+    [FACILITY_CLASS_RS_PKMN_RANGER_F]       = TRAINER_CLASS_RS_PKMN_RANGER,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE]     = TRAINER_CLASS_MAGMA_LEADER,
+    [FACILITY_CLASS_MAGMA_GRUNT_M]          = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_MAGMA_GRUNT_F]          = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_RS_LASS]                = TRAINER_CLASS_RS_LASS,
+    [FACILITY_CLASS_RS_BUG_CATCHER]         = TRAINER_CLASS_RS_BUG_CATCHER,
+    [FACILITY_CLASS_RS_HIKER]               = TRAINER_CLASS_RS_HIKER,
+    [FACILITY_CLASS_RS_YOUNG_COUPLE]        = TRAINER_CLASS_RS_YOUNG_COUPLE,
+    [FACILITY_CLASS_OLD_COUPLE]             = TRAINER_CLASS_OLD_COUPLE,
+    [FACILITY_CLASS_RS_SIS_AND_BRO]         = TRAINER_CLASS_RS_SIS_AND_BRO,
+    [FACILITY_CLASS_AQUA_ADMIN_M]           = TRAINER_CLASS_AQUA_ADMIN,
+    [FACILITY_CLASS_AQUA_ADMIN_F]           = TRAINER_CLASS_AQUA_ADMIN,
+    [FACILITY_CLASS_MAGMA_ADMIN_M]          = TRAINER_CLASS_MAGMA_ADMIN,
+    [FACILITY_CLASS_MAGMA_ADMIN_F]          = TRAINER_CLASS_MAGMA_ADMIN,
+    [FACILITY_CLASS_LEADER_WATTSON]         = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_FLANNERY]        = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_NORMAN]          = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_WINONA]          = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_LEADER_WALLACE]         = TRAINER_CLASS_RS_LEADER,
+    [FACILITY_CLASS_ELITE_FOUR_GLACIA]      = TRAINER_CLASS_RS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_DRAKE]       = TRAINER_CLASS_RS_ELITE_FOUR,
+    [FACILITY_CLASS_YOUNGSTER]              = TRAINER_CLASS_YOUNGSTER,
+    [FACILITY_CLASS_BUG_CATCHER]            = TRAINER_CLASS_BUG_CATCHER,
+    [FACILITY_CLASS_LASS]                   = TRAINER_CLASS_LASS,
+    [FACILITY_CLASS_SAILOR]                 = TRAINER_CLASS_SAILOR,
+    [FACILITY_CLASS_CAMPER]                 = TRAINER_CLASS_CAMPER,
+    [FACILITY_CLASS_PICNICKER]              = TRAINER_CLASS_PICNICKER,
+    [FACILITY_CLASS_POKEMANIAC]             = TRAINER_CLASS_POKEMANIAC,
+    [FACILITY_CLASS_SUPER_NERD]             = TRAINER_CLASS_SUPER_NERD,
+    [FACILITY_CLASS_HIKER]                  = TRAINER_CLASS_HIKER,
+    [FACILITY_CLASS_BIKER]                  = TRAINER_CLASS_BIKER,
+    [FACILITY_CLASS_BURGLAR]                = TRAINER_CLASS_BURGLAR,
+    [FACILITY_CLASS_ENGINEER]               = TRAINER_CLASS_ENGINEER,
+    [FACILITY_CLASS_FISHERMAN]              = TRAINER_CLASS_FISHERMAN,
+    [FACILITY_CLASS_SWIMMER_M]              = TRAINER_CLASS_SWIMMER_M,
+    [FACILITY_CLASS_CUE_BALL]               = TRAINER_CLASS_CUE_BALL,
+    [FACILITY_CLASS_GAMER]                  = TRAINER_CLASS_GAMER,
+    [FACILITY_CLASS_BEAUTY]                 = TRAINER_CLASS_BEAUTY,
+    [FACILITY_CLASS_SWIMMER_F]              = TRAINER_CLASS_SWIMMER_F,
+    [FACILITY_CLASS_PSYCHIC_M]              = TRAINER_CLASS_PSYCHIC,
+    [FACILITY_CLASS_ROCKER]                 = TRAINER_CLASS_ROCKER,
+    [FACILITY_CLASS_JUGGLER]                = TRAINER_CLASS_JUGGLER,
+    [FACILITY_CLASS_TAMER]                  = TRAINER_CLASS_TAMER,
+    [FACILITY_CLASS_BIRD_KEEPER]            = TRAINER_CLASS_BIRD_KEEPER,
+    [FACILITY_CLASS_BLACK_BELT]             = TRAINER_CLASS_BLACK_BELT,
+    [FACILITY_CLASS_RIVAL_EARLY]            = TRAINER_CLASS_RIVAL_EARLY,
+    [FACILITY_CLASS_SCIENTIST]              = TRAINER_CLASS_SCIENTIST,
+    [FACILITY_CLASS_BOSS]                   = TRAINER_CLASS_BOSS,
+    [FACILITY_CLASS_ROCKET_GRUNT_M]         = TRAINER_CLASS_TEAM_ROCKET,
+    [FACILITY_CLASS_COOLTRAINER_M]          = TRAINER_CLASS_COOLTRAINER,
+    [FACILITY_CLASS_COOLTRAINER_F]          = TRAINER_CLASS_COOLTRAINER,
+    [FACILITY_CLASS_ELITE_FOUR_LORELEI]     = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_BRUNO]       = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_LEADER_M]               = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_F]               = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_GENTLEMAN]              = TRAINER_CLASS_GENTLEMAN,
+    [FACILITY_CLASS_RIVAL_LATE]             = TRAINER_CLASS_RIVAL_LATE,
+    [FACILITY_CLASS_CHAMPION_RIVAL]         = TRAINER_CLASS_CHAMPION,
+    [FACILITY_CLASS_CHANNELER]              = TRAINER_CLASS_CHANNELER,
+    [FACILITY_CLASS_TWINS]                  = TRAINER_CLASS_TWINS,
+    [FACILITY_CLASS_COOL_COUPLE]            = TRAINER_CLASS_COOL_COUPLE,
+    [FACILITY_CLASS_YOUNG_COUPLE]           = TRAINER_CLASS_YOUNG_COUPLE,
+    [FACILITY_CLASS_CRUSH_KIN]              = TRAINER_CLASS_CRUSH_KIN,
+    [FACILITY_CLASS_SIS_AND_BRO]            = TRAINER_CLASS_SIS_AND_BRO,
+    [FACILITY_CLASS_PKMN_PROF]              = TRAINER_CLASS_PKMN_PROF,
+    [FACILITY_CLASS_BRENDAN]                = TRAINER_CLASS_PLAYER,
+    [FACILITY_CLASS_MAY]                    = TRAINER_CLASS_PLAYER,
+    [FACILITY_CLASS_RED]                    = TRAINER_CLASS_PLAYER,
+    [FACILITY_CLASS_LEAF]                   = TRAINER_CLASS_PLAYER,
+    [FACILITY_CLASS_ROCKET_GRUNT_F]         = TRAINER_CLASS_TEAM_ROCKET,
+    [FACILITY_CLASS_PSYCHIC_F]              = TRAINER_CLASS_PSYCHIC,
+    [FACILITY_CLASS_CRUSH_GIRL]             = TRAINER_CLASS_CRUSH_GIRL,
+    [FACILITY_CLASS_TUBER]                  = TRAINER_CLASS_TUBER,
+    [FACILITY_CLASS_PKMN_BREEDER]           = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_PKMN_RANGER_M]          = TRAINER_CLASS_PKMN_RANGER,
+    [FACILITY_CLASS_PKMN_RANGER_F]          = TRAINER_CLASS_PKMN_RANGER,
+    [FACILITY_CLASS_AROMA_LADY]             = TRAINER_CLASS_AROMA_LADY,
+    [FACILITY_CLASS_RUIN_MANIAC]            = TRAINER_CLASS_RUIN_MANIAC,
+    [FACILITY_CLASS_LADY]                   = TRAINER_CLASS_LADY,
+    [FACILITY_CLASS_PAINTER]                = TRAINER_CLASS_PAINTER,
+    [FACILITY_CLASS_ELITE_FOUR_AGATHA]      = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_LANCE]       = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_CHAMPION_RIVAL_2]       = TRAINER_CLASS_CHAMPION,
 };
@@ -1,109 +1,109 @@
 const u8 gTrainerClassNames[][13] = {
-    _("{PKMN} TRAINER"),
-    _("{PKMN} TRAINER"),
-    _("AQUA LEADER"),
-    _("TEAM AQUA"),
-    _("AROMA LADY"),
-    _("RUIN MANIAC"),
-    _("INTERVIEWER"),
-    _("TUBER"),
-    _("TUBER"),
-    _("COOLTRAINER"),
-    _("HEX MANIAC"),
-    _("LADY"),
-    _("BEAUTY"),
-    _("RICH BOY"),
-    _("POKéMANIAC"),
-    _("SWIMMER♂"),
-    _("BLACK BELT"),
-    _("GUITARIST"),
-    _("KINDLER"),
-    _("CAMPER"),
-    _("BUG MANIAC"),
-    _("PSYCHIC"),
-    _("GENTLEMAN"),
-    _("ELITE FOUR"),
-    _("LEADER"),
-    _("SCHOOL KID"),
-    _("SR. AND JR."),
-    _("POKéFAN"),
-    _("EXPERT"),
-    _("YOUNGSTER"),
-    _("CHAMPION"),
-    _("FISHERMAN"),
-    _("TRIATHLETE"),
-    _("DRAGON TAMER"),
-    _("BIRD KEEPER"),
-    _("NINJA BOY"),
-    _("BATTLE GIRL"),
-    _("PARASOL LADY"),
-    _("SWIMMER♀"),
-    _("PICNICKER"),
-    _("TWINS"),
-    _("SAILOR"),
-    _("BOARDER"),
-    _("COLLECTOR"),
-    _("{PKMN} TRAINER"),
-    _("{PKMN} BREEDER"),
-    _("{PKMN} RANGER"),
-    _("MAGMA LEADER"),
-    _("TEAM MAGMA"),
-    _("LASS"),
-    _("BUG CATCHER"),
-    _("HIKER"),
-    _("YOUNG COUPLE"),
-    _("OLD COUPLE"),
-    _("SIS AND BRO"),
-    _("AQUA ADMIN"),
-    _("MAGMA ADMIN"),
-    _("YOUNGSTER"),
-    _("BUG CATCHER"),
-    _("LASS"),
-    _("SAILOR"),
-    _("CAMPER"),
-    _("PICNICKER"),
-    _("POKéMANIAC"),
-    _("SUPER NERD"),
-    _("HIKER"),
-    _("BIKER"),
-    _("BURGLAR"),
-    _("ENGINEER"),
-    _("FISHERMAN"),
-    _("SWIMMER♂"),
-    _("CUE BALL"),
-    _("GAMER"),
-    _("BEAUTY"),
-    _("SWIMMER♀"),
-    _("PSYCHIC"),
-    _("ROCKER"),
-    _("JUGGLER"),
-    _("TAMER"),
-    _("BIRD KEEPER"),
-    _("BLACK BELT"),
-    _("RIVAL"),
-    _("SCIENTIST"),
-    _("BOSS"),
-    _("LEADER"),
-    _("TEAM ROCKET"),
-    _("COOLTRAINER"),
-    _("ELITE FOUR"),
-    _("GENTLEMAN"),
-    _("RIVAL"),
-    _("CHAMPION"),
-    _("CHANNELER"),
-    _("TWINS"),
-    _("COOL COUPLE"),
-    _("YOUNG COUPLE"),
-    _("CRUSH KIN"),
-    _("SIS AND BRO"),
-    _("{PKMN} PROF."),
-    _("PLAYER"),
-    _("CRUSH GIRL"),
-    _("TUBER"),
-    _("{PKMN} BREEDER"),
-    _("{PKMN} RANGER"),
-    _("AROMA LADY"),
-    _("RUIN MANIAC"),
-    _("LADY"),
-    _("PAINTER"),
+    [TRAINER_CLASS_NONE]                = _("{PKMN} TRAINER"),
+    [TRAINER_CLASS_PKMN_TRAINER_UNUSED] = _("{PKMN} TRAINER"),
+    [TRAINER_CLASS_AQUA_LEADER]         = _("AQUA LEADER"),
+    [TRAINER_CLASS_TEAM_AQUA]           = _("TEAM AQUA"),
+    [TRAINER_CLASS_RS_AROMA_LADY]       = _("AROMA LADY"),
+    [TRAINER_CLASS_RS_RUIN_MANIAC]      = _("RUIN MANIAC"),
+    [TRAINER_CLASS_INTERVIEWER]         = _("INTERVIEWER"),
+    [TRAINER_CLASS_RS_TUBER_F]          = _("TUBER"),
+    [TRAINER_CLASS_RS_TUBER_M]          = _("TUBER"),
+    [TRAINER_CLASS_RS_COOLTRAINER]      = _("COOLTRAINER"),
+    [TRAINER_CLASS_HEX_MANIAC]          = _("HEX MANIAC"),
+    [TRAINER_CLASS_RS_LADY]             = _("LADY"),
+    [TRAINER_CLASS_RS_BEAUTY]           = _("BEAUTY"),
+    [TRAINER_CLASS_RICH_BOY]            = _("RICH BOY"),
+    [TRAINER_CLASS_RS_POKEMANIAC]       = _("POKéMANIAC"),
+    [TRAINER_CLASS_RS_SWIMMER_M]        = _("SWIMMER♂"),
+    [TRAINER_CLASS_RS_BLACK_BELT]       = _("BLACK BELT"),
+    [TRAINER_CLASS_GUITARIST]           = _("GUITARIST"),
+    [TRAINER_CLASS_KINDLER]             = _("KINDLER"),
+    [TRAINER_CLASS_RS_CAMPER]           = _("CAMPER"),
+    [TRAINER_CLASS_BUG_MANIAC]          = _("BUG MANIAC"),
+    [TRAINER_CLASS_RS_PSYCHIC]          = _("PSYCHIC"),
+    [TRAINER_CLASS_RS_GENTLEMAN]        = _("GENTLEMAN"),
+    [TRAINER_CLASS_RS_ELITE_FOUR]       = _("ELITE FOUR"),
+    [TRAINER_CLASS_RS_LEADER]           = _("LEADER"),
+    [TRAINER_CLASS_SCHOOL_KID]          = _("SCHOOL KID"),
+    [TRAINER_CLASS_SR_AND_JR]           = _("SR. AND JR."),
+    [TRAINER_CLASS_POKEFAN]             = _("POKéFAN"),
+    [TRAINER_CLASS_EXPERT]              = _("EXPERT"),
+    [TRAINER_CLASS_RS_YOUNGSTER]        = _("YOUNGSTER"),
+    [TRAINER_CLASS_RS_CHAMPION]         = _("CHAMPION"),
+    [TRAINER_CLASS_RS_FISHERMAN]        = _("FISHERMAN"),
+    [TRAINER_CLASS_TRIATHLETE]          = _("TRIATHLETE"),
+    [TRAINER_CLASS_DRAGON_TAMER]        = _("DRAGON TAMER"),
+    [TRAINER_CLASS_RS_BIRD_KEEPER]      = _("BIRD KEEPER"),
+    [TRAINER_CLASS_NINJA_BOY]           = _("NINJA BOY"),
+    [TRAINER_CLASS_BATTLE_GIRL]         = _("BATTLE GIRL"),
+    [TRAINER_CLASS_PARASOL_LADY]        = _("PARASOL LADY"),
+    [TRAINER_CLASS_RS_SWIMMER_F]        = _("SWIMMER♀"),
+    [TRAINER_CLASS_RS_PICNICKER]        = _("PICNICKER"),
+    [TRAINER_CLASS_RS_TWINS]            = _("TWINS"),
+    [TRAINER_CLASS_RS_SAILOR]           = _("SAILOR"),
+    [TRAINER_CLASS_BOARDER]             = _("BOARDER"),
+    [TRAINER_CLASS_COLLECTOR]           = _("COLLECTOR"),
+    [TRAINER_CLASS_PKMN_TRAINER]        = _("{PKMN} TRAINER"),
+    [TRAINER_CLASS_RS_PKMN_BREEDER]     = _("{PKMN} BREEDER"),
+    [TRAINER_CLASS_RS_PKMN_RANGER]      = _("{PKMN} RANGER"),
+    [TRAINER_CLASS_MAGMA_LEADER]        = _("MAGMA LEADER"),
+    [TRAINER_CLASS_TEAM_MAGMA]          = _("TEAM MAGMA"),
+    [TRAINER_CLASS_RS_LASS]             = _("LASS"),
+    [TRAINER_CLASS_RS_BUG_CATCHER]      = _("BUG CATCHER"),
+    [TRAINER_CLASS_RS_HIKER]            = _("HIKER"),
+    [TRAINER_CLASS_RS_YOUNG_COUPLE]     = _("YOUNG COUPLE"),
+    [TRAINER_CLASS_OLD_COUPLE]          = _("OLD COUPLE"),
+    [TRAINER_CLASS_RS_SIS_AND_BRO]      = _("SIS AND BRO"),
+    [TRAINER_CLASS_AQUA_ADMIN]          = _("AQUA ADMIN"),
+    [TRAINER_CLASS_MAGMA_ADMIN]         = _("MAGMA ADMIN"),
+    [TRAINER_CLASS_YOUNGSTER]           = _("YOUNGSTER"),
+    [TRAINER_CLASS_BUG_CATCHER]         = _("BUG CATCHER"),
+    [TRAINER_CLASS_LASS]                = _("LASS"),
+    [TRAINER_CLASS_SAILOR]              = _("SAILOR"),
+    [TRAINER_CLASS_CAMPER]              = _("CAMPER"),
+    [TRAINER_CLASS_PICNICKER]           = _("PICNICKER"),
+    [TRAINER_CLASS_POKEMANIAC]          = _("POKéMANIAC"),
+    [TRAINER_CLASS_SUPER_NERD]          = _("SUPER NERD"),
+    [TRAINER_CLASS_HIKER]               = _("HIKER"),
+    [TRAINER_CLASS_BIKER]               = _("BIKER"),
+    [TRAINER_CLASS_BURGLAR]             = _("BURGLAR"),
+    [TRAINER_CLASS_ENGINEER]            = _("ENGINEER"),
+    [TRAINER_CLASS_FISHERMAN]           = _("FISHERMAN"),
+    [TRAINER_CLASS_SWIMMER_M]           = _("SWIMMER♂"),
+    [TRAINER_CLASS_CUE_BALL]            = _("CUE BALL"),
+    [TRAINER_CLASS_GAMER]               = _("GAMER"),
+    [TRAINER_CLASS_BEAUTY]              = _("BEAUTY"),
+    [TRAINER_CLASS_SWIMMER_F]           = _("SWIMMER♀"),
+    [TRAINER_CLASS_PSYCHIC]             = _("PSYCHIC"),
+    [TRAINER_CLASS_ROCKER]              = _("ROCKER"),
+    [TRAINER_CLASS_JUGGLER]             = _("JUGGLER"),
+    [TRAINER_CLASS_TAMER]               = _("TAMER"),
+    [TRAINER_CLASS_BIRD_KEEPER]         = _("BIRD KEEPER"),
+    [TRAINER_CLASS_BLACK_BELT]          = _("BLACK BELT"),
+    [TRAINER_CLASS_RIVAL_EARLY]         = _("RIVAL"),
+    [TRAINER_CLASS_SCIENTIST]           = _("SCIENTIST"),
+    [TRAINER_CLASS_BOSS]                = _("BOSS"),
+    [TRAINER_CLASS_LEADER]              = _("LEADER"),
+    [TRAINER_CLASS_TEAM_ROCKET]         = _("TEAM ROCKET"),
+    [TRAINER_CLASS_COOLTRAINER]         = _("COOLTRAINER"),
+    [TRAINER_CLASS_ELITE_FOUR]          = _("ELITE FOUR"),
+    [TRAINER_CLASS_GENTLEMAN]           = _("GENTLEMAN"),
+    [TRAINER_CLASS_RIVAL_LATE]          = _("RIVAL"),
+    [TRAINER_CLASS_CHAMPION]            = _("CHAMPION"),
+    [TRAINER_CLASS_CHANNELER]           = _("CHANNELER"),
+    [TRAINER_CLASS_TWINS]               = _("TWINS"),
+    [TRAINER_CLASS_COOL_COUPLE]         = _("COOL COUPLE"),
+    [TRAINER_CLASS_YOUNG_COUPLE]        = _("YOUNG COUPLE"),
+    [TRAINER_CLASS_CRUSH_KIN]           = _("CRUSH KIN"),
+    [TRAINER_CLASS_SIS_AND_BRO]         = _("SIS AND BRO"),
+    [TRAINER_CLASS_PKMN_PROF]           = _("{PKMN} PROF."),
+    [TRAINER_CLASS_PLAYER]              = _("PLAYER"),
+    [TRAINER_CLASS_CRUSH_GIRL]          = _("CRUSH GIRL"),
+    [TRAINER_CLASS_TUBER]               = _("TUBER"),
+    [TRAINER_CLASS_PKMN_BREEDER]        = _("{PKMN} BREEDER"),
+    [TRAINER_CLASS_PKMN_RANGER]         = _("{PKMN} RANGER"),
+    [TRAINER_CLASS_AROMA_LADY]          = _("AROMA LADY"),
+    [TRAINER_CLASS_RUIN_MANIAC]         = _("RUIN MANIAC"),
+    [TRAINER_CLASS_LADY]                = _("LADY"),
+    [TRAINER_CLASS_PAINTER]             = _("PAINTER"),
 };
@@ -159,7 +159,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
    TRAINER_SPRITE(RS_RUIN_MANIAC, gTrainerFrontPic_RSRuinManiac, 0x800),
    TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, 0x800),
    TRAINER_SPRITE(RS_TUBER_F, gTrainerFrontPic_RSTuberF, 0x800),
-    TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, 0x800),
+    TRAINER_SPRITE(RS_TUBER_M, gTrainerFrontPic_TuberM, 0x800),
    TRAINER_SPRITE(RS_COOLTRAINER_M, gTrainerFrontPic_RSCooltrainerM, 0x800),
    TRAINER_SPRITE(RS_COOLTRAINER_F, gTrainerFrontPic_RSCooltrainerF, 0x800),
    TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800),
@@ -210,7 +210,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
    TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, 0x800),
    TRAINER_SPRITE(RS_BRENDAN_1, gTrainerFrontPic_RSBrendan1, 0x800),
    TRAINER_SPRITE(RS_MAY_1, gTrainerFrontPic_RSMay1, 0x800),
-    TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, 0x800),
+    TRAINER_SPRITE(RS_POKEMON_BREEDER_M, gTrainerFrontPic_RSPokemonBreederM, 0x800),
    TRAINER_SPRITE(RS_POKEMON_BREEDER_F, gTrainerFrontPic_RSPokemonBreederF, 0x800),
    TRAINER_SPRITE(RS_POKEMON_RANGER_M, gTrainerFrontPic_RSPokemonRangerM, 0x800),
    TRAINER_SPRITE(RS_POKEMON_RANGER_F, gTrainerFrontPic_RSPokemonRangerF, 0x800),
@@ -258,7 +258,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
    TRAINER_SPRITE(TAMER, gTrainerFrontPic_Tamer, 0x800),
    TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, 0x800),
    TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, 0x800),
-    TRAINER_SPRITE(RIVAL_1, gTrainerFrontPic_Rival1, 0x800),
+    TRAINER_SPRITE(RIVAL_EARLY, gTrainerFrontPic_RivalEarly, 0x800),
    TRAINER_SPRITE(SCIENTIST, gTrainerFrontPic_Scientist, 0x800),
    TRAINER_SPRITE(LEADER_GIOVANNI, gTrainerFrontPic_LeaderGiovanni, 0x800),
    TRAINER_SPRITE(ROCKET_GRUNT_M, gTrainerFrontPic_RocketGruntM, 0x800),
@@ -276,7 +276,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
    TRAINER_SPRITE(LEADER_BLAINE, gTrainerFrontPic_LeaderBlaine, 0x800),
    TRAINER_SPRITE(LEADER_SABRINA, gTrainerFrontPic_LeaderSabrina, 0x800),
    TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, 0x800),
-    TRAINER_SPRITE(RIVAL_2, gTrainerFrontPic_Rival2, 0x800),
+    TRAINER_SPRITE(RIVAL_LATE, gTrainerFrontPic_RivalLate, 0x800),
    TRAINER_SPRITE(CHAMPION_RIVAL, gTrainerFrontPic_ChampionRival, 0x800),
    TRAINER_SPRITE(CHANNELER, gTrainerFrontPic_Channeler, 0x800),
    TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800),
@@ -293,7 +293,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
    TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, 0x800),
    TRAINER_SPRITE(CRUSH_GIRL, gTrainerFrontPic_CrushGirl, 0x800),
    TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, 0x800),
-    TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER, gTrainerFrontPic_PokemonBreeder, 0x800),
    TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800),
    TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800),
    TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800),
@@ -311,7 +311,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
    TRAINER_PAL(RS_RUIN_MANIAC, gTrainerPalette_RSRuinManiac),
    TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer),
    TRAINER_PAL(RS_TUBER_F, gTrainerPalette_RSTuberF),
-    TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM),
+    TRAINER_PAL(RS_TUBER_M, gTrainerPalette_TuberM),
    TRAINER_PAL(RS_COOLTRAINER_M, gTrainerPalette_RSCooltrainerM),
    TRAINER_PAL(RS_COOLTRAINER_F, gTrainerPalette_RSCooltrainerF),
    TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac),
@@ -362,7 +362,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
    TRAINER_PAL(WALLY, gTrainerPalette_Wally),
    TRAINER_PAL(RS_BRENDAN_1, gTrainerPalette_RSBrendan1),
    TRAINER_PAL(RS_MAY_1, gTrainerPalette_RSMay1),
-    TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM),
+    TRAINER_PAL(RS_POKEMON_BREEDER_M, gTrainerPalette_RSPokemonBreederM),
    TRAINER_PAL(RS_POKEMON_BREEDER_F, gTrainerPalette_RSPokemonBreederF),
    TRAINER_PAL(RS_POKEMON_RANGER_M, gTrainerPalette_RSPokemonRangerM),
    TRAINER_PAL(RS_POKEMON_RANGER_F, gTrainerPalette_RSPokemonRangerF),
@@ -410,7 +410,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
    TRAINER_PAL(TAMER, gTrainerPalette_Tamer),
    TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper),
    TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt),
-    TRAINER_PAL(RIVAL_1, gTrainerPalette_Rival1),
+    TRAINER_PAL(RIVAL_EARLY, gTrainerPalette_RivalEarly),
    TRAINER_PAL(SCIENTIST, gTrainerPalette_Scientist),
    TRAINER_PAL(LEADER_GIOVANNI, gTrainerPalette_LeaderGiovanni),
    TRAINER_PAL(ROCKET_GRUNT_M, gTrainerPalette_RocketGruntM),
@@ -428,7 +428,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
    TRAINER_PAL(LEADER_BLAINE, gTrainerPalette_LeaderBlaine),
    TRAINER_PAL(LEADER_SABRINA, gTrainerPalette_LeaderSabrina),
    TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman),
-    TRAINER_PAL(RIVAL_2, gTrainerPalette_Rival2),
+    TRAINER_PAL(RIVAL_LATE, gTrainerPalette_RivalLate),
    TRAINER_PAL(CHAMPION_RIVAL, gTrainerPalette_ChampionRival),
    TRAINER_PAL(CHANNELER, gTrainerPalette_Channeler),
    TRAINER_PAL(TWINS, gTrainerPalette_Twins),
@@ -445,7 +445,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
    TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF),
    TRAINER_PAL(CRUSH_GIRL, gTrainerPalette_CrushGirl),
    TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF),
-    TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF),
+    TRAINER_PAL(POKEMON_BREEDER, gTrainerPalette_PokemonBreeder),
    TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM),
    TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
    TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),
@@ -31,8 +31,7 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/item_effects.h"
-#include "constants/trainer_classes.h"
-#include "constants/facility_trainer_classes.h"
+#include "constants/trainers.h"
 #include "constants/hold_effects.h"
 #include "constants/battle_move_effects.h"

@@ -1565,10 +1564,23 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
    },
 };

+// Classes dummied out
 static const u8 sSecretBaseFacilityClasses[][5] = 
 {
-    { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 },
-    { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 },
+    [MALE] = {
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER
+    },
+    [FEMALE] = {
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER,
+        FACILITY_CLASS_YOUNGSTER
+    },
 };

 static const u8 sGetMonDataEVConstants[] = 
@@ -1630,10 +1642,24 @@ static const u16 sDeoxysBaseStats[] =

 const u16 gLinkPlayerFacilityClasses[] = 
 {
-    FACILITY_CLASS_COOLTRAINER_3, FACILITY_CLASS_BLACK_BELT_2, FACILITY_CLASS_CAMPER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_PSYCHIC_3,
-    FACILITY_CLASS_BUG_CATCHER_2, FACILITY_CLASS_TAMER, FACILITY_CLASS_JUGGLER, FACILITY_CLASS_COOLTRAINER_4, FACILITY_CLASS_CHANNELER,
-    FACILITY_CLASS_PICNICKER_2, FACILITY_CLASS_LASS_2, FACILITY_CLASS_PSYCHIC_4, FACILITY_CLASS_CRUSH_GIRL, FACILITY_CLASS_PKMN_BREEDER_3,
-    FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER,
+    // Male
+    FACILITY_CLASS_COOLTRAINER_M,
+    FACILITY_CLASS_BLACK_BELT,
+    FACILITY_CLASS_CAMPER,
+    FACILITY_CLASS_YOUNGSTER,
+    FACILITY_CLASS_PSYCHIC_M,
+    FACILITY_CLASS_BUG_CATCHER,
+    FACILITY_CLASS_TAMER,
+    FACILITY_CLASS_JUGGLER,
+    // Female
+    FACILITY_CLASS_COOLTRAINER_F,
+    FACILITY_CLASS_CHANNELER,
+    FACILITY_CLASS_PICNICKER,
+    FACILITY_CLASS_LASS,
+    FACILITY_CLASS_PSYCHIC_F,
+    FACILITY_CLASS_CRUSH_GIRL,
+    FACILITY_CLASS_PKMN_BREEDER,
+    FACILITY_CLASS_BEAUTY,
 };

 static const struct OamData sOakSpeechNidoranFDummyOamData = 
@@ -5280,9 +5306,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
            // Only if it's a trainer battle with league progression significance
            if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER))
                return;
-            if (!(gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER_2
-                || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2
-                || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2))
+            if (!(gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER
+                || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR
+                || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION))
                return;
        }

@@ -5662,18 +5688,18 @@ static u16 GetBattleBGM(void)
    {
        switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
        {
-            case CLASS_CHAMPION_2:
-                return MUS_VS_CHAMPION;
-            case CLASS_LEADER_2:
-            case CLASS_ELITE_FOUR_2:
-                return MUS_VS_GYM_LEADER;
-            case CLASS_BOSS:
-            case CLASS_TEAM_ROCKET:
-            case CLASS_COOLTRAINER_2:
-            case CLASS_GENTLEMAN_2:
-            case CLASS_RIVAL_2:
-            default:
-                return MUS_VS_TRAINER;
+        case TRAINER_CLASS_CHAMPION:
+            return MUS_VS_CHAMPION;
+        case TRAINER_CLASS_LEADER:
+        case TRAINER_CLASS_ELITE_FOUR:
+            return MUS_VS_GYM_LEADER;
+        case TRAINER_CLASS_BOSS:
+        case TRAINER_CLASS_TEAM_ROCKET:
+        case TRAINER_CLASS_COOLTRAINER:
+        case TRAINER_CLASS_GENTLEMAN:
+        case TRAINER_CLASS_RIVAL_LATE:
+        default:
+            return MUS_VS_TRAINER;
        }
    }
    return MUS_VS_WILD;
@@ -5,7 +5,7 @@
 #include "link.h"
 #include "overworld.h"
 #include "quest_log.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"

 struct QuestLogStruct_TrainerBattleRecord
 {
@@ -39,13 +39,13 @@ void TrySetQuestLogBattleEvent(void)
        {
            switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
            {
-            case CLASS_LEADER_2:
+            case TRAINER_CLASS_LEADER:
                eventId = QL_EVENT_DEFEATED_GYM_LEADER;
                break;
-            case CLASS_CHAMPION_2:
+            case TRAINER_CLASS_CHAMPION:
                eventId = QL_EVENT_DEFEATED_CHAMPION;
                break;
-            case CLASS_ELITE_FOUR_2:
+            case TRAINER_CLASS_ELITE_FOUR:
                eventId = QL_EVENT_DEFEATED_E4_MEMBER;
                break;
            default:
@@ -14,7 +14,7 @@
 #include "region_map.h"
 #include "strings.h"
 #include "constants/maps.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"
 #include "constants/items.h"
 #include "constants/region_map_sections.h"

@@ -338,10 +338,10 @@ static bool8 ShouldRegisterEvent_HandleBeatStoryTrainer(u16 eventId, const u16 *
    if (eventId == QL_EVENT_DEFEATED_TRAINER)
    {
        u8 trainerClass = gTrainers[*eventData].trainerClass;
-        if (   trainerClass == CLASS_RIVAL
-               || trainerClass == CLASS_RIVAL_2
-               || trainerClass == CLASS_CHAMPION_2
-               || trainerClass == CLASS_BOSS)
+        if (trainerClass == TRAINER_CLASS_RIVAL_EARLY
+         || trainerClass == TRAINER_CLASS_RIVAL_LATE
+         || trainerClass == TRAINER_CLASS_CHAMPION
+         || trainerClass == TRAINER_CLASS_BOSS)
            return FALSE;
        return TRUE;
    }
@@ -1680,9 +1680,9 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData)
    GetMapNameGeneric(gStringVar1, r6[0]);
    DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);

-    if (gTrainers[r5[2]].trainerClass == CLASS_RIVAL
-        || gTrainers[r5[2]].trainerClass == CLASS_RIVAL_2
-        || gTrainers[r5[2]].trainerClass == CLASS_CHAMPION_2)
+    if (gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_EARLY
+     || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_LATE
+     || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_CHAMPION)
        DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL));
    else
        DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[r5[2]].trainerName);
@@ -18,7 +18,7 @@
 #include "new_menu_helpers.h"
 #include "constants/songs.h"
 #include "constants/game_stat.h"
-#include "constants/facility_trainer_classes.h"
+#include "constants/trainers.h"

 // Trainer Card Strings
 enum
@@ -308,25 +308,25 @@ static const u8 sLinkTrainerPicFacilityClasses[GENDER_COUNT][NUM_LINK_TRAINER_CA
 {
    [MALE] = 
    {
-        FACILITY_CLASS_COOLTRAINER_3, 
-        FACILITY_CLASS_BLACK_BELT_2, 
-        FACILITY_CLASS_CAMPER_2, 
-        FACILITY_CLASS_YOUNGSTER_2, 
-        FACILITY_CLASS_PSYCHIC_3, 
-        FACILITY_CLASS_BUG_CATCHER_2, 
+        FACILITY_CLASS_COOLTRAINER_M, 
+        FACILITY_CLASS_BLACK_BELT, 
+        FACILITY_CLASS_CAMPER, 
+        FACILITY_CLASS_YOUNGSTER, 
+        FACILITY_CLASS_PSYCHIC_M, 
+        FACILITY_CLASS_BUG_CATCHER, 
        FACILITY_CLASS_TAMER, 
        FACILITY_CLASS_JUGGLER
    },
    [FEMALE] = 
    {
-        FACILITY_CLASS_COOLTRAINER_4,
+        FACILITY_CLASS_COOLTRAINER_F,
        FACILITY_CLASS_CHANNELER, 
-        FACILITY_CLASS_PICNICKER_2, 
-        FACILITY_CLASS_LASS_2, 
-        FACILITY_CLASS_PSYCHIC_2, 
+        FACILITY_CLASS_PICNICKER, 
+        FACILITY_CLASS_LASS, 
+        FACILITY_CLASS_RS_PSYCHIC_F, 
        FACILITY_CLASS_BATTLE_GIRL, 
-        FACILITY_CLASS_PKMN_BREEDER_2, 
-        FACILITY_CLASS_BEAUTY_2
+        FACILITY_CLASS_RS_PKMN_BREEDER_F, 
+        FACILITY_CLASS_BEAUTY
    }
 };

@@ -15,7 +15,7 @@
 #include "constants/items.h"
 #include "constants/songs.h"
 #include "constants/layouts.h"
-#include "constants/facility_trainer_classes.h"
+#include "constants/trainers.h"
 #include "constants/event_objects.h"
 #include "constants/trainer_tower.h"

@@ -103,210 +103,210 @@ extern const u8 gText_XMinYZSec[];
 extern const u8 *const gTrainerTowerChallengeTypeTexts[];

 static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
-    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,      MALE},
-    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER,            FEMALE},
-    {OBJ_EVENT_GFX_TUBER_M_LAND,   FACILITY_CLASS_TUBER_2,          MALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER,      MALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_2,    FEMALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,       MALE},
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY,             FEMALE},
-    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,           FEMALE},
-    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_RICH_BOY,         MALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,       MALE},
-    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE,     MALE},
-    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,       MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,        MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_KINDLER,          MALE},
-    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER,           MALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,       MALE},
-    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC,          MALE},
-    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_2,        FEMALE},
-    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,        MALE},
-    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID,       MALE},
-    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_2,     FEMALE},
-    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN,          MALE},
-    {OBJ_EVENT_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_2,        FEMALE},
-    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT,           MALE},
-    {OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_2,         FEMALE},
-    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,        MALE},
-    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,        MALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,     MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,      MALE},
-    {OBJ_EVENT_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,        MALE},
-    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,      FEMALE},
-    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,     FEMALE},
-    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE,   FEMALE},
-    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,        FEMALE},
-    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR,           MALE},
-    {OBJ_EVENT_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,        MALE},
-    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_PKMN_BREEDER,     MALE},
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_2,   FEMALE},
-    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER,      MALE},
-    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_2,    FEMALE},
-    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_LASS,             FEMALE},
-    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,      MALE},
-    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER,            MALE},
-    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER_2,      MALE},
-    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER_2,    MALE},
-    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_LASS_2,           FEMALE},
-    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR_2,         MALE},
-    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER_2,         MALE},
-    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER_2,      FEMALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC_2,     MALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,       MALE},
-    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER_2,          MALE},
-    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_BIKER,            MALE},
-    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,          MALE},
-    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,         MALE},
-    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN_2,      MALE},
-    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2,   MALE},
-    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,         MALE},
-    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,            MALE},
-    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY_2,         FEMALE},
-    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
-    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC_3,        MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_ROCKER,           MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,          MALE},
-    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_TAMER,            MALE},
-    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER_2,    MALE},
-    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT_2,     MALE},
-    {OBJ_EVENT_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,        MALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_3,    MALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_4,    FEMALE},
-    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN_2,      MALE},
-    {OBJ_EVENT_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,        FEMALE},
-    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_4,        FEMALE},
-    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,       FEMALE},
-    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER_3,          FEMALE},
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_3,   FEMALE},
-    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_3,    MALE},
-    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_4,    FEMALE},
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY_2,     FEMALE},
-    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC_2,    MALE},
-    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY_2,           FEMALE},
-    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_PAINTER,          FEMALE}
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_RS_AROMA_LADY,     FEMALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RS_RUIN_MANIAC,      MALE},
+    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_RS_TUBER_F,        FEMALE},
+    {OBJ_EVENT_GFX_TUBER_M_LAND,   FACILITY_CLASS_RS_TUBER_M,          MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_RS_COOLTRAINER_M,    MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_RS_COOLTRAINER_F,  FEMALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,          MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_RS_LADY,           FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_RS_BEAUTY,         FEMALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_RICH_BOY,            MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_RS_POKEMANIAC,       MALE},
+    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_RS_SWIMMER_M,        MALE},
+    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_RS_BLACK_BELT,       MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,           MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_KINDLER,             MALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_RS_CAMPER,           MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,          MALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_RS_PSYCHIC_M,        MALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_RS_PSYCHIC_F,      FEMALE},
+    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_RS_GENTLEMAN,        MALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID_M,        MALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_F,      FEMALE},
+    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN_M,           MALE},
+    {OBJ_EVENT_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_F,         FEMALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT_M,            MALE},
+    {OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_F,          FEMALE},
+    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_RS_YOUNGSTER,        MALE},
+    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_RS_FISHERMAN,        MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,        MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_RS_BIRD_KEEPER,      MALE},
+    {OBJ_EVENT_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,           MALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,       FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,      FEMALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SWIMMER_F,      FEMALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_RS_PICNICKER,      FEMALE},
+    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_RS_SAILOR,           MALE},
+    {OBJ_EVENT_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,           MALE},
+    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_RS_PKMN_BREEDER_M,   MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_RS_PKMN_BREEDER_F, FEMALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_RS_PKMN_RANGER_M,    MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_RS_PKMN_RANGER_F,  FEMALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_RS_LASS,           FEMALE},
+    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_RS_BUG_CATCHER,      MALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RS_HIKER,            MALE},
+    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,           MALE},
+    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,         MALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_LASS,              FEMALE},
+    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR,              MALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER,              MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,         FEMALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,          MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,          MALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER,               MALE},
+    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_BIKER,               MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,             MALE},
+    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,            MALE},
+    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,           MALE},
+    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M,           MALE},
+    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,            MALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,               MALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,            FEMALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_F,         FEMALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC_M,           MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_ROCKER,              MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,             MALE},
+    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_TAMER,               MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,         MALE},
+    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,          MALE},
+    {OBJ_EVENT_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,           MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_M,       MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_F,     FEMALE},
+    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,           MALE},
+    {OBJ_EVENT_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,         FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_F,         FEMALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,        FEMALE},
+    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER,             FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER,      FEMALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_M,       MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_F,     FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,        FEMALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,         MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY,              FEMALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_PAINTER,           FEMALE}
 };

 static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
-    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,      FEMALE, FEMALE},
-    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,          FEMALE, FEMALE},
-    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,   FEMALE, MALE},
-    {OBJ_EVENT_GFX_OLD_MAN_1,      OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,     MALE, FEMALE},
-    {OBJ_EVENT_GFX_TUBER_M_LAND,   OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO,    MALE, FEMALE},
-    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS_2,        FEMALE, FEMALE},
-    {OBJ_EVENT_GFX_COOLTRAINER_M,  OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,    MALE, FEMALE},
-    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
-    {OBJ_EVENT_GFX_BATTLE_GIRL,    OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,      FEMALE, MALE},
-    {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND,   FACILITY_CLASS_SIS_AND_BRO_2,  FEMALE, MALE}
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,       FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_RS_TWINS,        FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_RS_YOUNG_COUPLE, FEMALE,   MALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,        MALE, FEMALE},
+    {OBJ_EVENT_GFX_TUBER_M_LAND,   OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SIS_AND_BRO,    MALE, FEMALE},
+    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,           FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,       MALE, FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,    FEMALE,   MALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,       FEMALE,   MALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND,   FACILITY_CLASS_SIS_AND_BRO,     FEMALE,   MALE}
 };

 static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {
-    {FACILITY_CLASS_AROMA_LADY,       TRAINER_ENCOUNTER_MUSIC_AQUA},
-    {FACILITY_CLASS_BOARDER_2,        TRAINER_ENCOUNTER_MUSIC_AQUA},
-    {FACILITY_CLASS_TEAM_AQUA_2,      TRAINER_ENCOUNTER_MUSIC_AQUA},
-    {FACILITY_CLASS_GAMER,            TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_RUIN_MANIAC,      TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_YOUNGSTER,        TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_YOUNG_COUPLE,     TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_FISHERMAN,        TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_TRIATHLETE_4,     TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_PKMN_RANGER,      TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_LEADER_2,         TRAINER_ENCOUNTER_MUSIC_TWINS},
-    {FACILITY_CLASS_SIS_AND_BRO,      TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_MAGMA_LEADER,     TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_POKEFAN_2,        TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_PKMN_RANGER_2,    TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_PSYCHIC_3,        TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_PICNICKER_2,      TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_ELITE_FOUR_3,     TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_COOLTRAINER_2,    TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_GUITARIST,        TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_BUG_CATCHER,      TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_PKMN_TRAINER_4,   TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_TRIATHLETE_3,     TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_CAMPER_2,         TRAINER_ENCOUNTER_MUSIC_TWINS},
-    {FACILITY_CLASS_TRIATHLETE_2,     TRAINER_ENCOUNTER_MUSIC_TWINS},
-    {FACILITY_CLASS_TUBER,            TRAINER_ENCOUNTER_MUSIC_INTERVIEWER},
-    {FACILITY_CLASS_BEAUTY_2,         TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_INTERVIEWER,      TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_YOUNGSTER_2,      TRAINER_ENCOUNTER_MUSIC_RICH},
-    {FACILITY_CLASS_PSYCHIC_2,        TRAINER_ENCOUNTER_MUSIC_RICH},
-    {FACILITY_CLASS_TEAM_MAGMA_2,     TRAINER_ENCOUNTER_MUSIC_SWIMMER},
-    {FACILITY_CLASS_SWIMMER_MALE,     TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_PKMN_TRAINER_7,   TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_POKEMANIAC,       TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_SUPER_NERD,       TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_ENGINEER,         TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_MAGMA_ADMIN_2,    TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_BLACK_BELT,       TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_LEADER_5,         TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_SAILOR,           TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_SAILOR_2,         TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_BUG_MANIAC,       TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_PKMN_TRAINER_5,   TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_CAMPER,           TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_KINDLER,          TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_BATTLE_GIRL,      TRAINER_ENCOUNTER_MUSIC_MAGMA},
-    {FACILITY_CLASS_COLLECTOR,        TRAINER_ENCOUNTER_MUSIC_MAGMA},
-    {FACILITY_CLASS_NINJA_BOY,        TRAINER_ENCOUNTER_MUSIC_MAGMA},
-    {FACILITY_CLASS_PKMN_TRAINER_3,   TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_PARASOL_LADY,     TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_AQUA_ADMIN_2,     TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_PKMN_TRAINER_2,   TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_SWIMMER_FEMALE,   TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_EXPERT_2,         TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_RICH_BOY,         TRAINER_ENCOUNTER_MUSIC_RICH},
-    {FACILITY_CLASS_HEX_MANIAC,       TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_HIKER,            TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_BEAUTY,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_SWIMMER_FEMALE_2, TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_LADY,             TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_CHAMPION,         TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_PKMN_TRAINER_6,   TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_TRIATHLETE,       TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_SWIMMER_MALE_2,   TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_DRAGON_TAMER,     TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_BIKER,            TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_TRIATHLETE_5,     TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_CUE_BALL,         TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_BIRD_KEEPER,      TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_TRIATHLETE_6,     TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_POKEMANIAC_2,     TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_TWINS,            TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_LEADER_4,         TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_BUG_CATCHER_2,    TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_PKMN_BREEDER,     TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_LEADER_8,         TRAINER_ENCOUNTER_MUSIC_AQUA},
-    {FACILITY_CLASS_LEADER_6,         TRAINER_ENCOUNTER_MUSIC_AQUA},
-    {FACILITY_CLASS_OLD_COUPLE,       TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_PSYCHIC,          TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_LEADER,           TRAINER_ENCOUNTER_MUSIC_TWINS},
-    {FACILITY_CLASS_ELITE_FOUR_4,     TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR},
-    {FACILITY_CLASS_GENTLEMAN,        TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_LASS,             TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
-    {FACILITY_CLASS_BURGLAR,          TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_PKMN_TRAINER,     TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_SCHOOL_KID,       TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_LEADER_3,         TRAINER_ENCOUNTER_MUSIC_INTENSE},
-    {FACILITY_CLASS_POKEFAN,          TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_MAGMA_ADMIN,      TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_EXPERT,           TRAINER_ENCOUNTER_MUSIC_COOL},
-    {FACILITY_CLASS_TEAM_MAGMA,       TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_SR_AND_JR,        TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_LASS_2,           TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_SCHOOL_KID_2,     TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_COOLTRAINER,      TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_FISHERMAN_2,      TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_TUBER_2,          TRAINER_ENCOUNTER_MUSIC_GIRL},
-    {FACILITY_CLASS_HIKER_2,          TRAINER_ENCOUNTER_MUSIC_SWIMMER},
-    {FACILITY_CLASS_BOARDER,          TRAINER_ENCOUNTER_MUSIC_SWIMMER},
-    {FACILITY_CLASS_PKMN_BREEDER_2,   TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_PICNICKER,        TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_LEADER_7,         TRAINER_ENCOUNTER_MUSIC_MALE},
-    {FACILITY_CLASS_ELITE_FOUR,       TRAINER_ENCOUNTER_MUSIC_FEMALE},
-    {FACILITY_CLASS_AQUA_ADMIN,       TRAINER_ENCOUNTER_MUSIC_HIKER},
-    {FACILITY_CLASS_ELITE_FOUR_2,     TRAINER_ENCOUNTER_MUSIC_MALE}
+    {FACILITY_CLASS_RS_AROMA_LADY,          TRAINER_ENCOUNTER_MUSIC_AQUA},
+    {FACILITY_CLASS_BOARDER_F,              TRAINER_ENCOUNTER_MUSIC_AQUA},
+    {FACILITY_CLASS_AQUA_GRUNT_F,           TRAINER_ENCOUNTER_MUSIC_AQUA},
+    {FACILITY_CLASS_GAMER,                  TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_RUIN_MANIAC,         TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_YOUNGSTER,           TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_RS_YOUNG_COUPLE,        TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_FISHERMAN,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RUNNING_TRIATHLETE_F,   TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RS_PKMN_RANGER_M,       TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_LEADER_BRAWLY,          TRAINER_ENCOUNTER_MUSIC_TWINS},
+    {FACILITY_CLASS_RS_SIS_AND_BRO,         TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_MAGMA_LEADER_MAXIE,     TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_POKEFAN_F,              TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_RS_PKMN_RANGER_F,       TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_PSYCHIC_M,              TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_PICNICKER,              TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_ELITE_FOUR_GLACIA,      TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_RS_COOLTRAINER_F,       TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_GUITARIST,              TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_RS_BUG_CATCHER,         TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3, TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RUNNING_TRIATHLETE_M,   TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_CAMPER,                 TRAINER_ENCOUNTER_MUSIC_TWINS},
+    {FACILITY_CLASS_CYCLING_TRIATHLETE_F,   TRAINER_ENCOUNTER_MUSIC_TWINS},
+    {FACILITY_CLASS_RS_TUBER_F,             TRAINER_ENCOUNTER_MUSIC_INTERVIEWER},
+    {FACILITY_CLASS_BEAUTY,                 TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_INTERVIEWER,            TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_YOUNGSTER,              TRAINER_ENCOUNTER_MUSIC_RICH},
+    {FACILITY_CLASS_RS_PSYCHIC_F,           TRAINER_ENCOUNTER_MUSIC_RICH},
+    {FACILITY_CLASS_MAGMA_GRUNT_F,          TRAINER_ENCOUNTER_MUSIC_SWIMMER},
+    {FACILITY_CLASS_RS_SWIMMER_M,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_PKMN_TRAINER_MAY_3,     TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_RS_POKEMANIAC,          TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_SUPER_NERD,             TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_ENGINEER,               TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_MAGMA_ADMIN_F,          TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_RS_BLACK_BELT,          TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_LEADER_FLANNERY,        TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_RS_SAILOR,              TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_SAILOR,                 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_BUG_MANIAC,             TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_PKMN_TRAINER_MAY,       TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RS_CAMPER,              TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_KINDLER,                TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_BATTLE_GIRL,            TRAINER_ENCOUNTER_MUSIC_MAGMA},
+    {FACILITY_CLASS_COLLECTOR,              TRAINER_ENCOUNTER_MUSIC_MAGMA},
+    {FACILITY_CLASS_NINJA_BOY,              TRAINER_ENCOUNTER_MUSIC_MAGMA},
+    {FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2, TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_PARASOL_LADY,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_AQUA_ADMIN_F,           TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_PKMN_TRAINER_BRENDAN,   TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RS_SWIMMER_F,           TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_EXPERT_F,               TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_RICH_BOY,               TRAINER_ENCOUNTER_MUSIC_RICH},
+    {FACILITY_CLASS_HEX_MANIAC,             TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_RS_HIKER,               TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_BEAUTY,              TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_SWIMMER_F,              TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_LADY,                TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_CHAMPION_STEVEN,        TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_PKMN_TRAINER_MAY_2,     TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_CYCLING_TRIATHLETE_M,   TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_SWIMMER_M,              TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_DRAGON_TAMER,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_BIKER,                  TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_SWIMMING_TRIATHLETE_M,  TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_CUE_BALL,               TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_RS_BIRD_KEEPER,         TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_SWIMMING_TRIATHLETE_F,  TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_POKEMANIAC,             TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_RS_TWINS,               TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_LEADER_WATTSON,         TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_BUG_CATCHER,            TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RS_PKMN_BREEDER_M,      TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_LEADER_WALLACE,         TRAINER_ENCOUNTER_MUSIC_AQUA},
+    {FACILITY_CLASS_LEADER_NORMAN,          TRAINER_ENCOUNTER_MUSIC_AQUA},
+    {FACILITY_CLASS_OLD_COUPLE,             TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_RS_PSYCHIC_M,           TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_LEADER_ROXANNE,         TRAINER_ENCOUNTER_MUSIC_TWINS},
+    {FACILITY_CLASS_ELITE_FOUR_DRAKE,       TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR},
+    {FACILITY_CLASS_RS_GENTLEMAN,           TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_RS_LASS,                TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
+    {FACILITY_CLASS_BURGLAR,                TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_PKMN_TRAINER_WALLY,     TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_SCHOOL_KID_M,           TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_LEADER_TATE_AND_LIZA,   TRAINER_ENCOUNTER_MUSIC_INTENSE},
+    {FACILITY_CLASS_POKEFAN_M,              TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_MAGMA_ADMIN_M,          TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_EXPERT_M,               TRAINER_ENCOUNTER_MUSIC_COOL},
+    {FACILITY_CLASS_MAGMA_GRUNT_M,          TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_SR_AND_JR,              TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_LASS,                   TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_SCHOOL_KID_F,           TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_RS_COOLTRAINER_M,       TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_FISHERMAN,              TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_RS_TUBER_M,             TRAINER_ENCOUNTER_MUSIC_GIRL},
+    {FACILITY_CLASS_HIKER,                  TRAINER_ENCOUNTER_MUSIC_SWIMMER},
+    {FACILITY_CLASS_BOARDER_M,              TRAINER_ENCOUNTER_MUSIC_SWIMMER},
+    {FACILITY_CLASS_RS_PKMN_BREEDER_F,      TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_RS_PICNICKER,           TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_LEADER_WINONA,          TRAINER_ENCOUNTER_MUSIC_MALE},
+    {FACILITY_CLASS_ELITE_FOUR_SIDNEY,      TRAINER_ENCOUNTER_MUSIC_FEMALE},
+    {FACILITY_CLASS_AQUA_ADMIN_M,           TRAINER_ENCOUNTER_MUSIC_HIKER},
+    {FACILITY_CLASS_ELITE_FOUR_PHOEBE,      TRAINER_ENCOUNTER_MUSIC_MALE}
 };

 static const struct WindowTemplate sTimeBoardWindowTemplate[] = {
@@ -6,7 +6,7 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/trainer_tower.h"
-#include "constants/facility_trainer_classes.h"
+#include "constants/trainers.h"

 // Dummy strings must be declared explicitly for the sake of modern gcc
 #define DUMMY_TOWER_MON(iv) {.hpIV = iv, .attackIV = iv, .defenseIV = iv, .speedIV = iv, .spAttackIV = iv, .spDefenseIV = iv, .nickname = _("$$$$$$$$$$")}
@@ -20,7 +20,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_4 = {
 	.trainers = {
 	    {
 			.name = _("COLE"),
-			.facilityClass = FACILITY_CLASS_YOUNGSTER_2,
+			.facilityClass = FACILITY_CLASS_YOUNGSTER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_AHAHA, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_ANYWHERE, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_WORD_BYE_BYE, EC_WORD_EXCL, 0xFFFF, 0xFFFF},
@@ -330,7 +330,7 @@ static const struct TrainerTowerFloor gUnknown_847B36C = {
 	.trainers = {
 	    {
 			.name = _("MILY"),
-			.facilityClass = FACILITY_CLASS_PSYCHIC_4,
+			.facilityClass = FACILITY_CLASS_PSYCHIC_F,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(SUPERPOWER), EC_WORD_EXCL},
 			.speechWin = {EC_WORD_ISN_T, EC_WORD_IT, EC_WORD_INCREDIBLE, EC_WORD_QUES, EC_WORD_POKEMON, EC_WORD_POWER},
@@ -782,7 +782,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_6 = {
 	.trainers = {
 	    {
 			.name = _("EMY & ALEK"),
-			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2,
+			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LOST, EC_WORD_IN, EC_WORD_LOVEY_DOVEY, EC_WORD_HAPPINESS},
 			.speechWin = {EC_WORD_OH, EC_WORD_OH, EC_WORD_HE, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME},
@@ -925,7 +925,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_6 = {
 		},
 		{
 			.name = _("EMY & ALEK"),
-			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2,
+			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_GIDDY, EC_WORD_WITH, EC_WORD_LOVEY_DOVEY, EC_WORD_JOY, EC_WORD_EXCL_EXCL},
 			.speechWin = {EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_IS, EC_WORD_CUTE},
@@ -1815,7 +1815,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_2 = {
 	.trainers = {
 	    {
 			.name = _("MIKE"),
-			.facilityClass = FACILITY_CLASS_HIKER_2,
+			.facilityClass = FACILITY_CLASS_HIKER,
 			.textColor = 5,
 			.speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_FULL, EC_WORD_OF, EC_WORD_POWER},
 			.speechWin = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_QUES},
@@ -2101,7 +2101,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_2 = {
 		},
 		{
 			.name = _("NICOLAS"),
-			.facilityClass = FACILITY_CLASS_BLACK_BELT_2,
+			.facilityClass = FACILITY_CLASS_BLACK_BELT,
 			.textColor = 5,
 			.speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_WHERE, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_EVER, EC_WORD_BEAT, EC_WORD_ME},
@@ -2254,7 +2254,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_5 = {
 	.trainers = {
 	    {
 			.name = _("JOEY"),
-			.facilityClass = FACILITY_CLASS_CAMPER_2,
+			.facilityClass = FACILITY_CLASS_CAMPER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SCARY, EC_WORD_STRONG, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_WERE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES},
@@ -2409,7 +2409,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_8 = {
 	.trainers = {
 	    {
 			.name = _("LILY"),
-			.facilityClass = FACILITY_CLASS_PKMN_BREEDER_3,
+			.facilityClass = FACILITY_CLASS_PKMN_BREEDER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_EXCL},
 			.speechWin = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL},
@@ -2564,7 +2564,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_2 = {
 	.trainers = {
 	    {
 			.name = _("BRANDON"),
-			.facilityClass = FACILITY_CLASS_BUG_CATCHER_2,
+			.facilityClass = FACILITY_CLASS_BUG_CATCHER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_POISON, EC_WORD_IS, EC_WORD_JUST, EC_WORD_SO, EC_WORD_AWFUL, EC_WORD_ISN_T_IT_QUES},
 			.speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_ISN_T, EC_WORD_POISON, EC_WORD_TERRIBLE, EC_WORD_QUES},
@@ -3016,7 +3016,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_1 = {
 	.trainers = {
 	    {
 			.name = _("JEN & KIRA"),
-			.facilityClass = FACILITY_CLASS_TWINS_2,
+			.facilityClass = FACILITY_CLASS_TWINS,
 			.textColor = 5,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_EHEHE, EC_WORD_YAY, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
@@ -3159,7 +3159,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_1 = {
 		},
 		{
 			.name = _("JEN & KIRA"),
-			.facilityClass = FACILITY_CLASS_TWINS_2,
+			.facilityClass = FACILITY_CLASS_TWINS,
 			.textColor = 3,
 			.speechBefore = {EC_WORD_LET_S, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL, 0xFFFF, 0xFFFF},
 			.speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
@@ -3610,7 +3610,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = {
 	.trainers = {
 	    {
 			.name = _("CHELSEA"),
-			.facilityClass = FACILITY_CLASS_PKMN_RANGER_4,
+			.facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
 			.textColor = 7,
 			.speechBefore = {EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_IMPORTANT, EC_WORD_ISN_T_IT_QUES},
 			.speechWin = {EC_WORD_YOU, EC_WORD_TAKE, EC_WORD_THE, EC_WORD_LOSS, 0xFFFF, 0xFFFF},
@@ -3753,7 +3753,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = {
 		},
 		{
 			.name = _("TRENTON"),
-			.facilityClass = FACILITY_CLASS_PKMN_RANGER_3,
+			.facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
 			.textColor = 7,
 			.speechBefore = {EC_WORD_I, EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREAT, EC_WORD_GREEN, EC_WORD_WORLD},
 			.speechWin = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_YOURS},
@@ -3896,7 +3896,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = {
 		},
 		{
 			.name = _("ALBERT"),
-			.facilityClass = FACILITY_CLASS_COOLTRAINER_3,
+			.facilityClass = FACILITY_CLASS_COOLTRAINER_M,
 			.textColor = 7,
 			.speechBefore = {EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_HERE},
 			.speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_THINGS, EC_WORD_EXCITING},
@@ -4049,7 +4049,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = {
 	.trainers = {
 	    {
 			.name = _("CAMRYN"),
-			.facilityClass = FACILITY_CLASS_PICNICKER_2,
+			.facilityClass = FACILITY_CLASS_PICNICKER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_I, EC_WORD_WON_T, EC_WORD_LOSE, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_WIN},
@@ -4192,7 +4192,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = {
 		},
 		{
 			.name = _("NATALIA"),
-			.facilityClass = FACILITY_CLASS_AROMA_LADY_2,
+			.facilityClass = FACILITY_CLASS_AROMA_LADY,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_THIS, EC_MOVE(SWEET_SCENT), EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_IT, EC_WORD_QUES},
 			.speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_NICE, EC_WORD_QUES, 0xFFFF, 0xFFFF},
@@ -4335,7 +4335,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = {
 		},
 		{
 			.name = _("KATHLEEN"),
-			.facilityClass = FACILITY_CLASS_COOLTRAINER_4,
+			.facilityClass = FACILITY_CLASS_COOLTRAINER_F,
 			.textColor = 7,
 			.speechBefore = {EC_WORD_TOO, EC_WORD_BAD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU},
 			.speechWin = {EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
@@ -4488,7 +4488,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_6 = {
 	.trainers = {
 	    {
 			.name = _("BRADEN"),
-			.facilityClass = FACILITY_CLASS_SWIMMER_MALE_2,
+			.facilityClass = FACILITY_CLASS_SWIMMER_M,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_PRETTY, EC_WORD_HAPPY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_TOUGHNESS},
 			.speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, EC_WORD_SERIOUSLY, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES},
@@ -4643,7 +4643,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_1 = {
 	.trainers = {
 	    {
 			.name = _("ALLYSON"),
-			.facilityClass = FACILITY_CLASS_COOLTRAINER_4,
+			.facilityClass = FACILITY_CLASS_COOLTRAINER_F,
 			.textColor = 7,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_ABOUT, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_TODAY},
 			.speechWin = {EC_WORD_YES, EC_WORD_EXCL_EXCL, EC_WORD_I, EC_WORD_ADORE, EC_WORD_MYSELF, EC_WORD_TODAY},
@@ -4798,7 +4798,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_1 = {
 	.trainers = {
 	    {
 			.name = _("ALBERTO"),
-			.facilityClass = FACILITY_CLASS_SAILOR_2,
+			.facilityClass = FACILITY_CLASS_SAILOR,
 			.textColor = 5,
 			.speechBefore = {EC_WORD_LET_S, EC_WORD_GET, EC_WORD_WITH, EC_WORD_IT, EC_WORD_RIGHT, EC_WORD_AWAY},
 			.speechWin = {EC_WORD_YO, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_WORD_EH_QUES},
@@ -4953,7 +4953,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_5 = {
 	.trainers = {
 	    {
 			.name = _("KAT & KIPP"),
-			.facilityClass = FACILITY_CLASS_SIS_AND_BRO_2,
+			.facilityClass = FACILITY_CLASS_SIS_AND_BRO,
 			.textColor = 4,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_MY, EC_WORD_BEST},
 			.speechWin = {EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO, EC_WORD_MY, EC_WORD_AWESOME, EC_WORD_BROTHER},
@@ -5096,7 +5096,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_5 = {
 		},
 		{
 			.name = _("KAT & KIPP"),
-			.facilityClass = FACILITY_CLASS_SIS_AND_BRO_2,
+			.facilityClass = FACILITY_CLASS_SIS_AND_BRO,
 			.textColor = 4,
 			.speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_NEVER, EC_WORD_LOSE, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE_RE, EC_WORD_TOO_STRONG, EC_WORD_TO, EC_WORD_LOSE},
@@ -5547,7 +5547,7 @@ static const struct TrainerTowerFloor gUnknown_847FD0C = {
 	.trainers = {
 	    {
 			.name = _("LISA&LEAH"),
-			.facilityClass = FACILITY_CLASS_TWINS_2,
+			.facilityClass = FACILITY_CLASS_TWINS,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_ABSOLUTELY, EC_WORD_WE_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
@@ -5690,7 +5690,7 @@ static const struct TrainerTowerFloor gUnknown_847FD0C = {
 		},
 		{
 			.name = _("LISA&LEAH"),
-			.facilityClass = FACILITY_CLASS_TWINS_2,
+			.facilityClass = FACILITY_CLASS_TWINS,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_CAN, EC_WORD_WE, EC_WORD_WIN, EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_EXCITING},
 			.speechWin = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY},
@@ -5844,7 +5844,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = {
 	.trainers = {
 	    {
 			.name = _("PRISCILLA"),
-			.facilityClass = FACILITY_CLASS_TUBER_3,
+			.facilityClass = FACILITY_CLASS_TUBER,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_GIRL, EC_WORD_HERE_I_COME, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DID, EC_WORD_I, EC_WORD_WIN, EC_WORD_QUES},
@@ -5987,7 +5987,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = {
 		},
 		{
 			.name = _("CHARLOTTE"),
-			.facilityClass = FACILITY_CLASS_LADY_2,
+			.facilityClass = FACILITY_CLASS_LADY,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_HELLO, EC_WORD_THERE, EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY},
 			.speechWin = {EC_WORD_OH, EC_WORD_MY, EC_WORD_MY, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SORRY},
@@ -6130,7 +6130,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = {
 		},
 		{
 			.name = _("SHANIA"),
-			.facilityClass = FACILITY_CLASS_SWIMMER_FEMALE_2,
+			.facilityClass = FACILITY_CLASS_SWIMMER_F,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_HEROINE, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
 			.speechWin = {EC_WORD_AHAHA, EC_WORD_NO, EC_WORD_WAY, EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_SERIOUSLY},
@@ -6283,7 +6283,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = {
 	.trainers = {
 	    {
 			.name = _("BRENNAN"),
-			.facilityClass = FACILITY_CLASS_SAILOR_2,
+			.facilityClass = FACILITY_CLASS_SAILOR,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_TAKE, EC_WORD_THINGS, EC_WORD_EASY, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_IMPORTANT},
 			.speechWin = {EC_WORD_YOU, EC_WORD_LOSE, EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_EXCL},
@@ -6426,7 +6426,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = {
 		},
 		{
 			.name = _("KADEN"),
-			.facilityClass = FACILITY_CLASS_FISHERMAN_2,
+			.facilityClass = FACILITY_CLASS_FISHERMAN,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_MY, EC_WORD_FISHING, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_IS, EC_WORD_FANTASTIC},
 			.speechWin = {EC_WORD_MY, EC_WORD_FANTASTIC, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_WINS, EC_WORD_OUT},
@@ -6569,7 +6569,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = {
 		},
 		{
 			.name = _("EMANUEL"),
-			.facilityClass = FACILITY_CLASS_GENTLEMAN_2,
+			.facilityClass = FACILITY_CLASS_GENTLEMAN,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_HMM, EC_WORD_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SKILLED, EC_WORD_QUES},
 			.speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_RIGHT, EC_WORD_ELLIPSIS},
@@ -7032,7 +7032,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_2 = {
 	.trainers = {
 	    {
 			.name = _("LORENZO"),
-			.facilityClass = FACILITY_CLASS_PSYCHIC_3,
+			.facilityClass = FACILITY_CLASS_PSYCHIC_M,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_THIS, EC_WORD_POWER, EC_WORD_IS, EC_WORD_NOW, EC_WORD_COMPLETE, EC_WORD_EXCL},
 			.speechWin = {EC_WORD_NO, EC_WORD_KEEN_EYE, EC_WORD_CAN, EC_WORD_STOP, EC_WORD_MY, EC_WORD_POWER},
@@ -7484,7 +7484,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_7 = {
 	.trainers = {
 		{
 			.name = _("AXE & REN"),
-			.facilityClass = FACILITY_CLASS_SIS_AND_BRO_2,
+			.facilityClass = FACILITY_CLASS_SIS_AND_BRO,
 			.textColor = 2,
 			.speechBefore = {EC_WORD_IT_S, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_WORD_AWFULLY, EC_WORD_COLD},
 			.speechWin = {EC_WORD_THAT_S, EC_WORD_THAT, EC_WORD_MAN, EC_WORD_I_AM, EC_WORD_COLD, EC_WORD_EXCL},
@@ -7627,7 +7627,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_7 = {
 		},
 		{
 			.name = _("AXE & REN"),
-			.facilityClass = FACILITY_CLASS_SIS_AND_BRO_2,
+			.facilityClass = FACILITY_CLASS_SIS_AND_BRO,
 			.textColor = 2,
 			.speechBefore = {EC_WORD_OUR, EC_WORD_SWIFT_SWIM, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_COLD},
 			.speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_HOT},
@@ -7781,7 +7781,7 @@ static const struct TrainerTowerFloor gUnknown_8481C0C = {
 	.trainers = {
 		{
 			.name = _("KATI & GEB"),
-			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2,
+			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE,
 			.textColor = 2,
 			.speechBefore = {EC_WORD_WELCOME, EC_WORD_TO, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_MOVE2(THUNDER_WAVE), EC_MOVE(SANDSTORM)},
 			.speechWin = {EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LALALA, EC_WORD_LIFE},
@@ -7924,7 +7924,7 @@ static const struct TrainerTowerFloor gUnknown_8481C0C = {
 		},
 		{
 			.name = _("KATI & GEB"),
-			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2,
+			.facilityClass = FACILITY_CLASS_YOUNG_COUPLE,
 			.textColor = 2,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_PLUS, EC_WORD_YOU_RE, EC_WORD_MINUS, EC_WORD_LOVEY_DOVEY, EC_WORD_MAGNET_PULL},
 			.speechWin = {EC_WORD_DON_T, EC_WORD_STOP, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LOCOMOTIVE, EC_WORD_EXCL},
@@ -8517,7 +8517,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_5 = {
 	.trainers = {
 		{
 			.name = _("MAURA"),
-			.facilityClass = FACILITY_CLASS_BEAUTY_2,
+			.facilityClass = FACILITY_CLASS_BEAUTY,
 			.textColor = 2,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_GROUP, EC_WORD_LEADER, EC_WORD_EXCL, 0xFFFF},
 			.speechWin = {EC_WORD_WHAT, EC_WORD_AM, EC_WORD_I, EC_WORD_LEADER, EC_WORD_OF, EC_WORD_QUES},
@@ -8660,7 +8660,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_5 = {
 		},
 		{
 			.name = _("MIKAELA"),
-			.facilityClass = FACILITY_CLASS_LASS_2,
+			.facilityClass = FACILITY_CLASS_LASS,
 			.textColor = 1,
 			.speechBefore = {EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_THE, EC_WORD_NO_1, EC_WORD_TRAINER, EC_WORD_HERE},
 			.speechWin = {EC_WORD_NEVER, EC_WORD_SAID, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_AT},