add more consistent names

1 files changed, 78 insertions, 78 deletions

diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index 0d3cd0fe7..4d3492e8b 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -4,30 +4,30 @@
 const u8 gFacilityClassToPicIndex[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER,
-    [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M,
-    [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F,
-    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR,
-    [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F,
     [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M,
-    [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M,
     [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M,
     [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT,
-    [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE,
     [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC,
     [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY,
     [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC,
     [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER,
-    [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F,
-    [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M,
-    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_PIC_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_PIC_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F,
     [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY,
     [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY,
     [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY,
-    [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F,
     [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F,
     [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST,
     [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER,
     [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER,
@@ -36,25 +36,25 @@ const u8 gFacilityClassToPicIndex[] =
     [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M,
     [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F,
     [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN,
-    [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY,
-    [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE,
-    [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE,
-    [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY,
-    [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA,
+    [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_1] = TRAINER_PIC_POKEFAN_M,
-    [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F,
     [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER,
-    [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_PIC_CHAMPION_WALLACE,
     [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN,
-    [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-    [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-    [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
+    [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_NINJA_BOY] = TRAINER_PIC_NINJA_BOY,
     [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL,
@@ -62,58 +62,58 @@ const u8 gFacilityClassToPicIndex[] =
     [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F,
     [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS,
     [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR,
-    [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY,
     [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN,
     [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M,
     [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER,
     [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M,
     [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F,
-    [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE,
     [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS,
     [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE,
     [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE,
     [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO,
-    [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN,
-    [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL,
-    [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER,
-    [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED,
-    [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY,
+    [FACILITY_CLASS_STEVEN] = TRAINER_PIC_STEVEN,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_PIC_SALON_MAIDEN_ANABEL,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_PIC_DOME_ACE_TUCKER,
+    [FACILITY_CLASS_RED] = TRAINER_PIC_RED,
+    [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_PIC_RS_BRENDAN,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY,
 };
 
 const u8 gFacilityClassToTrainerClass[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER,
-    [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA,
-    [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER,
-    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR,
-    [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA,
     [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M,
-    [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA,
     [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT,
     [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT,
-    [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER,
     [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC,
     [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY,
     [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC,
     [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER,
-    [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1,
-    [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2,
-    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_CLASS_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_CLASS_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER,
     [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY,
     [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY,
     [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY,
-    [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT,
     [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA,
     [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST,
     [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER,
     [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER,
@@ -122,25 +122,25 @@ const u8 gFacilityClassToTrainerClass[] =
     [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC,
     [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC,
     [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN,
-    [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_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_1] = TRAINER_CLASS_POKEFAN,
-    [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN,
     [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER,
-    [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_CLASS_CHAMPION,
     [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN,
-    [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE,
+    [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_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY,
     [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL,
@@ -148,29 +148,29 @@ const u8 gFacilityClassToTrainerClass[] =
     [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F,
     [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS,
     [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR,
-    [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER,
     [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER,
     [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER,
     [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER,
-    [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER,
     [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS,
     [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE,
     [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE,
     [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO,
-    [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN,
-    [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE,
-    [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4,
+    [FACILITY_CLASS_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_CLASS_SALON_MAIDEN,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE,
+    [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4,
 };
 
 #endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H