Fix merge conflicts

19 files changed, 994 insertions, 990 deletions

diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc
index 034c1b62c..8b05d88eb 100644
--- a/data/battle_frontier/battle_frontier_trainers.inc
+++ b/data/battle_frontier/battle_frontier_trainers.inc
@@ -625,7 +625,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Lauren
 
 @ 24
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "KIPP$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IF_I_WIN
@@ -651,7 +651,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kipp
 
 @ 25
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_TEACH
@@ -677,7 +677,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jason
 
 @ 26
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JOHN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -703,7 +703,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_John
 
 @ 27
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ANN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT_S
@@ -729,7 +729,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ann
 
 @ 28
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "EILEEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -755,7 +755,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eileen
 
 @ 29
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "CARLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -937,7 +937,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathy
 
 @ 36
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "PEYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -963,7 +963,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Peyton
 
 @ 37
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "JULIAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -989,7 +989,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Julian
 
 @ 38
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "QUINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -1015,7 +1015,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Quinn
 
 @ 39
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "HAYLEE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1041,7 +1041,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Haylee
 
 @ 40
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "AMANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1067,7 +1067,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Amanda
 
 @ 41
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "STACY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1093,7 +1093,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Stacy
 
 @ 42
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "RAFAEL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -1119,7 +1119,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Rafael
 
 @ 43
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OLIVER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -1145,7 +1145,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oliver
 
 @ 44
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "PAYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1171,7 +1171,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Payton
 
 @ 45
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "PAMELA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1197,7 +1197,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pamela
 
 @ 46
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "ELIZA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1223,7 +1223,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eliza
 
 @ 47
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "MARISA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2341,7 +2341,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nash
 
 @ 90
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ROBBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -2367,7 +2367,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Robby
 
 @ 91
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "REECE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -2393,7 +2393,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reece
 
 @ 92
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "KATHRYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2419,7 +2419,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathryn
 
 @ 93
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "ELLEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_CRUSH
@@ -2445,7 +2445,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ellen
 
 @ 94
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "RAMON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OKAY
@@ -2471,7 +2471,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ramon
 
 @ 95
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "ARTHUR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HERE_I_COME
@@ -2497,7 +2497,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Arthur
 
 @ 96
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ALONDRA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_EVERY
@@ -2523,7 +2523,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alondra
 
 @ 97
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ADRIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -2549,7 +2549,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Adriana
 
 @ 98
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "MALIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OH
@@ -2575,7 +2575,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malik
 
 @ 99
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "JILL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2601,7 +2601,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jill
 
 @ 100
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ERIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2627,7 +2627,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Erik
 
 @ 101
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "YAZMIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2653,7 +2653,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Yazmin
 
 @ 102
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "JAMAL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2679,7 +2679,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jamal
 
 @ 103
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "LESLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2705,7 +2705,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Leslie
 
 @ 104
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "DAVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WHAT
@@ -2731,7 +2731,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dave
 
 @ 105
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "CARLO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAH
@@ -2757,7 +2757,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Carlo
 
 @ 106
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "EMILIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ME
@@ -2783,7 +2783,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Emilia
 
 @ 107
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "DALIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -3043,7 +3043,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joel
 
 @ 117
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KRISTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -3069,7 +3069,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kristen
 
 @ 118
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "SELPHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES
@@ -3095,7 +3095,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Selphy
 
 @ 119
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "CHLOE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -4057,7 +4057,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Graham
 
 @ 156
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TYLOR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ARE
@@ -4083,7 +4083,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Tylor
 
 @ 157
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JAREN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_FIGHTING
@@ -4109,7 +4109,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jaren
 
 @ 158
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "CORDELL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -4135,7 +4135,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Cordell
 
 @ 159
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "JAZLYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IS
@@ -4577,7 +4577,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gunnar
 
 @ 176
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "CRAIG$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4603,7 +4603,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Craig
 
 @ 177
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "PIERCE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THERE
@@ -4629,7 +4629,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pierce
 
 @ 178
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "REGINA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4655,7 +4655,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Regina
 
 @ 179
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ALISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THIS
@@ -5513,7 +5513,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joyce
 
 @ 212
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TODD$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU_RE
@@ -5539,7 +5539,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Todd
 
 @ 213
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "GAVIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5565,7 +5565,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gavin
 
 @ 214
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "MALORY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PROMISE
@@ -5591,7 +5591,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malory
 
 @ 215
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "ESTHER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5617,7 +5617,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Esther
 
 @ 216
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OSCAR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -5643,7 +5643,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oscar
 
 @ 217
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "WILSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WORK
@@ -5669,7 +5669,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Wilson
 
 @ 218
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "CLARE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YAY
@@ -5695,7 +5695,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Clare
 
 @ 219
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "TESS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WANT
@@ -6397,7 +6397,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jasper
 
 @ 246
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "NADIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -6423,7 +6423,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nadia
 
 @ 247
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "MIRANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WELL
@@ -6449,7 +6449,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Miranda
 
 @ 248
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "EMMA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_VE
@@ -6865,7 +6865,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reese
 
 @ 264
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "MASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PLEASE
@@ -6891,7 +6891,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Mason
 
 @ 265
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "TOBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LISTEN
@@ -6917,7 +6917,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Toby
 
 @ 266
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "DOROTHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -6943,7 +6943,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dorothy
 
 @ 267
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "PIPER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -6969,7 +6969,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Piper
 
 @ 268
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "FINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_NOT
@@ -6995,7 +6995,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Finn
 
 @ 269
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "SAMIR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7021,7 +7021,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Samir
 
 @ 270
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "FIONA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DID
@@ -7047,7 +7047,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Fiona
 
 @ 271
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "GLORIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7073,7 +7073,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gloria
 
 @ 272
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "NICO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LIKE
@@ -7099,7 +7099,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nico
 
 @ 273
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "JEREMY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -7125,7 +7125,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jeremy
 
 @ 274
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "CAITLIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DON_T
@@ -7151,7 +7151,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Caitlin
 
 @ 275
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "REENA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
index 675314eb3..f1e2f8c4c 100644
--- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc
+++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Javier
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "NATALIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Natalie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "TREVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LOOK
@@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Mariana
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "SHELDON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Sheldon
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "GIANNA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_AHAHA
@@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Yahir
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "BRITNEY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT
diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc
index 051514b94..92a2f2518 100644
--- a/data/battle_frontier/slateport_battle_tent_trainers.inc
+++ b/data/battle_frontier/slateport_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Malachi
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "KELSIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_GO
@@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Kelsie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "DAVON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YEAH_YEAH
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Rebecca
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "REGGIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_POKEMON
@@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Reggie
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JANAE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Caiden
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KIRSTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES
diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
index b375ce811..5f4dad133 100644
--- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc
+++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Dilan
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ELIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Eliana
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "MARKUS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Ashlyn
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "ADDISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Addison
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JUSTINE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Tyson
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "LAILA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index a87624eb6..cf6eaf929 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -17,7 +17,7 @@
 #define TRAINER_PIC_HIKER                  0
 #define TRAINER_PIC_AQUA_GRUNT_M           1
 #define TRAINER_PIC_POKEMON_BREEDER_F      2
-#define TRAINER_PIC_COOL_TRAINER_M         3
+#define TRAINER_PIC_COOLTRAINER_M          3
 #define TRAINER_PIC_BIRD_KEEPER            4
 #define TRAINER_PIC_COLLECTOR              5
 #define TRAINER_PIC_AQUA_GRUNT_F           6
@@ -34,7 +34,7 @@
 #define TRAINER_PIC_INTERVIEWER           17
 #define TRAINER_PIC_TUBER_F               18
 #define TRAINER_PIC_TUBER_M               19
-#define TRAINER_PIC_COOL_TRAINER_F        20
+#define TRAINER_PIC_COOLTRAINER_F         20
 #define TRAINER_PIC_LADY                  21
 #define TRAINER_PIC_BEAUTY                22
 #define TRAINER_PIC_RICH_BOY              23
@@ -105,8 +105,8 @@
 #define TRAINER_PIC_PYRAMID_KING_BRANDON  88
 #define TRAINER_PIC_RED                   89
 #define TRAINER_PIC_LEAF                  90
-#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91
-#define TRAINER_PIC_RUBY_SAPPHIRE_MAY     92
+#define TRAINER_PIC_RS_BRENDAN            91
+#define TRAINER_PIC_RS_MAY                92
 
 #define TRAINER_BACK_PIC_BRENDAN                0
 #define TRAINER_BACK_PIC_MAY                    1
@@ -117,95 +117,95 @@
 #define TRAINER_BACK_PIC_WALLY                  6
 #define TRAINER_BACK_PIC_STEVEN                 7
 
-#define FACILITY_CLASS_HIKER           0x0
-#define FACILITY_CLASS_TEAM_AQUA_1     0x1
-#define FACILITY_CLASS_PKMN_BREEDER_1  0x2
-#define FACILITY_CLASS_COOLTRAINER_M   0x3
-#define FACILITY_CLASS_BIRD_KEEPER     0x4
-#define FACILITY_CLASS_COLLECTOR       0x5
-#define FACILITY_CLASS_TEAM_AQUA_2     0x6
-#define FACILITY_CLASS_SWIMMER_M       0x7
-#define FACILITY_CLASS_TEAM_MAGMA_1    0x8
-#define FACILITY_CLASS_EXPERT_M        0x9
-#define FACILITY_CLASS_BLACK_BELT      0xa
-#define FACILITY_CLASS_AQUA_LEADER     0xb
-#define FACILITY_CLASS_HEX_MANIAC      0xc
-#define FACILITY_CLASS_AROMA_LADY      0xd
-#define FACILITY_CLASS_RUIN_MANIAC     0xe
-#define FACILITY_CLASS_INTERVIEWER     0xf
-#define FACILITY_CLASS_TUBER_1         0x10
-#define FACILITY_CLASS_TUBER_2         0x11
-#define FACILITY_CLASS_COOLTRAINER_F   0x12
-#define FACILITY_CLASS_LADY            0x13
-#define FACILITY_CLASS_BEAUTY          0x14
-#define FACILITY_CLASS_RICH_BOY        0x15
-#define FACILITY_CLASS_EXPERT_2        0x16
-#define FACILITY_CLASS_POKEMANIAC      0x17
-#define FACILITY_CLASS_TEAM_MAGMA_2    0x18
-#define FACILITY_CLASS_GUITARIST       0x19
-#define FACILITY_CLASS_KINDLER         0x1a
-#define FACILITY_CLASS_CAMPER          0x1b
-#define FACILITY_CLASS_PICNICKER       0x1c
-#define FACILITY_CLASS_BUG_MANIAC      0x1d
-#define FACILITY_CLASS_PSYCHIC_M       0x1e
-#define FACILITY_CLASS_PSYCHIC_F       0x1f
-#define FACILITY_CLASS_GENTLEMAN       0x20
-#define FACILITY_CLASS_ELITE_FOUR_1    0x21
-#define FACILITY_CLASS_ELITE_FOUR_2    0x22
-#define FACILITY_CLASS_LEADER_1        0x23
-#define FACILITY_CLASS_LEADER_2        0x24
-#define FACILITY_CLASS_LEADER_3        0x25
-#define FACILITY_CLASS_SCHOOL_KID_M    0x26
-#define FACILITY_CLASS_SCHOOL_KID_F    0x27
-#define FACILITY_CLASS_SR_AND_JR       0x28
-#define FACILITY_CLASS_POKEFAN_1       0x29
-#define FACILITY_CLASS_POKEFAN_2       0x2a
-#define FACILITY_CLASS_YOUNGSTER       0x2b
-#define FACILITY_CLASS_CHAMPION        0x2c
-#define FACILITY_CLASS_FISHERMAN       0x2d
-#define FACILITY_CLASS_TRIATHLETE_1    0x2e
-#define FACILITY_CLASS_TRIATHLETE_2    0x2f
-#define FACILITY_CLASS_TRIATHLETE_3    0x30
-#define FACILITY_CLASS_TRIATHLETE_4    0x31
-#define FACILITY_CLASS_TRIATHLETE_5    0x32
-#define FACILITY_CLASS_TRIATHLETE_6    0x33
-#define FACILITY_CLASS_DRAGON_TAMER    0x34
-#define FACILITY_CLASS_NINJA_BOY       0x35
-#define FACILITY_CLASS_BATTLE_GIRL     0x36
-#define FACILITY_CLASS_PARASOL_LADY    0x37
-#define FACILITY_CLASS_SWIMMER_F       0x38
-#define FACILITY_CLASS_TWINS           0x39
-#define FACILITY_CLASS_SAILOR          0x3a
-#define FACILITY_CLASS_PKMN_TRAINER_1  0x3b
-#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN  0x3c
-#define FACILITY_CLASS_PKMN_TRAINER_3  0x3d
-#define FACILITY_CLASS_PKMN_TRAINER_4  0x3e
-#define FACILITY_CLASS_PKMN_TRAINER_MAY  0x3f
-#define FACILITY_CLASS_PKMN_TRAINER_6  0x40
-#define FACILITY_CLASS_PKMN_TRAINER_7  0x41
-#define FACILITY_CLASS_PKMN_BREEDER_2  0x42
-#define FACILITY_CLASS_BUG_CATCHER     0x43
-#define FACILITY_CLASS_PKMN_RANGER_M   0x44
-#define FACILITY_CLASS_PKMN_RANGER_F   0x45
-#define FACILITY_CLASS_MAGMA_LEADER    0x46
-#define FACILITY_CLASS_LASS            0x47
-#define FACILITY_CLASS_YOUNG_COUPLE    0x48
-#define FACILITY_CLASS_OLD_COUPLE      0x49
-#define FACILITY_CLASS_SIS_AND_BRO     0x4a
-#define FACILITY_CLASS_PKMN_TRAINER_STEVEN  0x4b
-#define FACILITY_CLASS_SALON_MAIDEN    0x4c
-#define FACILITY_CLASS_DOME_ACE        0x4d
-#define FACILITY_CLASS_PKMN_TRAINER_RED  0x4e
-#define FACILITY_CLASS_PKMN_TRAINER_LEAF 0x4f
-#define FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN 0x50
-#define FACILITY_CLASS_PKMN_TRAINER_RS_MAY 0x51
+#define FACILITY_CLASS_HIKER                0x0
+#define FACILITY_CLASS_AQUA_GRUNT_M         0x1
+#define FACILITY_CLASS_POKEMON_BREEDER_F    0x2
+#define FACILITY_CLASS_COOLTRAINER_M        0x3
+#define FACILITY_CLASS_BIRD_KEEPER          0x4
+#define FACILITY_CLASS_COLLECTOR            0x5
+#define FACILITY_CLASS_AQUA_GRUNT_F         0x6
+#define FACILITY_CLASS_SWIMMER_M            0x7
+#define FACILITY_CLASS_MAGMA_GRUNT_M        0x8
+#define FACILITY_CLASS_EXPERT_M             0x9
+#define FACILITY_CLASS_BLACK_BELT           0xa
+#define FACILITY_CLASS_AQUA_LEADER_ARCHIE   0xb
+#define FACILITY_CLASS_HEX_MANIAC           0xc
+#define FACILITY_CLASS_AROMA_LADY           0xd
+#define FACILITY_CLASS_RUIN_MANIAC          0xe
+#define FACILITY_CLASS_INTERVIEWER          0xf
+#define FACILITY_CLASS_TUBER_F              0x10
+#define FACILITY_CLASS_TUBER_M              0x11
+#define FACILITY_CLASS_COOLTRAINER_F        0x12
+#define FACILITY_CLASS_LADY                 0x13
+#define FACILITY_CLASS_BEAUTY               0x14
+#define FACILITY_CLASS_RICH_BOY             0x15
+#define FACILITY_CLASS_EXPERT_F             0x16
+#define FACILITY_CLASS_POKEMANIAC           0x17
+#define FACILITY_CLASS_MAGMA_GRUNT_F        0x18
+#define FACILITY_CLASS_GUITARIST            0x19
+#define FACILITY_CLASS_KINDLER              0x1a
+#define FACILITY_CLASS_CAMPER               0x1b
+#define FACILITY_CLASS_PICNICKER            0x1c
+#define FACILITY_CLASS_BUG_MANIAC           0x1d
+#define FACILITY_CLASS_PSYCHIC_M            0x1e
+#define FACILITY_CLASS_PSYCHIC_F            0x1f
+#define FACILITY_CLASS_GENTLEMAN            0x20
+#define FACILITY_CLASS_ELITE_FOUR_SIDNEY    0x21
+#define FACILITY_CLASS_ELITE_FOUR_PHOEBE    0x22
+#define FACILITY_CLASS_LEADER_ROXANNE       0x23
+#define FACILITY_CLASS_LEADER_BRAWLY        0x24
+#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25
+#define FACILITY_CLASS_SCHOOL_KID_M         0x26
+#define FACILITY_CLASS_SCHOOL_KID_F         0x27
+#define FACILITY_CLASS_SR_AND_JR            0x28
+#define FACILITY_CLASS_POKEFAN_M            0x29
+#define FACILITY_CLASS_POKEFAN_F            0x2a
+#define FACILITY_CLASS_YOUNGSTER            0x2b
+#define FACILITY_CLASS_CHAMPION_WALLACE     0x2c
+#define FACILITY_CLASS_FISHERMAN            0x2d
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33
+#define FACILITY_CLASS_DRAGON_TAMER         0x34
+#define FACILITY_CLASS_NINJA_BOY            0x35
+#define FACILITY_CLASS_BATTLE_GIRL          0x36
+#define FACILITY_CLASS_PARASOL_LADY         0x37
+#define FACILITY_CLASS_SWIMMER_F            0x38
+#define FACILITY_CLASS_TWINS                0x39
+#define FACILITY_CLASS_SAILOR               0x3a
+#define FACILITY_CLASS_WALLY                0x3b
+#define FACILITY_CLASS_BRENDAN              0x3c
+#define FACILITY_CLASS_BRENDAN_2            0x3d
+#define FACILITY_CLASS_BRENDAN_3            0x3e
+#define FACILITY_CLASS_MAY                  0x3f
+#define FACILITY_CLASS_MAY_2                0x40
+#define FACILITY_CLASS_MAY_3                0x41
+#define FACILITY_CLASS_PKMN_BREEDER_M       0x42
+#define FACILITY_CLASS_BUG_CATCHER          0x43
+#define FACILITY_CLASS_PKMN_RANGER_M        0x44
+#define FACILITY_CLASS_PKMN_RANGER_F        0x45
+#define FACILITY_CLASS_MAGMA_LEADER_MAXIE   0x46
+#define FACILITY_CLASS_LASS                 0x47
+#define FACILITY_CLASS_YOUNG_COUPLE         0x48
+#define FACILITY_CLASS_OLD_COUPLE           0x49
+#define FACILITY_CLASS_SIS_AND_BRO          0x4a
+#define FACILITY_CLASS_STEVEN               0x4b
+#define FACILITY_CLASS_SALON_MAIDEN_ANABEL  0x4c
+#define FACILITY_CLASS_DOME_ACE_TUCKER      0x4d
+#define FACILITY_CLASS_RED                  0x4e
+#define FACILITY_CLASS_LEAF                 0x4f
+#define FACILITY_CLASS_RS_BRENDAN           0x50
+#define FACILITY_CLASS_RS_MAY               0x51
 
 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0
 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1
 #define TRAINER_CLASS_HIKER          0x2
 #define TRAINER_CLASS_TEAM_AQUA      0x3
 #define TRAINER_CLASS_PKMN_BREEDER   0x4
-#define TRAINER_CLASS_COOLTRAINER_1  0x5
+#define TRAINER_CLASS_COOLTRAINER    0x5
 #define TRAINER_CLASS_BIRD_KEEPER    0x6
 #define TRAINER_CLASS_COLLECTOR      0x7
 #define TRAINER_CLASS_SWIMMER_M      0x8
@@ -218,8 +218,8 @@
 #define TRAINER_CLASS_AROMA_LADY     0xf
 #define TRAINER_CLASS_RUIN_MANIAC    0x10
 #define TRAINER_CLASS_INTERVIEWER    0x11
-#define TRAINER_CLASS_TUBER_1        0x12
-#define TRAINER_CLASS_TUBER_2        0x13
+#define TRAINER_CLASS_TUBER_F        0x12
+#define TRAINER_CLASS_TUBER_M        0x13
 #define TRAINER_CLASS_LADY           0x14
 #define TRAINER_CLASS_BEAUTY         0x15
 #define TRAINER_CLASS_RICH_BOY       0x16
@@ -248,7 +248,7 @@
 #define TRAINER_CLASS_SWIMMER_F      0x2d
 #define TRAINER_CLASS_TWINS          0x2e
 #define TRAINER_CLASS_SAILOR         0x2f
-#define TRAINER_CLASS_COOLTRAINER_2  0x30
+#define TRAINER_CLASS_COOLTRAINER_UNUSED  0x30
 #define TRAINER_CLASS_MAGMA_ADMIN    0x31
 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32
 #define TRAINER_CLASS_BUG_CATCHER    0x33
diff --git a/include/graphics.h b/include/graphics.h
index 6ec5c44b2..f51d7fa47 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3282,18 +3282,18 @@ extern const u32 gBattleTerrainPalette_StadiumWallace[];
 extern const u32 gPokedexMenu2_Gfx[];
 extern const u16 gPokedexText_Pal[];
 extern const u32 gPokedexMenu_Gfx[];
-extern const u8 gUnknown_08DC2C5C[];
-extern const u8 gUnknown_08DC2DAC[];
-extern const u8 gUnknown_08DC2A08[];
-extern const u8 gUnknown_08DC2B1C[];
+extern const u8 gPokedexTilemap_Main[];
+extern const u8 gPokedexTilemap_MainUnderlay[];
+extern const u8 gPokedexTilemap_StartMenu1[];
+extern const u8 gPokedexTilemap_StartMenu2[];
 extern const u16 gPokedexHoennBg_Pal[];
 extern const u16 gPokedexText_Pal[];
 extern const u16 gPokedexNationalBg_Pal[];
-extern const u8 gUnknown_08DC3080[];
-extern const u8 gUnknown_08DC3198[];
-extern const u8 gUnknown_08DC2E6C[];
-extern const u8 gUnknown_08DC2F5C[];
-extern const u8 gUnknown_08DC2FEC[];
+extern const u8 gPokedexTilemap_DescriptionScreen[];
+extern const u8 gPokedexTilemap_CryScreen[];
+extern const u8 gPokedexTilemap_SizeScreen[];
+extern const u8 gPokedexTilemap_ScreenSelectBar1[];
+extern const u8 gPokedexTilemap_ScreenSelectBar2[];
 extern const u16 gPokedexCaughtScreenFade_Pal[];
 extern const u32 gPokedexSearchMenu_Gfx[];
 extern const u32 gPokedexSearch2_Tilemap[];
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 36f749061..8cbc62aab 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1250,17 +1250,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
             || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
             }
             else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
                      || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
             }
             else
             {
@@ -1279,17 +1279,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
         }
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
         }
         else
         {
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 152a11ae8..0f5721fb9 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -4791,7 +4791,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
 
     i = 0;
     if (trainerId == TRAINER_PLAYER)
-        j = gFacilityClassToTrainerClass[FACILITY_CLASS_PKMN_TRAINER_BRENDAN];
+        j = gFacilityClassToTrainerClass[FACILITY_CLASS_BRENDAN];
     else if (trainerId == TRAINER_FRONTIER_BRAIN)
         j = GetDomeBrainTrainerClass();
     else
diff --git a/src/battle_main.c b/src/battle_main.c
index 8bdd2220b..de0becd2a 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -451,10 +451,10 @@ const struct TrainerMoney gTrainerMoneyTable[] =
     {TRAINER_CLASS_AROMA_LADY, 10},
     {TRAINER_CLASS_RUIN_MANIAC, 15},
     {TRAINER_CLASS_INTERVIEWER, 12},
-    {TRAINER_CLASS_TUBER_1, 1},
-    {TRAINER_CLASS_TUBER_2, 1},
+    {TRAINER_CLASS_TUBER_F, 1},
+    {TRAINER_CLASS_TUBER_M, 1},
     {TRAINER_CLASS_SIS_AND_BRO, 3},
-    {TRAINER_CLASS_COOLTRAINER_1, 12},
+    {TRAINER_CLASS_COOLTRAINER, 12},
     {TRAINER_CLASS_HEX_MANIAC, 6},
     {TRAINER_CLASS_LADY, 50},
     {TRAINER_CLASS_BEAUTY, 20},
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index e8bd68177..6e8474c12 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -1,30 +1,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,
@@ -33,25 +33,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,
@@ -59,58 +59,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_BRENDAN] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = 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_WALLY] = TRAINER_PIC_WALLY,
+    [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_BRENDAN_2] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_BRENDAN_3] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_MAY] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_MAY_2] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_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,
@@ -119,25 +119,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,
@@ -145,28 +145,28 @@ 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_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] = 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_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_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,
 };
 
diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h
index 9d201193c..dd750b354 100644
--- a/src/data/text/trainer_class_names.h
+++ b/src/data/text/trainer_class_names.h
@@ -4,7 +4,7 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_HIKER] = _("HIKER"),
     [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"),
     [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"),
-    [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"),
+    [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"),
     [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"),
     [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"),
     [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"),
@@ -17,8 +17,8 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"),
     [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"),
     [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"),
-    [TRAINER_CLASS_TUBER_1] = _("TUBER"),
-    [TRAINER_CLASS_TUBER_2] = _("TUBER"),
+    [TRAINER_CLASS_TUBER_F] = _("TUBER"),
+    [TRAINER_CLASS_TUBER_M] = _("TUBER"),
     [TRAINER_CLASS_LADY] = _("LADY"),
     [TRAINER_CLASS_BEAUTY] = _("BEAUTY"),
     [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"),
@@ -47,7 +47,7 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"),
     [TRAINER_CLASS_TWINS] = _("TWINS"),
     [TRAINER_CLASS_SAILOR] = _("SAILOR"),
-    [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"),
+    [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"),
     [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"),
     [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"),
     [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"),
diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
index 537cd557c..371e5a300 100644
--- a/src/data/trainer_graphics/front_pic_anims.h
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -1,3 +1,5 @@
+#include "constants/trainers.h"
+
 const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
     gAnimCmd_General_Frame0,
 };
@@ -372,97 +374,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
 
 const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
 {
-    gTrainerFrontAnims_Hiker,                 // TRAINER_PIC_HIKER
-    gTrainerFrontAnims_AquaGruntM,            // TRAINER_PIC_AQUA_GRUNT_M
-    gTrainerFrontAnims_PokemonBreederF,       // TRAINER_PIC_POKEMON_BREEDER_F
-    gTrainerFrontAnims_CoolTrainerM,          // TRAINER_PIC_COOL_TRAINER_M
-    gTrainerFrontAnims_BirdKeeper,            // TRAINER_PIC_BIRD_KEEPER
-    gTrainerFrontAnims_Collector,             // TRAINER_PIC_COLLECTOR
-    gTrainerFrontAnims_AquaGruntF,            // TRAINER_PIC_AQUA_GRUNT_F
-    gTrainerFrontAnims_SwimmerM,              // TRAINER_PIC_SWIMMER_M
-    gTrainerFrontAnims_MagmaGruntM,           // TRAINER_PIC_MAGMA_GRUNT_M
-    gTrainerFrontAnims_ExpertM,               // TRAINER_PIC_EXPERT_M
-    gTrainerFrontAnims_AquaAdminM,            // TRAINER_PIC_AQUA_ADMIN_M
-    gTrainerFrontAnims_BlackBelt,             // TRAINER_PIC_BLACK_BELT
-    gTrainerFrontAnims_AquaAdminF,            // TRAINER_PIC_AQUA_ADMIN_F
-    gTrainerFrontAnims_AquaLeaderArchie,      // TRAINER_PIC_AQUA_LEADER_ARCHIE
-    gTrainerFrontAnims_HexManiac,             // TRAINER_PIC_HEX_MANIAC
-    gTrainerFrontAnims_AromaLady,             // TRAINER_PIC_AROMA_LADY
-    gTrainerFrontAnims_RuinManiac,            // TRAINER_PIC_RUIN_MANIAC
-    gTrainerFrontAnims_Interviewer,           // TRAINER_PIC_INTERVIEWER
-    gTrainerFrontAnims_TuberF,                // TRAINER_PIC_TUBER_F
-    gTrainerFrontAnims_TuberM,                // TRAINER_PIC_TUBER_M
-    gTrainerFrontAnims_CoolTrainerF,          // TRAINER_PIC_COOL_TRAINER_F
-    gTrainerFrontAnims_Lady,                  // TRAINER_PIC_LADY
-    gTrainerFrontAnims_Beauty,                // TRAINER_PIC_BEAUTY
-    gTrainerFrontAnims_RichBoy,               // TRAINER_PIC_RICH_BOY
-    gTrainerFrontAnims_ExpertF,               // TRAINER_PIC_EXPERT_F
-    gTrainerFrontAnims_Pokemaniac,            // TRAINER_PIC_POKEMANIAC
-    gTrainerFrontAnims_MagmaGruntF,           // TRAINER_PIC_MAGMA_GRUNT_F
-    gTrainerFrontAnims_Guitarist,             // TRAINER_PIC_GUITARIST
-    gTrainerFrontAnims_Kindler,               // TRAINER_PIC_KINDLER
-    gTrainerFrontAnims_Camper,                // TRAINER_PIC_CAMPER
-    gTrainerFrontAnims_Picnicker,             // TRAINER_PIC_PICNICKER
-    gTrainerFrontAnims_BugManiac,             // TRAINER_PIC_BUG_MANIAC
-    gTrainerFrontAnims_PokemonBreederM,       // TRAINER_PIC_POKEMON_BREEDER_M
-    gTrainerFrontAnims_PsychicM,              // TRAINER_PIC_PSYCHIC_M
-    gTrainerFrontAnims_PsychicF,              // TRAINER_PIC_PSYCHIC_F
-    gTrainerFrontAnims_Gentleman,             // TRAINER_PIC_GENTLEMAN
-    gTrainerFrontAnims_EliteFourSidney,       // TRAINER_PIC_ELITE_FOUR_SIDNEY
-    gTrainerFrontAnims_EliteFourPhoebe,       // TRAINER_PIC_ELITE_FOUR_PHOEBE
-    gTrainerFrontAnims_EliteFourGlacia,       // TRAINER_PIC_ELITE_FOUR_GLACIA
-    gTrainerFrontAnims_EliteFourDrake,        // TRAINER_PIC_ELITE_FOUR_DRAKE
-    gTrainerFrontAnims_LeaderRoxanne,         // TRAINER_PIC_LEADER_ROXANNE
-    gTrainerFrontAnims_LeaderBrawly,          // TRAINER_PIC_LEADER_BRAWLY
-    gTrainerFrontAnims_LeaderWattson,         // TRAINER_PIC_LEADER_WATTSON
-    gTrainerFrontAnims_LeaderFlannery,        // TRAINER_PIC_LEADER_FLANNERY
-    gTrainerFrontAnims_LeaderNorman,          // TRAINER_PIC_LEADER_NORMAN
-    gTrainerFrontAnims_LeaderWinona,          // TRAINER_PIC_LEADER_WINONA
-    gTrainerFrontAnims_LeaderTateAndLiza,     // TRAINER_PIC_LEADER_TATE_AND_LIZA
-    gTrainerFrontAnims_LeaderJuan,            // TRAINER_PIC_LEADER_JUAN
-    gTrainerFrontAnims_SchoolKidM,            // TRAINER_PIC_SCHOOL_KID_M
-    gTrainerFrontAnims_SchoolKidF,            // TRAINER_PIC_SCHOOL_KID_F
-    gTrainerFrontAnims_SrAndJr,               // TRAINER_PIC_SR_AND_JR
-    gTrainerFrontAnims_PokefanM,              // TRAINER_PIC_POKEFAN_M
-    gTrainerFrontAnims_PokefanF,              // TRAINER_PIC_POKEFAN_F 
-    gTrainerFrontAnims_Youngster,             // TRAINER_PIC_YOUNGSTER
-    gTrainerFrontAnims_ChampionWallace,       // TRAINER_PIC_CHAMPION_WALLACE
-    gTrainerFrontAnims_Fisherman,             // TRAINER_PIC_FISHERMAN
-    gTrainerFrontAnims_CyclingTriathleteM,    // TRAINER_PIC_CYCLING_TRIATHLETE_M
-    gTrainerFrontAnims_CyclingTriathleteF,    // TRAINER_PIC_CYCLING_TRIATHLETE_F
-    gTrainerFrontAnims_RunningTriathleteM,    // TRAINER_PIC_RUNNING_TRIATHLETE_M
-    gTrainerFrontAnims_RunningTriathleteF,    // TRAINER_PIC_RUNNING_TRIATHLETE_F
-    gTrainerFrontAnims_SwimmingTriathleteM,   // TRAINER_PIC_SWIMMING_TRIATHLETE_M
-    gTrainerFrontAnims_SwimmingTriathleteF,   // TRAINER_PIC_SWIMMING_TRIATHLETE_F
-    gTrainerFrontAnims_DragonTamer,           // TRAINER_PIC_DRAGON_TAMER
-    gTrainerFrontAnims_NinjaBoy,              // TRAINER_PIC_NINJA_BOY
-    gTrainerFrontAnims_BattleGirl,            // TRAINER_PIC_BATTLE_GIRL
-    gTrainerFrontAnims_ParasolLady,           // TRAINER_PIC_PARASOL_LADY
-    gTrainerFrontAnims_SwimmerF,              // TRAINER_PIC_SWIMMER_F
-    gTrainerFrontAnims_Twins,                 // TRAINER_PIC_TWINS
-    gTrainerFrontAnims_Sailor,                // TRAINER_PIC_SAILOR
-    gTrainerFrontAnims_MagmaAdmin,            // TRAINER_PIC_MAGMA_ADMIN
-    gTrainerFrontAnims_Wally,                 // TRAINER_PIC_WALLY
-    gTrainerFrontAnims_Brendan,               // TRAINER_PIC_BRENDAN
-    gTrainerFrontAnims_May,                   // TRAINER_PIC_MAY
-    gTrainerFrontAnims_BugCatcher,            // TRAINER_PIC_BUG_CATCHER
-    gTrainerFrontAnims_PokemonRangerM,        // TRAINER_PIC_POKEMON_RANGER_M
-    gTrainerFrontAnims_PokemonRangerF,        // TRAINER_PIC_POKEMON_RANGER_F
-    gTrainerFrontAnims_MagmaLeaderMaxie,      // TRAINER_PIC_MAGMA_LEADER_MAXIE
-    gTrainerFrontAnims_Lass,                  // TRAINER_PIC_LASS
-    gTrainerFrontAnims_YoungCouple,           // TRAINER_PIC_YOUNG_COUPLE
-    gTrainerFrontAnims_OldCouple,             // TRAINER_PIC_OLD_COUPLE
-    gTrainerFrontAnims_SisAndBro,             // TRAINER_PIC_SIS_AND_BRO
-    gTrainerFrontAnims_Steven,                // TRAINER_PIC_STEVEN
-    gTrainerFrontAnims_SalonMaidenAnabel,     // TRAINER_PIC_SALON_MAIDEN_ANABEL
-    gTrainerFrontAnims_DomeAceTucker,         // TRAINER_PIC_DOME_ACE_TUCKER
-    gTrainerFrontAnims_PalaceMavenSpenser,    // TRAINER_PIC_PALACE_MAVEN_SPENSER
-    gTrainerFrontAnims_ArenaTycoonGreta,      // TRAINER_PIC_ARENA_TYCOON_GRETA
-    gTrainerFrontAnims_FactoryHeadNoland,     // TRAINER_PIC_FACTORY_HEAD_NOLAND
-    gTrainerFrontAnims_PikeQueenLucy,         // TRAINER_PIC_PIKE_QUEEN_LUCY
-    gTrainerFrontAnims_PyramidKingBrandon,    // TRAINER_PIC_PYRAMID_KING_BRANDON
-    gTrainerFrontAnims_Red,                   // TRAINER_PIC_RED
-    gTrainerFrontAnims_Leaf,                  // TRAINER_PIC_LEAF
-    gTrainerFrontAnims_RubySapphireBrendan,   // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
-    gTrainerFrontAnims_RubySapphireMay,       // TRAINER_PIC_RUBY_SAPPHIRE_MAY
+    [TRAINER_PIC_HIKER] = gTrainerFrontAnims_Hiker,
+    [TRAINER_PIC_AQUA_GRUNT_M] = gTrainerFrontAnims_AquaGruntM,
+    [TRAINER_PIC_POKEMON_BREEDER_F] = gTrainerFrontAnims_PokemonBreederF,
+    [TRAINER_PIC_COOLTRAINER_M] = gTrainerFrontAnims_CoolTrainerM,
+    [TRAINER_PIC_BIRD_KEEPER] = gTrainerFrontAnims_BirdKeeper,
+    [TRAINER_PIC_COLLECTOR] = gTrainerFrontAnims_Collector,
+    [TRAINER_PIC_AQUA_GRUNT_F] = gTrainerFrontAnims_AquaGruntF,
+    [TRAINER_PIC_SWIMMER_M] = gTrainerFrontAnims_SwimmerM,
+    [TRAINER_PIC_MAGMA_GRUNT_M] = gTrainerFrontAnims_MagmaGruntM,
+    [TRAINER_PIC_EXPERT_M] = gTrainerFrontAnims_ExpertM,
+    [TRAINER_PIC_AQUA_ADMIN_M] = gTrainerFrontAnims_AquaAdminM,
+    [TRAINER_PIC_BLACK_BELT] = gTrainerFrontAnims_BlackBelt,
+    [TRAINER_PIC_AQUA_ADMIN_F] = gTrainerFrontAnims_AquaAdminF,
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = gTrainerFrontAnims_AquaLeaderArchie,
+    [TRAINER_PIC_HEX_MANIAC] = gTrainerFrontAnims_HexManiac,
+    [TRAINER_PIC_AROMA_LADY] = gTrainerFrontAnims_AromaLady,
+    [TRAINER_PIC_RUIN_MANIAC] = gTrainerFrontAnims_RuinManiac,
+    [TRAINER_PIC_INTERVIEWER] = gTrainerFrontAnims_Interviewer,
+    [TRAINER_PIC_TUBER_F] = gTrainerFrontAnims_TuberF,
+    [TRAINER_PIC_TUBER_M] = gTrainerFrontAnims_TuberM,
+    [TRAINER_PIC_COOLTRAINER_F] = gTrainerFrontAnims_CoolTrainerF,
+    [TRAINER_PIC_LADY] = gTrainerFrontAnims_Lady,
+    [TRAINER_PIC_BEAUTY] = gTrainerFrontAnims_Beauty,
+    [TRAINER_PIC_RICH_BOY] = gTrainerFrontAnims_RichBoy,
+    [TRAINER_PIC_EXPERT_F] = gTrainerFrontAnims_ExpertF,
+    [TRAINER_PIC_POKEMANIAC] = gTrainerFrontAnims_Pokemaniac,
+    [TRAINER_PIC_MAGMA_GRUNT_F] = gTrainerFrontAnims_MagmaGruntF,
+    [TRAINER_PIC_GUITARIST] = gTrainerFrontAnims_Guitarist,
+    [TRAINER_PIC_KINDLER] = gTrainerFrontAnims_Kindler,
+    [TRAINER_PIC_CAMPER] = gTrainerFrontAnims_Camper,
+    [TRAINER_PIC_PICNICKER] = gTrainerFrontAnims_Picnicker,
+    [TRAINER_PIC_BUG_MANIAC] = gTrainerFrontAnims_BugManiac,
+    [TRAINER_PIC_POKEMON_BREEDER_M] = gTrainerFrontAnims_PokemonBreederM,
+    [TRAINER_PIC_PSYCHIC_M] = gTrainerFrontAnims_PsychicM,
+    [TRAINER_PIC_PSYCHIC_F] = gTrainerFrontAnims_PsychicF,
+    [TRAINER_PIC_GENTLEMAN] = gTrainerFrontAnims_Gentleman,
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = gTrainerFrontAnims_EliteFourSidney,
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = gTrainerFrontAnims_EliteFourPhoebe,
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = gTrainerFrontAnims_EliteFourGlacia,
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = gTrainerFrontAnims_EliteFourDrake,
+    [TRAINER_PIC_LEADER_ROXANNE] = gTrainerFrontAnims_LeaderRoxanne,
+    [TRAINER_PIC_LEADER_BRAWLY] = gTrainerFrontAnims_LeaderBrawly,
+    [TRAINER_PIC_LEADER_WATTSON] = gTrainerFrontAnims_LeaderWattson,
+    [TRAINER_PIC_LEADER_FLANNERY] = gTrainerFrontAnims_LeaderFlannery,
+    [TRAINER_PIC_LEADER_NORMAN] = gTrainerFrontAnims_LeaderNorman,
+    [TRAINER_PIC_LEADER_WINONA] = gTrainerFrontAnims_LeaderWinona,
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = gTrainerFrontAnims_LeaderTateAndLiza,
+    [TRAINER_PIC_LEADER_JUAN] = gTrainerFrontAnims_LeaderJuan,
+    [TRAINER_PIC_SCHOOL_KID_M] = gTrainerFrontAnims_SchoolKidM,
+    [TRAINER_PIC_SCHOOL_KID_F] = gTrainerFrontAnims_SchoolKidF,
+    [TRAINER_PIC_SR_AND_JR] = gTrainerFrontAnims_SrAndJr,
+    [TRAINER_PIC_POKEFAN_M] = gTrainerFrontAnims_PokefanM,
+    [TRAINER_PIC_POKEFAN_F] = gTrainerFrontAnims_PokefanF,
+    [TRAINER_PIC_YOUNGSTER] = gTrainerFrontAnims_Youngster,
+    [TRAINER_PIC_CHAMPION_WALLACE] = gTrainerFrontAnims_ChampionWallace,
+    [TRAINER_PIC_FISHERMAN] = gTrainerFrontAnims_Fisherman,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = gTrainerFrontAnims_CyclingTriathleteM,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = gTrainerFrontAnims_CyclingTriathleteF,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = gTrainerFrontAnims_RunningTriathleteM,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = gTrainerFrontAnims_RunningTriathleteF,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = gTrainerFrontAnims_SwimmingTriathleteM,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = gTrainerFrontAnims_SwimmingTriathleteF,
+    [TRAINER_PIC_DRAGON_TAMER] = gTrainerFrontAnims_DragonTamer,
+    [TRAINER_PIC_NINJA_BOY] = gTrainerFrontAnims_NinjaBoy,
+    [TRAINER_PIC_BATTLE_GIRL] = gTrainerFrontAnims_BattleGirl,
+    [TRAINER_PIC_PARASOL_LADY] = gTrainerFrontAnims_ParasolLady,
+    [TRAINER_PIC_SWIMMER_F] = gTrainerFrontAnims_SwimmerF,
+    [TRAINER_PIC_TWINS] = gTrainerFrontAnims_Twins,
+    [TRAINER_PIC_SAILOR] = gTrainerFrontAnims_Sailor,
+    [TRAINER_PIC_MAGMA_ADMIN] = gTrainerFrontAnims_MagmaAdmin,
+    [TRAINER_PIC_WALLY] = gTrainerFrontAnims_Wally,
+    [TRAINER_PIC_BRENDAN] = gTrainerFrontAnims_Brendan,
+    [TRAINER_PIC_MAY] = gTrainerFrontAnims_May,
+    [TRAINER_PIC_BUG_CATCHER] = gTrainerFrontAnims_BugCatcher,
+    [TRAINER_PIC_POKEMON_RANGER_M] = gTrainerFrontAnims_PokemonRangerM,
+    [TRAINER_PIC_POKEMON_RANGER_F] = gTrainerFrontAnims_PokemonRangerF,
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = gTrainerFrontAnims_MagmaLeaderMaxie,
+    [TRAINER_PIC_LASS] = gTrainerFrontAnims_Lass,
+    [TRAINER_PIC_YOUNG_COUPLE] = gTrainerFrontAnims_YoungCouple,
+    [TRAINER_PIC_OLD_COUPLE] = gTrainerFrontAnims_OldCouple,
+    [TRAINER_PIC_SIS_AND_BRO] = gTrainerFrontAnims_SisAndBro,
+    [TRAINER_PIC_STEVEN] = gTrainerFrontAnims_Steven,
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = gTrainerFrontAnims_SalonMaidenAnabel,
+    [TRAINER_PIC_DOME_ACE_TUCKER] = gTrainerFrontAnims_DomeAceTucker,
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = gTrainerFrontAnims_PalaceMavenSpenser,
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = gTrainerFrontAnims_ArenaTycoonGreta,
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = gTrainerFrontAnims_FactoryHeadNoland,
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = gTrainerFrontAnims_PikeQueenLucy,
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = gTrainerFrontAnims_PyramidKingBrandon,
+    [TRAINER_PIC_RED] = gTrainerFrontAnims_Red,
+    [TRAINER_PIC_LEAF] = gTrainerFrontAnims_Leaf,
+    [TRAINER_PIC_RS_BRENDAN] = gTrainerFrontAnims_RubySapphireBrendan,
+    [TRAINER_PIC_RS_MAY] = gTrainerFrontAnims_RubySapphireMay,
 };
diff --git a/src/data/trainers.h b/src/data/trainers.h
index fe087d166..7ec297eb3 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -156,9 +156,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARCEL] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("MARCEL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -534,9 +534,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_FELIX] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("FELIX"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -800,7 +800,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -814,7 +814,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_AUSTINA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("AUSTINA"),
@@ -828,7 +828,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GWEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("GWEN"),
@@ -842,7 +842,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -856,7 +856,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -870,7 +870,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -884,7 +884,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -898,7 +898,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -912,7 +912,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SIMON] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("SIMON"),
@@ -926,7 +926,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("CHARLIE"),
@@ -940,7 +940,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -954,7 +954,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -968,7 +968,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -982,7 +982,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -996,9 +996,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RANDALL] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("RANDALL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1010,9 +1010,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_PARKER] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("PARKER"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1024,9 +1024,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GEORGE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("GEORGE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1038,9 +1038,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BERKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("BERKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1052,9 +1052,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BRAXTON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("BRAXTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1066,9 +1066,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("VINCENT"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1080,9 +1080,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LEROY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("LEROY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1094,9 +1094,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1108,9 +1108,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("EDGAR"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1122,9 +1122,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("ALBERT"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1136,9 +1136,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("SAMUEL"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1150,9 +1150,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_VITO] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("VITO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1164,9 +1164,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_OWEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("OWEN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1178,9 +1178,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1192,9 +1192,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1206,9 +1206,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1220,9 +1220,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1234,9 +1234,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WARREN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WARREN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1248,9 +1248,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MARY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1262,9 +1262,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALEXIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ALEXIA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1276,9 +1276,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JODY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JODY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1290,9 +1290,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("WENDY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1304,9 +1304,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_KEIRA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("KEIRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1318,9 +1318,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1332,9 +1332,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JENNIFER"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1346,9 +1346,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HOPE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("HOPE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1360,9 +1360,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("SHANNON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1374,9 +1374,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MICHELLE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1388,9 +1388,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CAROLINE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1402,9 +1402,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JULIE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JULIE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1416,9 +1416,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1430,9 +1430,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1444,9 +1444,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1458,9 +1458,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -4538,9 +4538,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_QUINCY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("QUINCY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -4552,9 +4552,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_KATELYNN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("KATELYNN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -5840,9 +5840,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_DIANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("DIANNE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -5854,7 +5854,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JANI] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("JANI"),
@@ -7044,9 +7044,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JAZMYN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_2,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER_UNUSED,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JAZMYN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -7114,9 +7114,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARLEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MARLEY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -7562,9 +7562,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MITCHELL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("MITCHELL"),
         .items = {},
         .doubleBattle = FALSE,
@@ -7646,9 +7646,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HALLE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("HALLE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -8080,9 +8080,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ATHENA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ATHENA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -8374,9 +8374,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JONATHAN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("JONATHAN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9074,9 +9074,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GERALD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("GERALD"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9382,9 +9382,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ALEXA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9396,9 +9396,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("RUBEN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9760,7 +9760,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HAILEY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("HAILEY"),
@@ -9774,7 +9774,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CHANDLER] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("CHANDLER"),
@@ -10264,9 +10264,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_DARCY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("DARCY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10376,9 +10376,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CAROLINA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CAROLINA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10670,9 +10670,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LEONEL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("LEONEL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10740,9 +10740,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11594,9 +11594,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11608,9 +11608,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11622,9 +11622,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11636,9 +11636,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11946,7 +11946,7 @@ const struct Trainer gTrainers[] = {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
-        .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN,
+        .trainerPic = TRAINER_PIC_RS_BRENDAN,
         .trainerName = _("BRENDAN"),
         .items = {},
         .doubleBattle = FALSE,
@@ -11960,7 +11960,7 @@ const struct Trainer gTrainers[] = {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
-        .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_MAY,
+        .trainerPic = TRAINER_PIC_RS_MAY,
         .trainerName = _("MAY"),
         .items = {},
         .doubleBattle = FALSE,
diff --git a/src/graphics.c b/src/graphics.c
index 2a21b610a..b2de074bc 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1279,15 +1279,15 @@ const u32 gPokedexMenu2_Gfx[] = INCBIN_U32("graphics/pokedex/menu2.4bpp.lz");
 
 const u32 gUnused_PokedexNoBall[] = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz");
 
-const u32 gUnknown_08DC2A08[] = INCBIN_U32("graphics/pokedex/tilemap1.bin.lz");
-const u32 gUnknown_08DC2B1C[] = INCBIN_U32("graphics/pokedex/tilemap2.bin.lz");
-const u32 gUnknown_08DC2C5C[] = INCBIN_U32("graphics/pokedex/tilemap3.bin.lz");
-const u32 gUnknown_08DC2DAC[] = INCBIN_U32("graphics/pokedex/tilemap4.bin.lz");
-const u32 gUnknown_08DC2E6C[] = INCBIN_U32("graphics/pokedex/tilemap5.bin.lz");
-const u32 gUnknown_08DC2F5C[] = INCBIN_U32("graphics/pokedex/tilemap6.bin.lz");
-const u32 gUnknown_08DC2FEC[] = INCBIN_U32("graphics/pokedex/tilemap7.bin.lz");
-const u32 gUnknown_08DC3080[] = INCBIN_U32("graphics/pokedex/tilemap8.bin.lz");
-const u32 gUnknown_08DC3198[] = INCBIN_U32("graphics/pokedex/tilemap9.bin.lz");
+const u32 gPokedexTilemap_StartMenu1[] = INCBIN_U32("graphics/pokedex/tilemap1.bin.lz");
+const u32 gPokedexTilemap_StartMenu2[] = INCBIN_U32("graphics/pokedex/tilemap2.bin.lz");
+const u32 gPokedexTilemap_Main[] = INCBIN_U32("graphics/pokedex/tilemap3.bin.lz");
+const u32 gPokedexTilemap_MainUnderlay[] = INCBIN_U32("graphics/pokedex/tilemap4.bin.lz");
+const u32 gPokedexTilemap_SizeScreen[] = INCBIN_U32("graphics/pokedex/tilemap5.bin.lz");
+const u32 gPokedexTilemap_ScreenSelectBar1[] = INCBIN_U32("graphics/pokedex/tilemap6.bin.lz");
+const u32 gPokedexTilemap_ScreenSelectBar2[] = INCBIN_U32("graphics/pokedex/tilemap7.bin.lz");
+const u32 gPokedexTilemap_DescriptionScreen[] = INCBIN_U32("graphics/pokedex/tilemap8.bin.lz");
+const u32 gPokedexTilemap_CryScreen[] = INCBIN_U32("graphics/pokedex/tilemap9.bin.lz");
 
 const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("graphics/pokedex/search_menu.gbapal");
 const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("graphics/pokedex/search_menu.4bpp.lz");
diff --git a/src/main_menu.c b/src/main_menu.c
index a8383cd0c..ee777d106 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1772,12 +1772,12 @@ static void AddBirchSpeechObjects(u8 taskId)
     gSprites[lotadSpriteId].oam.priority = 0;
     gSprites[lotadSpriteId].invisible = TRUE;
     gTasks[taskId].tLotadSpriteId = lotadSpriteId;
-    brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]);
+    brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]);
     gSprites[brendanSpriteId].callback = nullsub_11;
     gSprites[brendanSpriteId].invisible = TRUE;
     gSprites[brendanSpriteId].oam.priority = 0;
     gTasks[taskId].tBrendanSpriteId = brendanSpriteId;
-    maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]);
+    maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]);
     gSprites[maySpriteId].callback = nullsub_11;
     gSprites[maySpriteId].invisible = TRUE;
     gSprites[maySpriteId].oam.priority = 0;
diff --git a/src/pokedex.c b/src/pokedex.c
index 32bf5207c..7578f9687 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -33,10 +33,10 @@
 extern u8 gDexCryScreenState;
 
 // EWRAM
-static EWRAM_DATA struct PokedexView *gUnknown_02039B4C = NULL;
+static EWRAM_DATA struct PokedexView *sPokedexView = NULL;
 static EWRAM_DATA u16 gUnknown_02039B50 = 0;
 static EWRAM_DATA u8 gUnknown_02039B52 = 0;
-static EWRAM_DATA struct PokedexListItem *gUnknown_02039B54 = NULL;
+static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL;
 
 // IWRAM common
 u8 gUnknown_030060B0;
@@ -50,7 +50,7 @@ struct UnknownStruct2
 
 struct UnknownStruct1
 {
-    const struct UnknownStruct2 *unk0;
+    const struct UnknownStruct2 *pokedexList;
     u8 unk4;
     u8 unk5;
     u16 unk6;
@@ -89,7 +89,7 @@ struct PokedexListItem
 
 struct PokedexView
 {
-    struct PokedexListItem unk0[NATIONAL_DEX_COUNT];
+    struct PokedexListItem pokedexList[NATIONAL_DEX_COUNT];
     u16 unk608;
     u8 unk60A_1:1;
     u8 unk60A_2:1;
@@ -101,8 +101,8 @@ struct PokedexView
     u16 unk614;
     u16 dexOrder;
     u16 unk618;
-    u16 unk61A;
-    u16 unk61C;
+    u16 seenCount;
+    u16 ownCount;
     u16 unk61E[4];
     u16 selectedMonSpriteId;
     u16 unk628;
@@ -170,7 +170,7 @@ void sub_80BD154(u16, u8, u8, u16);
 void sub_80BD1F4(u16, u8, u8, u16);
 u8 sub_80BD23C(u16, u8, u8);
 void sub_80BD28C(u8, u8, u16);
-void sub_80BD2B4(u16, u16);
+static void CreateInitialPokemonSprites(u16, u16);
 bool8 sub_80BD404(u8, u8, u8);
 u16 sub_80BD69C(u16, u16);
 void sub_80BD8D0(void);
@@ -178,7 +178,7 @@ bool8 sub_80BD930(void);
 u8 sub_80BDA40(void);
 u16 sub_80BDA8C(u16);
 u32 sub_80BDACC(u16, s16, s16);
-void sub_80BDB7C(u8);
+static void CreateInterfaceSprites(u8);
 void sub_80BE470(struct Sprite *sprite);
 void sub_80BE604(struct Sprite *sprite);
 void sub_80BE658(struct Sprite *sprite);
@@ -258,7 +258,7 @@ static const struct OamData sOamData_855CFE4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
     .size = 0,
@@ -275,7 +275,7 @@ static const struct OamData sOamData_855CFEC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = ST_OAM_H_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
     .size = 0,
@@ -292,7 +292,7 @@ static const struct OamData sOamData_855CFF4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = ST_OAM_H_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
     .size = 2,
@@ -309,7 +309,7 @@ static const struct OamData sOamData_855CFFC =
     .objMode = 2,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
     .size = 2,
@@ -326,7 +326,7 @@ static const struct OamData sOamData_855D004 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = ST_OAM_H_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
     .size = 3,
@@ -343,7 +343,7 @@ static const struct OamData sOamData_855D00C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = ST_OAM_V_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
     .size = 0,
@@ -613,7 +613,7 @@ static const union AnimCmd *const sSpriteAnimTable_855D190[] =
     sSpriteAnim_855D10C
 };
 
-static const struct SpriteTemplate gUnknown_0855D194 =
+static const struct SpriteTemplate sScrollBarSpriteTemplate =
 {
     .tileTag = 4096,
     .paletteTag = 4096,
@@ -624,7 +624,7 @@ static const struct SpriteTemplate gUnknown_0855D194 =
     .callback = sub_80BE604,
 };
 
-static const struct SpriteTemplate gUnknown_0855D1AC =
+static const struct SpriteTemplate sArrowSpriteTemplate =
 {
     .tileTag = 4096,
     .paletteTag = 4096,
@@ -635,7 +635,7 @@ static const struct SpriteTemplate gUnknown_0855D1AC =
     .callback = sub_80BE658,
 };
 
-static const struct SpriteTemplate gUnknown_0855D1C4 =
+static const struct SpriteTemplate sInterfaceTextSpriteTemplate =
 {
     .tileTag = 4096,
     .paletteTag = 4096,
@@ -646,7 +646,7 @@ static const struct SpriteTemplate gUnknown_0855D1C4 =
     .callback = sub_80BE758,
 };
 
-static const struct SpriteTemplate gUnknown_0855D1DC =
+static const struct SpriteTemplate sRotatingPokeballSpriteTemplate =
 {
     .tileTag = 4096,
     .paletteTag = 4096,
@@ -657,7 +657,7 @@ static const struct SpriteTemplate gUnknown_0855D1DC =
     .callback = sub_80BE780,
 };
 
-static const struct SpriteTemplate gUnknown_0855D1F4 =
+static const struct SpriteTemplate sSeenOwnTextSpriteTemplate =
 {
     .tileTag = 4096,
     .paletteTag = 4096,
@@ -712,13 +712,13 @@ static const struct SpriteTemplate gUnknown_0855D254 =
     .callback = sub_80BE834,
 };
 
-static const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] =
+static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] =
 {
     {gPokedexMenu2_Gfx, 0x2000, 4096},
     {0}
 };
 
-static const struct SpritePalette gSpritePalettes_0855D26C[] =
+static const struct SpritePalette sInterfaceSpritePalette[] =
 {
     {gPokedexText_Pal, 4096},
     {0}
@@ -767,7 +767,7 @@ static const struct BgTemplate gBgTemplates_0855D298[] =
     }
 };
 
-static const struct WindowTemplate sWindowTemplates_0855D2A8[] =
+static const struct WindowTemplate sPokemonList_WindowTemplate[] =
 {
     {
         .bg = 2,
@@ -781,7 +781,7 @@ static const struct WindowTemplate sWindowTemplates_0855D2A8[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const u8 gUnknown_0855D2B8[] = _("{NO}000");
+static const u8 sText_No000[] = _("{NO}000");
 static const u8 gUnknown_0855D2BE[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp");
 static const u8 sText_TenDashes[] = _("----------");
 
@@ -1248,15 +1248,15 @@ void sub_80BB370(void)
     TransferPlttBuffer();
 }
 
-void sub_80BB384(struct PokedexView *pokedexView)
+static void ResetPokedexView(struct PokedexView *pokedexView)
 {
     u16 i;
 
     for (i = 0; i < NATIONAL_DEX_COUNT; i++)
     {
-        pokedexView->unk0[i].dexNum |= 0xFFFF;
-        pokedexView->unk0[i].seen = 0;
-        pokedexView->unk0[i].owned = 0;
+        pokedexView->pokedexList[i].dexNum |= 0xFFFF;
+        pokedexView->pokedexList[i].seen = 0;
+        pokedexView->pokedexList[i].owned = 0;
     }
     pokedexView->unk608 = 0;
     pokedexView->unk60A_1 = 0;
@@ -1268,8 +1268,8 @@ void sub_80BB384(struct PokedexView *pokedexView)
     pokedexView->unk614 = 0;
     pokedexView->dexOrder = 0;
     pokedexView->unk618 = 0;
-    pokedexView->unk61A = 0;
-    pokedexView->unk61C = 0;
+    pokedexView->seenCount = 0;
+    pokedexView->ownCount = 0;
     for (i = 0; i <= 3; i++)
         pokedexView->unk61E[i] |= 0xFFFF;
     pokedexView->unk628 = 0;
@@ -1299,7 +1299,7 @@ void sub_80BB384(struct PokedexView *pokedexView)
         pokedexView->unk65C[i] = 0;
 }
 
-void sub_80BB534(void)
+void CB2_Pokedex(void)
 {
     u8 *addr;
     u32 size;
@@ -1326,34 +1326,34 @@ void sub_80BB534(void)
             gMain.state++;
             break;
         case 2:
-            gUnknown_02039B4C = AllocZeroed(sizeof(struct PokedexView));
-            sub_80BB384(gUnknown_02039B4C);
+            sPokedexView = AllocZeroed(sizeof(struct PokedexView));
+            ResetPokedexView(sPokedexView);
             CreateTask(sub_80BB78C, 0);
-            gUnknown_02039B4C->dexMode = gSaveBlock2Ptr->pokedex.unknown1;
+            sPokedexView->dexMode = gSaveBlock2Ptr->pokedex.unknown1;
             if (!IsNationalPokedexEnabled())
-                gUnknown_02039B4C->dexMode = DEX_MODE_HOENN;
-            gUnknown_02039B4C->dexOrder = gSaveBlock2Ptr->pokedex.order;
-            gUnknown_02039B4C->selectedPokemon = gUnknown_02039B50;
-            gUnknown_02039B4C->unk62C = gUnknown_02039B52;
-            gUnknown_02039B4C->selectedScreen = 0;
+                sPokedexView->dexMode = DEX_MODE_HOENN;
+            sPokedexView->dexOrder = gSaveBlock2Ptr->pokedex.order;
+            sPokedexView->selectedPokemon = gUnknown_02039B50;
+            sPokedexView->unk62C = gUnknown_02039B52;
+            sPokedexView->selectedScreen = 0;
             if (!IsNationalPokedexEnabled())
             {
-                gUnknown_02039B4C->unk61A = GetHoennPokedexCount(0);
-                gUnknown_02039B4C->unk61C = GetHoennPokedexCount(1);
+                sPokedexView->seenCount = GetHoennPokedexCount(0);
+                sPokedexView->ownCount = GetHoennPokedexCount(1);
             }
             else
             {
-                gUnknown_02039B4C->unk61A = GetNationalPokedexCount(0);
-                gUnknown_02039B4C->unk61C = GetNationalPokedexCount(1);
+                sPokedexView->seenCount = GetNationalPokedexCount(0);
+                sPokedexView->ownCount = GetNationalPokedexCount(1);
             }
-            gUnknown_02039B4C->unk62D = 8;
+            sPokedexView->unk62D = 8;
             gMain.state++;
             break;
         case 3:
             EnableInterrupts(1);
             SetVBlankCallback(sub_80BB370);
             SetMainCallback2(sub_80BB774);
-            sub_80BC8D4(gUnknown_02039B4C->dexMode, gUnknown_02039B4C->dexOrder);
+            sub_80BC8D4(sPokedexView->dexMode, sPokedexView->dexOrder);
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80);
             break;
     }
@@ -1369,26 +1369,26 @@ void sub_80BB774(void)
 
 void sub_80BB78C(u8 taskId)
 {
-    gUnknown_02039B4C->unk64C_1 = FALSE;
+    sPokedexView->unk64C_1 = FALSE;
     if (sub_80BC514(0))
         gTasks[taskId].func = sub_80BB7D4;
 }
 
 void sub_80BB7D4(u8 taskId)
 {
-    SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY);
+    SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY);
 
-    if (gUnknown_02039B4C->menuY)
+    if (sPokedexView->menuY)
     {
-        gUnknown_02039B4C->menuY -= 8;
+        sPokedexView->menuY -= 8;
     }
     else
     {
-        if ((gMain.newKeys & A_BUTTON) && gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon].seen)
+        if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen)
         {
             sub_80BD8D0();
-            BeginNormalPaletteFade(~(1 << (gSprites[gUnknown_02039B4C->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK);
-            gSprites[gUnknown_02039B4C->selectedMonSpriteId].callback = sub_80BE470;
+            BeginNormalPaletteFade(~(1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK);
+            gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470;
             gTasks[taskId].func = sub_80BBBF4;
             PlaySE(SE_PIN);
             sub_80BC890();
@@ -1396,9 +1396,9 @@ void sub_80BB7D4(u8 taskId)
         else if (gMain.newKeys & START_BUTTON)
         {
             //Open menu
-            gUnknown_02039B4C->menuY = 0;
-            gUnknown_02039B4C->menuIsOpen = 1;
-            gUnknown_02039B4C->menuCursorPos = 0;
+            sPokedexView->menuY = 0;
+            sPokedexView->menuIsOpen = 1;
+            sPokedexView->menuCursorPos = 0;
             gTasks[taskId].func = sub_80BBA78;
             PlaySE(SE_SELECT);
         }
@@ -1407,11 +1407,11 @@ void sub_80BB7D4(u8 taskId)
             PlaySE(SE_SELECT);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].data[0] = sub_80C1258();
-            gUnknown_02039B4C->unk64E = 0;
-            gUnknown_02039B4C->unk62A = gUnknown_02039B4C->unk62C;
-            gUnknown_02039B4C->unk610 = gUnknown_02039B4C->selectedPokemon;
-            gUnknown_02039B4C->unk614 = gUnknown_02039B4C->dexMode;
-            gUnknown_02039B4C->unk618 = gUnknown_02039B4C->dexOrder;
+            sPokedexView->unk64E = 0;
+            sPokedexView->unk62A = sPokedexView->unk62C;
+            sPokedexView->unk610 = sPokedexView->selectedPokemon;
+            sPokedexView->unk614 = sPokedexView->dexMode;
+            sPokedexView->unk618 = sPokedexView->dexOrder;
             gTasks[taskId].func = sub_80BBD1C;
             PlaySE(SE_PC_LOGIN);
             sub_80BC890();
@@ -1425,8 +1425,8 @@ void sub_80BB7D4(u8 taskId)
         else
         {
             //Handle D-pad
-            gUnknown_02039B4C->selectedPokemon = sub_80BD69C(gUnknown_02039B4C->selectedPokemon, 0xE);
-            if (gUnknown_02039B4C->unk62E)
+            sPokedexView->selectedPokemon = sub_80BD69C(sPokedexView->selectedPokemon, 0xE);
+            if (sPokedexView->unk62E)
                 gTasks[taskId].func = sub_80BBA28;
         }
     }
@@ -1434,41 +1434,41 @@ void sub_80BB7D4(u8 taskId)
 
 void sub_80BBA28(u8 taskId)
 {
-    if (sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636))
+    if (sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636))
         gTasks[taskId].func = sub_80BB7D4;
 }
 
 void sub_80BBA78(u8 taskId)
 {
-    SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY);
+    SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY);
 
     //If menu is not open, slide it up, on screen
-    if (gUnknown_02039B4C->menuY != 80)
+    if (sPokedexView->menuY != 80)
     {
-        gUnknown_02039B4C->menuY += 8;
+        sPokedexView->menuY += 8;
     }
     else
     {
         if (gMain.newKeys & A_BUTTON)
         {
-            switch (gUnknown_02039B4C->menuCursorPos)
+            switch (sPokedexView->menuCursorPos)
             {
                 case 0: //BACK TO LIST
                 default:
                     gMain.newKeys |= START_BUTTON;  //Exit menu
                     break;
                 case 1: //LIST TOP
-                    gUnknown_02039B4C->selectedPokemon = 0;
-                    gUnknown_02039B4C->unk62C = 0x40;
+                    sPokedexView->selectedPokemon = 0;
+                    sPokedexView->unk62C = 0x40;
                     sub_80BDA40();
-                    sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE);
+                    CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE);
                     gMain.newKeys |= START_BUTTON;  //Exit menu
                     break;
                 case 2: //LIST BOTTOM
-                    gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->pokemonListCount - 1;
-                    gUnknown_02039B4C->unk62C = gUnknown_02039B4C->pokemonListCount * 16 + 0x30;
+                    sPokedexView->selectedPokemon = sPokedexView->pokemonListCount - 1;
+                    sPokedexView->unk62C = sPokedexView->pokemonListCount * 16 + 0x30;
                     sub_80BDA40();
-                    sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE);
+                    CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE);
                     gMain.newKeys |= START_BUTTON;  //Exit menu
                     break;
                 case 3: //CLOSE POKEDEX
@@ -1482,18 +1482,18 @@ void sub_80BBA78(u8 taskId)
         //Exit menu when Start or B is pressed
         if (gMain.newKeys & (START_BUTTON | B_BUTTON))
         {
-            gUnknown_02039B4C->menuIsOpen = 0;
+            sPokedexView->menuIsOpen = 0;
             gTasks[taskId].func = sub_80BB7D4;
             PlaySE(SE_SELECT);
         }
-        else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gUnknown_02039B4C->menuCursorPos != 0)
+        else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos != 0)
         {
-            gUnknown_02039B4C->menuCursorPos--;
+            sPokedexView->menuCursorPos--;
             PlaySE(SE_SELECT);
         }
-        else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gUnknown_02039B4C->menuCursorPos <= 2)
+        else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos <= 2)
         {
-            gUnknown_02039B4C->menuCursorPos++;
+            sPokedexView->menuCursorPos++;
             PlaySE(SE_SELECT);
         }
     }
@@ -1501,10 +1501,10 @@ void sub_80BBA78(u8 taskId)
 
 void sub_80BBBF4(u8 taskId)
 {
-    if (gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.x == 48 && gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.y == 56)
+    if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
     {
-        gUnknown_02039B4C->unk64B = gUnknown_02039B4C->unk64A;
-        gTasks[taskId].data[0] = sub_80BE91C(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gUnknown_02039B4C->selectedMonSpriteId);
+        sPokedexView->unk64B = sPokedexView->unk64A;
+        gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
         gTasks[taskId].func = sub_80BBC74;
     }
 }
@@ -1513,13 +1513,13 @@ void sub_80BBC74(u8 taskId)
 {
     if (gTasks[gTasks[taskId].data[0]].isActive)
     {
-        if (gUnknown_02039B4C->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
-            sub_80BE9F8(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gTasks[taskId].data[0]);
+        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
+            sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]);
     }
     else
     {
-        gUnknown_02039B50 = gUnknown_02039B4C->selectedPokemon;
-        gUnknown_02039B52 = gUnknown_02039B4C->unk62C;
+        gUnknown_02039B50 = sPokedexView->selectedPokemon;
+        gUnknown_02039B52 = sPokedexView->unk62C;
         gTasks[taskId].func = sub_80BB78C;
     }
 }
@@ -1529,20 +1529,20 @@ void sub_80BBD1C(u8 taskId)
     if (!gTasks[gTasks[taskId].data[0]].isActive)
     {
         sub_80BDA40();
-        if (gUnknown_02039B4C->unk64E != 0)
+        if (sPokedexView->unk64E != 0)
         {
-            gUnknown_02039B4C->selectedPokemon = 0;
-            gUnknown_02039B4C->unk62C = 0x40;
+            sPokedexView->selectedPokemon = 0;
+            sPokedexView->unk62C = 0x40;
             gTasks[taskId].func = sub_80BBE70;
         }
         else
         {
-            gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A;
-            gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610;
-            gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614;
+            sPokedexView->unk62C = sPokedexView->unk62A;
+            sPokedexView->selectedPokemon = sPokedexView->unk610;
+            sPokedexView->dexMode = sPokedexView->unk614;
             if (!IsNationalPokedexEnabled())
-                gUnknown_02039B4C->dexMode = DEX_MODE_HOENN;
-            gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618;
+                sPokedexView->dexMode = DEX_MODE_HOENN;
+            sPokedexView->dexOrder = sPokedexView->unk618;
             gTasks[taskId].func = sub_80BB78C;
         }
     }
@@ -1552,43 +1552,43 @@ void sub_80BBDE8(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        gSaveBlock2Ptr->pokedex.unknown1 = gUnknown_02039B4C->dexMode;
+        gSaveBlock2Ptr->pokedex.unknown1 = sPokedexView->dexMode;
         if (!IsNationalPokedexEnabled())
             gSaveBlock2Ptr->pokedex.unknown1 = DEX_MODE_HOENN;
-        gSaveBlock2Ptr->pokedex.order = gUnknown_02039B4C->dexOrder;
+        gSaveBlock2Ptr->pokedex.order = sPokedexView->dexOrder;
         sub_80BDA40();
         sub_80BC890();
         DestroyTask(taskId);
         SetMainCallback2(CB2_ReturnToFieldWithOpenMenu);
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
-        Free(gUnknown_02039B4C);
+        Free(sPokedexView);
     }
 }
 
 void sub_80BBE70(u8 taskId)
 {
-    gUnknown_02039B4C->unk64C_1 = TRUE;
+    sPokedexView->unk64C_1 = TRUE;
     if (sub_80BC514(3))
         gTasks[taskId].func = sub_80BBEB8;
 }
 
 void sub_80BBEB8(u8 taskId)
 {
-    SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY);
+    SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY);
 
-    if (gUnknown_02039B4C->menuY)
+    if (sPokedexView->menuY)
     {
-        gUnknown_02039B4C->menuY -= 8;
+        sPokedexView->menuY -= 8;
     }
     else
     {
-        if ((gMain.newKeys & A_BUTTON) && gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon].seen)
+        if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen)
         {
             u32 a;
 
             sub_80BD8D0();
-            a = (1 << (gSprites[gUnknown_02039B4C->selectedMonSpriteId].oam.paletteNum + 16));
-            gSprites[gUnknown_02039B4C->selectedMonSpriteId].callback = sub_80BE470;
+            a = (1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16));
+            gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470;
             BeginNormalPaletteFade(~a, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].func = sub_80BC2D4;
             PlaySE(SE_PIN);
@@ -1596,9 +1596,9 @@ void sub_80BBEB8(u8 taskId)
         }
         else if (gMain.newKeys & START_BUTTON)
         {
-            gUnknown_02039B4C->menuY = 0;
-            gUnknown_02039B4C->menuIsOpen = 1;
-            gUnknown_02039B4C->menuCursorPos = 0;
+            sPokedexView->menuY = 0;
+            sPokedexView->menuIsOpen = 1;
+            sPokedexView->menuCursorPos = 0;
             gTasks[taskId].func = sub_80BC0F8;
             PlaySE(SE_SELECT);
         }
@@ -1606,7 +1606,7 @@ void sub_80BBEB8(u8 taskId)
         {
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].data[0] = sub_80C1258();
-            gUnknown_02039B4C->unk64E = 0;
+            sPokedexView->unk64E = 0;
             gTasks[taskId].func = sub_80BBD1C;
             PlaySE(SE_PC_LOGIN);
             sub_80BC890();
@@ -1620,8 +1620,8 @@ void sub_80BBEB8(u8 taskId)
         else
         {
             //Handle D-pad
-            gUnknown_02039B4C->selectedPokemon = sub_80BD69C(gUnknown_02039B4C->selectedPokemon, 0xE);
-            if (gUnknown_02039B4C->unk62E)
+            sPokedexView->selectedPokemon = sub_80BD69C(sPokedexView->selectedPokemon, 0xE);
+            if (sPokedexView->unk62E)
                 gTasks[taskId].func = sub_80BC0A8;
         }
     }
@@ -1629,40 +1629,40 @@ void sub_80BBEB8(u8 taskId)
 
 void sub_80BC0A8(u8 taskId)
 {
-    if (sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636))
+    if (sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636))
         gTasks[taskId].func = sub_80BBEB8;
 }
 
 void sub_80BC0F8(u8 taskId)
 {
-    SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY);
+    SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY);
 
-    if (gUnknown_02039B4C->menuY != 96)
+    if (sPokedexView->menuY != 96)
     {
-        gUnknown_02039B4C->menuY += 8;
+        sPokedexView->menuY += 8;
     }
     else
     {
         if (gMain.newKeys & A_BUTTON)
         {
-            switch (gUnknown_02039B4C->menuCursorPos)
+            switch (sPokedexView->menuCursorPos)
             {
             case 0: //BACK TO LIST
                 default:
                     gMain.newKeys |= START_BUTTON;
                     break;
                 case 1: //LIST TOP
-                    gUnknown_02039B4C->selectedPokemon = 0;
-                    gUnknown_02039B4C->unk62C = 0x40;
+                    sPokedexView->selectedPokemon = 0;
+                    sPokedexView->unk62C = 0x40;
                     sub_80BDA40();
-                    sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE);
+                    CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE);
                     gMain.newKeys |= START_BUTTON;
                     break;
                 case 2: //LIST BOTTOM
-                    gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->pokemonListCount - 1;
-                    gUnknown_02039B4C->unk62C = gUnknown_02039B4C->pokemonListCount * 16 + 0x30;
+                    sPokedexView->selectedPokemon = sPokedexView->pokemonListCount - 1;
+                    sPokedexView->unk62C = sPokedexView->pokemonListCount * 16 + 0x30;
                     sub_80BDA40();
-                    sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE);
+                    CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE);
                     gMain.newKeys |= START_BUTTON;
                     break;
                 case 3: //BACK TO POKEDEX
@@ -1681,18 +1681,18 @@ void sub_80BC0F8(u8 taskId)
         //Exit menu when Start or B is pressed
         if (gMain.newKeys & (START_BUTTON | B_BUTTON))
         {
-            gUnknown_02039B4C->menuIsOpen = 0;
+            sPokedexView->menuIsOpen = 0;
             gTasks[taskId].func = sub_80BBEB8;
             PlaySE(SE_SELECT);
         }
-        else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gUnknown_02039B4C->menuCursorPos)
+        else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos)
         {
-            gUnknown_02039B4C->menuCursorPos--;
+            sPokedexView->menuCursorPos--;
             PlaySE(SE_SELECT);
         }
-        else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gUnknown_02039B4C->menuCursorPos <= 3)
+        else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos <= 3)
         {
-            gUnknown_02039B4C->menuCursorPos++;
+            sPokedexView->menuCursorPos++;
             PlaySE(SE_SELECT);
         }
     }
@@ -1700,11 +1700,11 @@ void sub_80BC0F8(u8 taskId)
 
 void sub_80BC2D4(u8 taskId)
 {
-    if (gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.x == 48 && gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.y == 56)
+    if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
     {
-        gUnknown_02039B4C->unk64B = gUnknown_02039B4C->unk64A;
-        gTasks[taskId].data[0] = sub_80BE91C(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gUnknown_02039B4C->selectedMonSpriteId);
-        gUnknown_02039B4C->selectedMonSpriteId = -1;
+        sPokedexView->unk64B = sPokedexView->unk64A;
+        gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
+        sPokedexView->selectedMonSpriteId = -1;
         gTasks[taskId].func = sub_80BC360;
     }
 }
@@ -1713,8 +1713,8 @@ void sub_80BC360(u8 taskId)
 {
     if (gTasks[gTasks[taskId].data[0]].isActive)
     {
-        if (gUnknown_02039B4C->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
-            sub_80BE9F8(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gTasks[taskId].data[0]);
+        if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930())
+            sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]);
     }
     else
     {
@@ -1726,12 +1726,12 @@ void sub_80BC3DC(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A;
-        gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610;
-        gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614;
+        sPokedexView->unk62C = sPokedexView->unk62A;
+        sPokedexView->selectedPokemon = sPokedexView->unk610;
+        sPokedexView->dexMode = sPokedexView->unk614;
         if (!IsNationalPokedexEnabled())
-            gUnknown_02039B4C->dexMode = DEX_MODE_HOENN;
-        gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618;
+            sPokedexView->dexMode = DEX_MODE_HOENN;
+        sPokedexView->dexOrder = sPokedexView->unk618;
         gTasks[taskId].func = sub_80BB78C;
         sub_80BDA40();
         sub_80BC890();
@@ -1742,12 +1742,12 @@ void sub_80BC47C(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A;
-        gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610;
-        gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614;
+        sPokedexView->unk62C = sPokedexView->unk62A;
+        sPokedexView->selectedPokemon = sPokedexView->unk610;
+        sPokedexView->dexMode = sPokedexView->unk614;
         if (!IsNationalPokedexEnabled())
-            gUnknown_02039B4C->dexMode = DEX_MODE_HOENN;
-        gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618;
+            sPokedexView->dexMode = DEX_MODE_HOENN;
+        sPokedexView->dexOrder = sPokedexView->unk618;
         gTasks[taskId].func = sub_80BBDE8;
     }
 }
@@ -1761,9 +1761,9 @@ bool8 sub_80BC514(u8 a)
             if (gPaletteFade.active)
                 return 0;
             SetVBlankCallback(NULL);
-            gUnknown_02039B4C->unk64A = a;
+            sPokedexView->unk64A = a;
             sub_80C09B0(0);
-            SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D);
+            SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D);
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(0, gBgTemplates_0855D298, 4);
             SetBgTilemapBuffer(3, AllocZeroed(0x800));
@@ -1771,19 +1771,19 @@ bool8 sub_80BC514(u8 a)
             SetBgTilemapBuffer(1, AllocZeroed(0x800));
             SetBgTilemapBuffer(0, AllocZeroed(0x800));
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-            CopyToBgTilemapBuffer(1, gUnknown_08DC2C5C, 0, 0);
-            CopyToBgTilemapBuffer(3, gUnknown_08DC2DAC, 0, 0);
+            CopyToBgTilemapBuffer(1, gPokedexTilemap_Main, 0, 0);
+            CopyToBgTilemapBuffer(3, gPokedexTilemap_MainUnderlay, 0, 0);
             if (a == 0)
-                CopyToBgTilemapBuffer(0, gUnknown_08DC2A08, 0, 0x280);
+                CopyToBgTilemapBuffer(0, gPokedexTilemap_StartMenu1, 0, 0x280);
             else
-                CopyToBgTilemapBuffer(0, gUnknown_08DC2B1C, 0, 0x280);
+                CopyToBgTilemapBuffer(0, gPokedexTilemap_StartMenu2, 0, 0x280);
             ResetPaletteFade();
             if (a == 0)
-                gUnknown_02039B4C->unk64C_1 = FALSE;
+                sPokedexView->unk64C_1 = FALSE;
             else
-                gUnknown_02039B4C->unk64C_1 = TRUE;
-            sub_80BC844(gUnknown_02039B4C->unk64C_1);
-            InitWindows(sWindowTemplates_0855D2A8);
+                sPokedexView->unk64C_1 = TRUE;
+            sub_80BC844(sPokedexView->unk64C_1);
+            InitWindows(sPokemonList_WindowTemplate);
             DeactivateAllTextPrinters();
             PutWindowTilemap(0);
             CopyWindowToVram(0, 3);
@@ -1793,9 +1793,9 @@ bool8 sub_80BC514(u8 a)
             ResetSpriteData();
             FreeAllSpritePalettes();
             gReservedSpritePaletteCount = 8;
-            LoadCompressedObjectPic(&gSpriteSheets_0855D26C[0]);
-            LoadSpritePalettes(gSpritePalettes_0855D26C);
-            sub_80BDB7C(a);
+            LoadCompressedObjectPic(&sInterfaceSpriteSheet[0]);
+            LoadSpritePalettes(sInterfaceSpritePalette);
+            CreateInterfaceSprites(a);
             gMain.state++;
             break;
         case 2:
@@ -1803,10 +1803,10 @@ bool8 sub_80BC514(u8 a)
             break;
         case 3:
             if (a == 0)
-                sub_80BC8D4(gUnknown_02039B4C->dexMode, gUnknown_02039B4C->dexOrder);
-            sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE);
-            gUnknown_02039B4C->menuIsOpen = 0;
-            gUnknown_02039B4C->menuY = 0;
+                sub_80BC8D4(sPokedexView->dexMode, sPokedexView->dexOrder);
+            CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE);
+            sPokedexView->menuIsOpen = 0;
+            sPokedexView->menuY = 0;
             CopyBgTilemapBufferToVram(0);
             CopyBgTilemapBufferToVram(1);
             CopyBgTilemapBufferToVram(2);
@@ -1881,7 +1881,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
     u16 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever.
     s16 i;
 
-    gUnknown_02039B4C->pokemonListCount = 0;
+    sPokedexView->pokemonListCount = 0;
 
     switch (dexMode)
     {
@@ -1912,11 +1912,11 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
                 for (i = 0; i < vars[0]; i++)
                 {
                     vars[2] = HoennToNationalOrder(i + 1);
-                    gUnknown_02039B4C->unk0[i].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[i].seen = GetSetPokedexFlag(vars[2], 0);
-                    gUnknown_02039B4C->unk0[i].owned = GetSetPokedexFlag(vars[2], 1);
-                    if (gUnknown_02039B4C->unk0[i].seen)
-                        gUnknown_02039B4C->pokemonListCount = i + 1;
+                    sPokedexView->pokedexList[i].dexNum = vars[2];
+                    sPokedexView->pokedexList[i].seen = GetSetPokedexFlag(vars[2], 0);
+                    sPokedexView->pokedexList[i].owned = GetSetPokedexFlag(vars[2], 1);
+                    if (sPokedexView->pokedexList[i].seen)
+                        sPokedexView->pokemonListCount = i + 1;
                 }
             }
             else
@@ -1933,11 +1933,11 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
                     if (r10)
                     {
                         asm("");    //Needed to match for some reason
-                        gUnknown_02039B4C->unk0[r5].dexNum = vars[2];
-                        gUnknown_02039B4C->unk0[r5].seen = GetSetPokedexFlag(vars[2], 0);
-                        gUnknown_02039B4C->unk0[r5].owned = GetSetPokedexFlag(vars[2], 1);
-                        if (gUnknown_02039B4C->unk0[r5].seen)
-                            gUnknown_02039B4C->pokemonListCount = r5 + 1;
+                        sPokedexView->pokedexList[r5].dexNum = vars[2];
+                        sPokedexView->pokedexList[r5].seen = GetSetPokedexFlag(vars[2], 0);
+                        sPokedexView->pokedexList[r5].owned = GetSetPokedexFlag(vars[2], 1);
+                        if (sPokedexView->pokedexList[r5].seen)
+                            sPokedexView->pokemonListCount = r5 + 1;
                         r5++;
                     }
                 }
@@ -1950,10 +1950,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
 
                 if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 0))
                 {
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1;
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = GetSetPokedexFlag(vars[2], 1);
-                    gUnknown_02039B4C->pokemonListCount++;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2];
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = GetSetPokedexFlag(vars[2], 1);
+                    sPokedexView->pokemonListCount++;
                 }
             }
             break;
@@ -1964,10 +1964,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
 
                 if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1))
                 {
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1;
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1;
-                    gUnknown_02039B4C->pokemonListCount++;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2];
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1;
+                    sPokedexView->pokemonListCount++;
                 }
             }
             break;
@@ -1978,10 +1978,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
 
                 if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1))
                 {
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1;
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1;
-                    gUnknown_02039B4C->pokemonListCount++;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2];
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1;
+                    sPokedexView->pokemonListCount++;
                 }
             }
             break;
@@ -1992,10 +1992,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
 
                 if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1))
                 {
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1;
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1;
-                    gUnknown_02039B4C->pokemonListCount++;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2];
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1;
+                    sPokedexView->pokemonListCount++;
                 }
             }
             break;
@@ -2006,20 +2006,20 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
 
                 if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1))
                 {
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2];
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1;
-                    gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1;
-                    gUnknown_02039B4C->pokemonListCount++;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2];
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1;
+                    sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1;
+                    sPokedexView->pokemonListCount++;
                 }
             }
             break;
     }
 
-    for (i = gUnknown_02039B4C->pokemonListCount; i < NATIONAL_DEX_COUNT; i++)
+    for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++)
     {
-        gUnknown_02039B4C->unk0[i].dexNum |= 0xFFFF;
-        gUnknown_02039B4C->unk0[i].seen = 0;
-        gUnknown_02039B4C->unk0[i].owned = 0;
+        sPokedexView->pokedexList[i].dexNum |= 0xFFFF;
+        sPokedexView->pokedexList[i].seen = 0;
+        sPokedexView->pokedexList[i].owned = 0;
     }
 }
 
@@ -2046,18 +2046,18 @@ void sub_80BCE84(u8 a, u16 b, u16 c)
             _b = b - 5;
             for (i = 0; i <= 10; i++)
             {
-                if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF)
+                if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF)
                 {
                     sub_80BD28C(0x11, i * 2, c);
                 }
                 else
                 {
                     sub_80BD28C(0x11, i * 2, c);
-                    if (gUnknown_02039B4C->unk0[_b].seen)
+                    if (sPokedexView->pokedexList[_b].seen)
                     {
                         sub_80BD154(_b, 0x12, i * 2, c);
-                        sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, i * 2, c);
-                        sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, i * 2);
+                        sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, i * 2, c);
+                        sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, i * 2);
                     }
                     else
                     {
@@ -2071,42 +2071,42 @@ void sub_80BCE84(u8 a, u16 b, u16 c)
             break;
         case 1:
             _b = b - 5;
-            if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF)
+            if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF)
             {
-                sub_80BD28C(0x11, gUnknown_02039B4C->unk630 * 2, c);
+                sub_80BD28C(0x11, sPokedexView->unk630 * 2, c);
             }
             else
             {
-                sub_80BD28C(0x11, gUnknown_02039B4C->unk630 * 2, c);
-                if (gUnknown_02039B4C->unk0[_b].seen)
+                sub_80BD28C(0x11, sPokedexView->unk630 * 2, c);
+                if (sPokedexView->pokedexList[_b].seen)
                 {
-                    sub_80BD154(_b, 0x12, gUnknown_02039B4C->unk630 * 2, c);
-                    sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, gUnknown_02039B4C->unk630 * 2, c);
-                    sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, gUnknown_02039B4C->unk630 * 2);
+                    sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c);
+                    sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, sPokedexView->unk630 * 2, c);
+                    sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, sPokedexView->unk630 * 2);
                 }
                 else
                 {
-                    sub_80BD154(_b, 0x12, gUnknown_02039B4C->unk630 * 2, c);
-                    sub_80BD1F4(0, 0x11, gUnknown_02039B4C->unk630 * 2, c);
-                    sub_80BD23C(0, 0x16, gUnknown_02039B4C->unk630 * 2);
+                    sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c);
+                    sub_80BD1F4(0, 0x11, sPokedexView->unk630 * 2, c);
+                    sub_80BD23C(0, 0x16, sPokedexView->unk630 * 2);
                 }
             }
             break;
         case 2:
             _b = b + 5;
-            r2 = gUnknown_02039B4C->unk630 + 10;
+            r2 = sPokedexView->unk630 + 10;
             if (r2 > 15)
                 r2 -= 16;
-            if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF)
+            if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF)
                 sub_80BD28C(0x11, r2 * 2, c);
             else
             {
                 sub_80BD28C(0x11, r2 * 2, c);
-                if (gUnknown_02039B4C->unk0[_b].seen)
+                if (sPokedexView->pokedexList[_b].seen)
                 {
                     sub_80BD154(_b, 0x12, r2 * 2, c);
-                    sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, r2 * 2, c);
-                    sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, r2 * 2);
+                    sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, r2 * 2, c);
+                    sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, r2 * 2);
                 }
                 else
                 {
@@ -2125,9 +2125,9 @@ void sub_80BD154(u16 a, u8 left, u8 top, u16 unused)
     u8 text[6];
     u16 r6;
 
-    memcpy(text, gUnknown_0855D2B8, 6);
-    r6 = gUnknown_02039B4C->unk0[a].dexNum;
-    if (gUnknown_02039B4C->dexMode == DEX_MODE_HOENN)
+    memcpy(text, sText_No000, 6);
+    r6 = sPokedexView->pokedexList[a].dexNum;
+    if (sPokedexView->dexMode == DEX_MODE_HOENN)
         r6 = NationalToHoennOrder(r6);
     text[2] = CHAR_0 + r6 / 100;
     text[3] = CHAR_0 + (r6 % 100) / 10;
@@ -2161,7 +2161,7 @@ void sub_80BD28C(u8 x, u8 y, u16 unused)
     FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16);
 }
 
-void sub_80BD2B4(u16 a, u16 b)
+static void CreateInitialPokemonSprites(u16 selectedMon, u16 b)
 {
     u8 i;
     u16 unk;
@@ -2170,10 +2170,10 @@ void sub_80BD2B4(u16 a, u16 b)
     gPaletteFade.bufferTransferDisabled = TRUE;
 
     for (i = 0; i < 4; i++)
-        gUnknown_02039B4C->unk61E[i] = 0xFFFF;
-    gUnknown_02039B4C->selectedMonSpriteId = 0xFFFF;
+        sPokedexView->unk61E[i] = 0xFFFF;
+    sPokedexView->selectedMonSpriteId = 0xFFFF;
 
-    unk = sub_80BDA8C(a - 1);
+    unk = sub_80BDA8C(selectedMon - 1);
     if (unk != 0xFFFF)
     {
         spriteId = sub_80BDACC(unk, 0x60, 0x50);
@@ -2181,7 +2181,7 @@ void sub_80BD2B4(u16 a, u16 b)
         gSprites[spriteId].data[5] = -32;
     }
 
-    unk = sub_80BDA8C(a);
+    unk = sub_80BDA8C(selectedMon);
     if (unk != 0xFFFF)
     {
         spriteId = sub_80BDACC(unk, 0x60, 0x50);
@@ -2189,7 +2189,7 @@ void sub_80BD2B4(u16 a, u16 b)
         gSprites[spriteId].data[5] = 0;
     }
 
-    unk = sub_80BDA8C(a + 1);
+    unk = sub_80BDA8C(selectedMon + 1);
     if (unk != 0xFFFF)
     {
         spriteId = sub_80BDACC(unk, 0x60, 0x50);
@@ -2197,11 +2197,11 @@ void sub_80BD2B4(u16 a, u16 b)
         gSprites[spriteId].data[5] = 32;
     }
 
-    sub_80BCE84(0, a, b);
-    SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D);
+    sub_80BCE84(0, selectedMon, b);
+    SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D);
 
-    gUnknown_02039B4C->unk630 = 0;
-    gUnknown_02039B4C->unk632 = 0;
+    sPokedexView->unk630 = 0;
+    sPokedexView->unk632 = 0;
 
     gPaletteFade.bufferTransferDisabled = FALSE;
 }
@@ -2211,79 +2211,79 @@ bool8 sub_80BD404(u8 a, u8 b, u8 c)
     u16 i;
     u8 foo;
 
-    if (gUnknown_02039B4C->unk62E)
+    if (sPokedexView->unk62E)
     {
-        gUnknown_02039B4C->unk62E--;
+        sPokedexView->unk62E--;
         switch (a)
         {
             case 1:
                 for (i = 0; i < 4; i++)
                 {
-                    if (gUnknown_02039B4C->unk61E[i] != 0xFFFF)
-                        gSprites[gUnknown_02039B4C->unk61E[i]].data[5] += b;
+                    if (sPokedexView->unk61E[i] != 0xFFFF)
+                        gSprites[sPokedexView->unk61E[i]].data[5] += b;
                 }
-                foo = 16 * (c - gUnknown_02039B4C->unk62E) / c;
-                SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk632 * 16 - foo);
-                gUnknown_02039B4C->unk62C -= gUnknown_02039B4C->unk628;
+                foo = 16 * (c - sPokedexView->unk62E) / c;
+                SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 - foo);
+                sPokedexView->unk62C -= sPokedexView->unk628;
                 break;
             case 2:
                 for (i = 0; i < 4; i++)
                 {
-                    if (gUnknown_02039B4C->unk61E[i] != 0xFFFF)
-                        gSprites[gUnknown_02039B4C->unk61E[i]].data[5] -= b;
+                    if (sPokedexView->unk61E[i] != 0xFFFF)
+                        gSprites[sPokedexView->unk61E[i]].data[5] -= b;
                 }
-                foo = 16 * (c - gUnknown_02039B4C->unk62E) / c;
-                SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk632 * 16 + foo);
-                gUnknown_02039B4C->unk62C += gUnknown_02039B4C->unk628;
+                foo = 16 * (c - sPokedexView->unk62E) / c;
+                SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 + foo);
+                sPokedexView->unk62C += sPokedexView->unk628;
                 break;
         }
         return FALSE;
     }
     else
     {
-        SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk630 * 16);
+        SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk630 * 16);
         return TRUE;
     }
 }
 
-void sub_80BD5A8(u8 a, u16 b)
+static void CreateNewPokemonSprite(u8 direction, u16 selectedMon)
 {
     u16 unk;
     u8 spriteId;
 
-    gUnknown_02039B4C->unk632 = gUnknown_02039B4C->unk630;
-    switch (a)
+    sPokedexView->unk632 = sPokedexView->unk630;
+    switch (direction)
     {
-        case 1:
-            unk = sub_80BDA8C(b - 1);
+        case 1: // up
+            unk = sub_80BDA8C(selectedMon - 1);
             if (unk != 0xFFFF)
             {
                 spriteId = sub_80BDACC(unk, 0x60, 0x50);
                 gSprites[spriteId].callback = sub_80BE4E0;
                 gSprites[spriteId].data[5] = -64;
             }
-            if (gUnknown_02039B4C->unk630 > 0)
-                gUnknown_02039B4C->unk630--;
+            if (sPokedexView->unk630 > 0)
+                sPokedexView->unk630--;
             else
-                gUnknown_02039B4C->unk630 = 15;
+                sPokedexView->unk630 = 15;
             break;
-        case 2:
-            unk = sub_80BDA8C(b + 1);
+        case 2: // down
+            unk = sub_80BDA8C(selectedMon + 1);
             if (unk != 0xFFFF)
             {
                 spriteId = sub_80BDACC(unk, 0x60, 0x50);
                 gSprites[spriteId].callback = sub_80BE4E0;
                 gSprites[spriteId].data[5] = 0x40;
             }
-            if (gUnknown_02039B4C->unk630 <= 0xE)
-                gUnknown_02039B4C->unk630++;
+            if (sPokedexView->unk630 <= 0xE)
+                sPokedexView->unk630++;
             else
-                gUnknown_02039B4C->unk630 = 0;
+                sPokedexView->unk630 = 0;
             break;
     }
 }
 
-u16 sub_80BD69C(u16 a, u16 b)
+u16 sub_80BD69C(u16 selectedMon, u16 b)
 {
     u8 r3;
     u8 r5;
@@ -2291,61 +2291,61 @@ u16 sub_80BD69C(u16 a, u16 b)
     u16 r6;
     u8 r10 = 0;
 
-    if ((gMain.heldKeys & DPAD_UP) && (a > 0))
+    if ((gMain.heldKeys & DPAD_UP) && (selectedMon > 0))
     {
         r10 = 1;
-        a = sub_80C0E0C(1, a, 0, gUnknown_02039B4C->pokemonListCount - 1);
-        sub_80BD5A8(1, a);
-        sub_80BCE84(1, a, b);
+        selectedMon = sub_80C0E0C(1, selectedMon, 0, sPokedexView->pokemonListCount - 1);
+        CreateNewPokemonSprite(1, selectedMon);
+        sub_80BCE84(1, selectedMon, b);
         PlaySE(SE_Z_SCROLL);
     }
-    else if ((gMain.heldKeys & DPAD_DOWN) && (a < gUnknown_02039B4C->pokemonListCount - 1))
+    else if ((gMain.heldKeys & DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1))
     {
         r10 = 2;
-        a = sub_80C0E0C(0, a, 0, gUnknown_02039B4C->pokemonListCount - 1);
-        sub_80BD5A8(2, a);
-        sub_80BCE84(2, a, b);
+        selectedMon = sub_80C0E0C(0, selectedMon, 0, sPokedexView->pokemonListCount - 1);
+        CreateNewPokemonSprite(2, selectedMon);
+        sub_80BCE84(2, selectedMon, b);
         PlaySE(SE_Z_SCROLL);
     }
-    else if ((gMain.newKeys & DPAD_LEFT) && (a > 0))
+    else if ((gMain.newKeys & DPAD_LEFT) && (selectedMon > 0))
     {
-        r6 = a;
+        r6 = selectedMon;
 
         for (i = 0; i < 7; i++)
-            a = sub_80C0E0C(1, a, 0, gUnknown_02039B4C->pokemonListCount - 1);
-        gUnknown_02039B4C->unk62C += 16 * (a - r6);
+            selectedMon = sub_80C0E0C(1, selectedMon, 0, sPokedexView->pokemonListCount - 1);
+        sPokedexView->unk62C += 16 * (selectedMon - r6);
         sub_80BDA40();
-        sub_80BD2B4(a, 0xE);
+        CreateInitialPokemonSprites(selectedMon, 0xE);
         PlaySE(SE_Z_PAGE);
     }
-    else if ((gMain.newKeys & DPAD_RIGHT) && (a < gUnknown_02039B4C->pokemonListCount - 1))
+    else if ((gMain.newKeys & DPAD_RIGHT) && (selectedMon < sPokedexView->pokemonListCount - 1))
     {
-        r6 = a;
+        r6 = selectedMon;
         for (i = 0; i < 7; i++)
-            a = sub_80C0E0C(0, a, 0, gUnknown_02039B4C->pokemonListCount - 1);
-        gUnknown_02039B4C->unk62C += (a - r6) * 16;
+            selectedMon = sub_80C0E0C(0, selectedMon, 0, sPokedexView->pokemonListCount - 1);
+        sPokedexView->unk62C += (selectedMon - r6) * 16;
         sub_80BDA40();
-        sub_80BD2B4(a, 0xE);
+        CreateInitialPokemonSprites(selectedMon, 0xE);
         PlaySE(SE_Z_PAGE);
     }
 
     if (r10 == 0)
     {
-        gUnknown_02039B4C->unk638 = 0;
-        return a;
+        sPokedexView->unk638 = 0;
+        return selectedMon;
     }
 
-    r5 = gUnknown_0855D28C[gUnknown_02039B4C->unk638 / 4];
-    r3 = gUnknown_0855D291[gUnknown_02039B4C->unk638 / 4];
-    gUnknown_02039B4C->unk62E = r3;
-    gUnknown_02039B4C->unk636 = r3;
-    gUnknown_02039B4C->unk634 = r5;
-    gUnknown_02039B4C->unk62F = r10;
-    gUnknown_02039B4C->unk628 = r5 / 2;
-    sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636);
-    if (gUnknown_02039B4C->unk638 <= 0xB)
-        gUnknown_02039B4C->unk638++;
-    return a;
+    r5 = gUnknown_0855D28C[sPokedexView->unk638 / 4];
+    r3 = gUnknown_0855D291[sPokedexView->unk638 / 4];
+    sPokedexView->unk62E = r3;
+    sPokedexView->unk636 = r3;
+    sPokedexView->unk634 = r5;
+    sPokedexView->unk62F = r10;
+    sPokedexView->unk628 = r5 / 2;
+    sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636);
+    if (sPokedexView->unk638 <= 0xB)
+        sPokedexView->unk638++;
+    return selectedMon;
 }
 
 void sub_80BD8D0(void)
@@ -2354,61 +2354,61 @@ void sub_80BD8D0(void)
 
     for (i = 0; i < 4; i++)
     {
-        u16 spriteId = gUnknown_02039B4C->unk61E[i];
+        u16 spriteId = sPokedexView->unk61E[i];
 
         if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF)
-            gUnknown_02039B4C->selectedMonSpriteId = spriteId;
+            sPokedexView->selectedMonSpriteId = spriteId;
     }
 }
 
 u8 sub_80BD930(void)
 {
     u16 r2;
-    u16 r4 = gUnknown_02039B4C->selectedPokemon;
+    u16 r4 = sPokedexView->selectedPokemon;
 
     if ((gMain.newKeys & DPAD_UP) && r4)
     {
         r2 = r4;
         while (r2 != 0)
         {
-            r2 = sub_80C0E0C(1, r2, 0, gUnknown_02039B4C->pokemonListCount - 1);
+            r2 = sub_80C0E0C(1, r2, 0, sPokedexView->pokemonListCount - 1);
 
-            if (gUnknown_02039B4C->unk0[r2].seen)
+            if (sPokedexView->pokedexList[r2].seen)
             {
                 r4 = r2;
                 break;
             }
         }
 
-        if (gUnknown_02039B4C->selectedPokemon == r4)
+        if (sPokedexView->selectedPokemon == r4)
             return FALSE;
         else
         {
-            gUnknown_02039B4C->selectedPokemon = r4;
-            gUnknown_02039B4C->unk62C -= 16;
+            sPokedexView->selectedPokemon = r4;
+            sPokedexView->unk62C -= 16;
             return TRUE;
         }
     }
-    else if ((gMain.newKeys & DPAD_DOWN) && r4 < gUnknown_02039B4C->pokemonListCount - 1)
+    else if ((gMain.newKeys & DPAD_DOWN) && r4 < sPokedexView->pokemonListCount - 1)
     {
         r2 = r4;
-        while (r2 < gUnknown_02039B4C->pokemonListCount - 1)
+        while (r2 < sPokedexView->pokemonListCount - 1)
         {
-            r2 = sub_80C0E0C(0, r2, 0, gUnknown_02039B4C->pokemonListCount - 1);
+            r2 = sub_80C0E0C(0, r2, 0, sPokedexView->pokemonListCount - 1);
 
-            if (gUnknown_02039B4C->unk0[r2].seen)
+            if (sPokedexView->pokedexList[r2].seen)
             {
                 r4 = r2;
                 break;
             }
         }
 
-        if (gUnknown_02039B4C->selectedPokemon == r4)
+        if (sPokedexView->selectedPokemon == r4)
             return FALSE;
         else
         {
-            gUnknown_02039B4C->selectedPokemon = r4;
-            gUnknown_02039B4C->unk62C += 16;
+            sPokedexView->selectedPokemon = r4;
+            sPokedexView->unk62C += 16;
             return TRUE;
         }
     }
@@ -2421,10 +2421,10 @@ u8 sub_80BDA40(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gUnknown_02039B4C->unk61E[i] != 0xFFFF)
+        if (sPokedexView->unk61E[i] != 0xFFFF)
         {
-            FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[i]);
-            gUnknown_02039B4C->unk61E[i] |= 0xFFFF;
+            FreeAndDestroyMonPicSprite(sPokedexView->unk61E[i]);
+            sPokedexView->unk61E[i] |= 0xFFFF;
         }
     }
     return FALSE;
@@ -2432,10 +2432,10 @@ u8 sub_80BDA40(void)
 
 u16 sub_80BDA8C(u16 a1)
 {
-    if (a1 >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[a1].dexNum == 0xFFFF)
+    if (a1 >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[a1].dexNum == 0xFFFF)
         return 0xFFFF;
-    else if (gUnknown_02039B4C->unk0[a1].seen)
-        return gUnknown_02039B4C->unk0[a1].dexNum;
+    else if (sPokedexView->pokedexList[a1].seen)
+        return sPokedexView->pokedexList[a1].dexNum;
     else
         return 0;
 }
@@ -2446,7 +2446,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y)
 
     for (i = 0; i < 4; i++)
     {
-        if (gUnknown_02039B4C->unk61E[i] == 0xFFFF)
+        if (sPokedexView->unk61E[i] == 0xFFFF)
         {
             u8 spriteId = sub_80C0E9C(num, x, y, i);
 
@@ -2455,45 +2455,46 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y)
             gSprites[spriteId].data[0] = 0;
             gSprites[spriteId].data[1] = i;
             gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(num);
-            gUnknown_02039B4C->unk61E[i] = spriteId;
+            sPokedexView->unk61E[i] = spriteId;
             return spriteId;
         }
     }
     return 0xFFFF;
 }
 
-void sub_80BDB7C(u8 a)
+static void CreateInterfaceSprites(u8 a)
 {
     u8 spriteId;
     u16 r5;
-
-    spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 4, 0);
+// Up arrow
+    spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 4, 0);
     gSprites[spriteId].data[1] = 0;
-
-    spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 156, 0);
+// Down arrow
+    spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 156, 0);
     gSprites[spriteId].data[1] = 1;
     gSprites[spriteId].vFlip = TRUE;
 
-    CreateSprite(&gUnknown_0855D194, 230, 20, 0);
-    CreateSprite(&gUnknown_0855D1C4, 16, 120, 0);
-
-    spriteId = CreateSprite(&gUnknown_0855D1C4, 48, 120, 0);
+    CreateSprite(&sScrollBarSpriteTemplate, 230, 20, 0);
+// Start button
+    CreateSprite(&sInterfaceTextSpriteTemplate, 16, 120, 0);
+// Menu text
+    spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 120, 0);
     StartSpriteAnim(&gSprites[spriteId], 3);
-
-    spriteId = CreateSprite(&gUnknown_0855D1C4, 16, 144, 0);
+// Select button
+    spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 16, 144, 0);
     StartSpriteAnim(&gSprites[spriteId], 2);
     gSprites[spriteId].data[2] = 0x80;
-
-    spriteId = CreateSprite(&gUnknown_0855D1C4, 48, 144, 0);
+// Search text
+    spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 144, 0);
     StartSpriteAnim(&gSprites[spriteId], 1);
 
-    spriteId = CreateSprite(&gUnknown_0855D1DC, 0, 80, 2);
+    spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2);
     gSprites[spriteId].oam.affineMode = 1;
     gSprites[spriteId].oam.matrixNum = 30;
     gSprites[spriteId].data[0] = 0x1E;
     gSprites[spriteId].data[1] = 0;
 
-    spriteId = CreateSprite(&gUnknown_0855D1DC, 0, 80, 2);
+    spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2);
     gSprites[spriteId].oam.affineMode = 1;
     gSprites[spriteId].oam.matrixNum = 31;
     gSprites[spriteId].data[0] = 0x1F;
@@ -2505,58 +2506,59 @@ void sub_80BDB7C(u8 a)
 
         if (!IsNationalPokedexEnabled())
         {
-            CreateSprite(&gUnknown_0855D1F4, 32, 40, 1);
-
-            spriteId = CreateSprite(&gUnknown_0855D1F4, 32, 72, 1);
+// Seen text
+            CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 40, 1);
+// Own text
+            spriteId = CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 72, 1);
             StartSpriteAnim(&gSprites[spriteId], 1);
             _a = 0;
-
+// Seen value - 100s
             spriteId = CreateSprite(&gUnknown_0855D224, 24, 48, 1);
-            r5 = gUnknown_02039B4C->unk61A / 100;
+            r5 = sPokedexView->seenCount / 100;
             StartSpriteAnim(&gSprites[spriteId], r5);
             if (r5 != 0)
                 _a = 1;
             else
                 gSprites[spriteId].invisible = TRUE;
-
+// Seen value - 10s
             spriteId = CreateSprite(&gUnknown_0855D224, 32, 48, 1);
-            r5 = (gUnknown_02039B4C->unk61A % 100) / 10;
+            r5 = (sPokedexView->seenCount % 100) / 10;
             if (r5 != 0 || _a != 0)
                 StartSpriteAnim(&gSprites[spriteId], r5);
             else
                 gSprites[spriteId].invisible = TRUE;
-
+// Seen value - 1s
             spriteId = CreateSprite(&gUnknown_0855D224, 40, 48, 1);
-            r5 = (gUnknown_02039B4C->unk61A % 100) % 10;
+            r5 = (sPokedexView->seenCount % 100) % 10;
             StartSpriteAnim(&gSprites[spriteId], r5);
             _a = 0;
-
+// Owned value - 100s
             spriteId = CreateSprite(&gUnknown_0855D224, 24, 80, 1);
-            r5 = gUnknown_02039B4C->unk61C / 100;
+            r5 = sPokedexView->ownCount / 100;
             StartSpriteAnim(&gSprites[spriteId], r5);
             if (r5 != 0)
                 _a = 1;
             else
                 gSprites[spriteId].invisible = TRUE;
-
+// Owned value - 10s
             spriteId = CreateSprite(&gUnknown_0855D224, 32, 80, 1);
-            r5 = (gUnknown_02039B4C->unk61C % 100) / 10;
+            r5 = (sPokedexView->ownCount % 100) / 10;
             if (r5 != 0 || _a != 0)
                 StartSpriteAnim(&gSprites[spriteId], r5);
             else
                 gSprites[spriteId].invisible = TRUE;
-
+// Owned value -1s
             spriteId = CreateSprite(&gUnknown_0855D224, 40, 80, 1);
-            r5 = (gUnknown_02039B4C->unk61C % 100) % 10;
+            r5 = (sPokedexView->ownCount % 100) % 10;
             StartSpriteAnim(&gSprites[spriteId], r5);
         }
         else
         {
             u16 r6;
 
-            CreateSprite(&gUnknown_0855D1F4, 32, 40, 1);
+            CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 40, 1);
 
-            spriteId = CreateSprite(&gUnknown_0855D1F4, 32, 76, 1);
+            spriteId = CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 76, 1);
             StartSpriteAnim(&gSprites[spriteId], 1);
 
             CreateSprite(&gUnknown_0855D20C, 17, 45, 1);
@@ -2594,7 +2596,7 @@ void sub_80BDB7C(u8 a)
             _a = 0;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 40, 55, 1);
-            r5 = gUnknown_02039B4C->unk61A / 100;
+            r5 = sPokedexView->seenCount / 100;
             StartSpriteAnim(&gSprites[spriteId], r5);
             if (r5 != 0)
                 _a = 1;
@@ -2602,14 +2604,14 @@ void sub_80BDB7C(u8 a)
                 gSprites[spriteId].invisible = TRUE;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 48, 55, 1);
-            r5 = (gUnknown_02039B4C->unk61A % 100) / 10;
+            r5 = (sPokedexView->seenCount % 100) / 10;
             if (r5 != 0 || _a != 0)
                 StartSpriteAnim(&gSprites[spriteId], r5);
             else
                 gSprites[spriteId].invisible = TRUE;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 56, 55, 1);
-            r5 = (gUnknown_02039B4C->unk61A % 100) % 10;
+            r5 = (sPokedexView->seenCount % 100) % 10;
             StartSpriteAnim(&gSprites[spriteId], r5);
 
             r6 = GetHoennPokedexCount(1);
@@ -2637,7 +2639,7 @@ void sub_80BDB7C(u8 a)
             _a = 0;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 40, 91, 1);
-            r5 = gUnknown_02039B4C->unk61C / 100;
+            r5 = sPokedexView->ownCount / 100;
             StartSpriteAnim(&gSprites[spriteId], r5);
             if (r5 != 0)
                 _a = 1;
@@ -2645,14 +2647,14 @@ void sub_80BDB7C(u8 a)
                 gSprites[spriteId].invisible = TRUE;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 48, 91, 1);
-            r5 = (gUnknown_02039B4C->unk61C % 100) / 10;
+            r5 = (sPokedexView->ownCount % 100) / 10;
             if (r5 != 0 || _a != 0)
                 StartSpriteAnim(&gSprites[spriteId], r5);
             else
                 gSprites[spriteId].invisible = TRUE;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 56, 91, 1);
-            r5 = (gUnknown_02039B4C->unk61C % 100) % 10;
+            r5 = (sPokedexView->ownCount % 100) % 10;
             StartSpriteAnim(&gSprites[spriteId], r5);
         }
         spriteId = CreateSprite(&gUnknown_0855D254, 136, 96, 1);
@@ -2671,7 +2673,7 @@ void nullsub_38(struct Sprite *sprite)
 
 void sub_80BE44C(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0)
+    if (sPokedexView->unk64A != 0)
         DestroySprite(sprite);
 }
 
@@ -2704,10 +2706,10 @@ void sub_80BE4E0(struct Sprite *sprite)
 {
     u8 data1 = sprite->data[1];
 
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
     {
-        FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[data1]);
-        gUnknown_02039B4C->unk61E[data1] = 0xFFFF;
+        FreeAndDestroyMonPicSprite(sPokedexView->unk61E[data1]);
+        sPokedexView->unk61E[data1] = 0xFFFF;
     }
     else
     {
@@ -2732,23 +2734,23 @@ void sub_80BE4E0(struct Sprite *sprite)
 
         if ((sprite->data[5] <= -64 || sprite->data[5] >= 64) && sprite->data[0] != 0)
         {
-            FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[data1]);
-            gUnknown_02039B4C->unk61E[data1] = 0xFFFF;
+            FreeAndDestroyMonPicSprite(sPokedexView->unk61E[data1]);
+            sPokedexView->unk61E[data1] = 0xFFFF;
         }
     }
 }
 
 void sub_80BE604(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
         DestroySprite(sprite);
     else
-        sprite->pos2.y = gUnknown_02039B4C->selectedPokemon * 120 / (gUnknown_02039B4C->pokemonListCount - 1);
+        sprite->pos2.y = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1);
 }
 
 void sub_80BE658(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
     {
         DestroySprite(sprite);
     }
@@ -2758,7 +2760,7 @@ void sub_80BE658(struct Sprite *sprite)
 
         if (sprite->data[1] != 0)
         {
-            if (gUnknown_02039B4C->selectedPokemon == gUnknown_02039B4C->pokemonListCount - 1)
+            if (sPokedexView->selectedPokemon == sPokedexView->pokemonListCount - 1)
                 sprite->invisible = TRUE;
             else
                 sprite->invisible = FALSE;
@@ -2766,7 +2768,7 @@ void sub_80BE658(struct Sprite *sprite)
         }
         else
         {
-            if (gUnknown_02039B4C->selectedPokemon == 0)
+            if (sPokedexView->selectedPokemon == 0)
                 sprite->invisible = TRUE;
             else
                 sprite->invisible = FALSE;
@@ -2774,7 +2776,7 @@ void sub_80BE658(struct Sprite *sprite)
         }
         sprite->pos2.y = gSineTable[r0] / 64;
         sprite->data[2] = sprite->data[2] + 8;
-        if (gUnknown_02039B4C->menuIsOpen == 0 && gUnknown_02039B4C->menuY == 0 && sprite->invisible == 0)
+        if (sPokedexView->menuIsOpen == 0 && sPokedexView->menuY == 0 && sprite->invisible == 0)
             sprite->invisible = FALSE;
         else
             sprite->invisible = TRUE;
@@ -2783,13 +2785,13 @@ void sub_80BE658(struct Sprite *sprite)
 
 void sub_80BE758(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
         DestroySprite(sprite);
 }
 
 void sub_80BE780(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
     {
         DestroySprite(sprite);
     }
@@ -2799,12 +2801,12 @@ void sub_80BE780(struct Sprite *sprite)
         s16 r3;
         s16 r0;
 
-        val = gUnknown_02039B4C->unk62C + sprite->data[1];
+        val = sPokedexView->unk62C + sprite->data[1];
         r3 = gSineTable[val];
         r0 = gSineTable[val + 0x40];
         SetOamMatrix(sprite->data[0], r0, r3, -r3, r0);
 
-        val = gUnknown_02039B4C->unk62C + (sprite->data[1] + 0x40);
+        val = sPokedexView->unk62C + (sprite->data[1] + 0x40);
         r3 = gSineTable[val];
         r0 = gSineTable[val + 0x40];
         sprite->pos2.x = r0 * 40 / 256;
@@ -2814,18 +2816,18 @@ void sub_80BE780(struct Sprite *sprite)
 
 void sub_80BE834(struct Sprite *sprite)
 {
-    if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3)
+    if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3)
     {
         DestroySprite(sprite);
     }
     else
     {
-        u16 r1 = gUnknown_02039B4C->unk64A == 0 ? 80 : 96;
+        u16 r1 = sPokedexView->unk64A == 0 ? 80 : 96;
 
-        if (gUnknown_02039B4C->menuIsOpen != 0 && gUnknown_02039B4C->menuY == r1)
+        if (sPokedexView->menuIsOpen != 0 && sPokedexView->menuY == r1)
         {
             sprite->invisible = FALSE;
-            sprite->pos2.y = gUnknown_02039B4C->menuCursorPos * 16;
+            sprite->pos2.y = sPokedexView->menuCursorPos * 16;
             sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64;
             sprite->data[2] += 8;
         }
@@ -2850,7 +2852,7 @@ u8 sub_80BE91C(struct PokedexListItem* item, u8 b)
 {
     u8 taskId;
 
-    gUnknown_02039B54 = item;
+    sPokedexListItem = item;
     taskId = CreateTask(sub_80BEA24, 0);
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].data[1] = 1;
@@ -2880,7 +2882,7 @@ bool8 sub_80BE9C4(u8 taskId)
 
 u8 sub_80BE9F8(struct PokedexListItem *item, u8 b)
 {
-    gUnknown_02039B54 = item;
+    sPokedexListItem = item;
     gTasks[b].data[0] = 1;
     gTasks[b].data[1] = 0;
     gTasks[b].data[2] = 0;
@@ -2898,7 +2900,7 @@ void sub_80BEA24(u8 taskId)
             {
                 u16 r2;
 
-                gUnknown_02039B4C->unk64A = 1;
+                sPokedexView->unk64A = 1;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
                 r2 = 0;
@@ -2912,26 +2914,26 @@ void sub_80BEA24(u8 taskId)
             break;
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-            CopyToBgTilemapBuffer(3, gUnknown_08DC3080, 0, 0);
+            CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0);
             FillWindowPixelBuffer(0, 0);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
-            sub_80C0D30(1, gUnknown_02039B54->dexNum);
+            sub_80C0D30(1, sPokedexListItem->dexNum);
             CopyWindowToVram(1, 2);
             gMain.state++;
             break;
         case 2:
             sub_80BFCDC(0xD);
-            sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD);
-            sub_80BC844(gUnknown_02039B4C->unk64C_1);
+            sub_80BFD0C(sPokedexView->selectedScreen, 0xD);
+            sub_80BC844(sPokedexView->unk64C_1);
             gMain.state++;
             break;
         case 3:
             gMain.state++;
             break;
         case 4:
-            sub_80C020C(gUnknown_02039B54->dexNum, gUnknown_02039B4C->dexMode == 0 ? 0 : 1, gUnknown_02039B54->owned, 0);
-            if (!gUnknown_02039B54->owned)
+            sub_80C020C(sPokedexListItem->dexNum, sPokedexView->dexMode == 0 ? 0 : 1, sPokedexListItem->owned, 0);
+            if (!sPokedexListItem->owned)
                 LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E);
             CopyWindowToVram(0, 3);
             CopyBgTilemapBufferToVram(1);
@@ -2942,7 +2944,7 @@ void sub_80BEA24(u8 taskId)
         case 5:
             if (gTasks[taskId].data[1] == 0)
             {
-                gTasks[taskId].data[4] = (u16)sub_80C0E9C(gUnknown_02039B54->dexNum, 0x30, 0x38, 0);
+                gTasks[taskId].data[4] = (u16)sub_80C0E9C(sPokedexListItem->dexNum, 0x30, 0x38, 0);
                 gSprites[gTasks[taskId].data[4]].oam.priority = 0;
             }
             gMain.state++;
@@ -2978,7 +2980,7 @@ void sub_80BEA24(u8 taskId)
                 if (gTasks[taskId].data[3] == 0)
                 {
                     StopCryAndClearCrySongs();
-                    PlayCry2(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), 0, 0x7D, 0xA);
+                    PlayCry2(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, 0x7D, 0xA);
                 }
                 else
                 {
@@ -3037,29 +3039,29 @@ void sub_80BEDF4(u8 taskId)
     }
     if (gMain.newKeys & A_BUTTON)
     {
-        switch (gUnknown_02039B4C->selectedScreen)
+        switch (sPokedexView->selectedScreen)
         {
             case AREA_SCREEN:
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB_BLACK);
-                gUnknown_02039B4C->unk64E = 1;
+                sPokedexView->unk64E = 1;
                 gTasks[taskId].func = sub_80BEFD0;
                 PlaySE(SE_PIN);
                 break;
             case CRY_SCREEN:
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
-                gUnknown_02039B4C->unk64E = 2;
+                sPokedexView->unk64E = 2;
                 gTasks[taskId].func = sub_80BEFD0;
                 PlaySE(SE_PIN);
                 break;
             case SIZE_SCREEN:
-                if (!gUnknown_02039B54->owned)
+                if (!sPokedexListItem->owned)
                 {
                     PlaySE(SE_HAZURE);
                 }
                 else
                 {
                     BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
-                    gUnknown_02039B4C->unk64E = 3;
+                    sPokedexView->unk64E = 3;
                     gTasks[taskId].func = sub_80BEFD0;
                     PlaySE(SE_PIN);
                 }
@@ -3074,19 +3076,19 @@ void sub_80BEDF4(u8 taskId)
     }
     if (((gMain.newKeys & DPAD_LEFT)
      || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
-     && gUnknown_02039B4C->selectedScreen > 0)
+     && sPokedexView->selectedScreen > 0)
     {
-        gUnknown_02039B4C->selectedScreen--;
-        sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD);
+        sPokedexView->selectedScreen--;
+        sub_80BFD0C(sPokedexView->selectedScreen, 0xD);
         PlaySE(SE_Z_PAGE);
         return;
     }
     if (((gMain.newKeys & DPAD_RIGHT)
      || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
-     && gUnknown_02039B4C->selectedScreen < 3)
+     && sPokedexView->selectedScreen < 3)
     {
-        gUnknown_02039B4C->selectedScreen++;
-        sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD);
+        sPokedexView->selectedScreen++;
+        sub_80BFD0C(sPokedexView->selectedScreen, 0xD);
         PlaySE(SE_Z_PAGE);
         return;
     }
@@ -3097,7 +3099,7 @@ void sub_80BEFD0(u8 taskId)
     if (!gPaletteFade.active)
     {
         FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
-        switch (gUnknown_02039B4C->unk64E)
+        switch (sPokedexView->unk64E)
         {
             case 1:
             default:
@@ -3140,25 +3142,25 @@ void sub_80BF0AC(u8 taskId)
         default:
             if (!gPaletteFade.active)
             {
-                gUnknown_02039B4C->unk64A = 5;
+                sPokedexView->unk64A = 5;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
                 sub_80C09B0(0x200);
-                gUnknown_02039B4C->selectedScreen = AREA_SCREEN;
+                sPokedexView->selectedScreen = AREA_SCREEN;
                 gMain.state = 1;
             }
             break;
         case 1:
             sub_80BFCF4(0xD);
             sub_80BFD7C(0, 0xD);
-            sub_80BC844(gUnknown_02039B4C->unk64C_1);
+            sub_80BC844(sPokedexView->unk64C_1);
             SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256);
             gMain.state++;
             break;
         case 2:
-            ShowPokedexAreaScreen(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), &gUnknown_02039B4C->unk64E);
+            ShowPokedexAreaScreen(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), &sPokedexView->unk64E);
             SetVBlankCallback(gUnknown_030060B4);
-            gUnknown_02039B4C->unk64E = 0;
+            sPokedexView->unk64E = 0;
             gMain.state = 0;
             gTasks[taskId].func = sub_80BF1B4;
             break;
@@ -3167,7 +3169,7 @@ void sub_80BF0AC(u8 taskId)
 
 void sub_80BF1B4(u8 taskId)
 {
-    if (gUnknown_02039B4C->unk64E != 0)
+    if (sPokedexView->unk64E != 0)
         gTasks[taskId].func = sub_80BF1EC;
 }
 
@@ -3175,7 +3177,7 @@ void sub_80BF1EC(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        switch (gUnknown_02039B4C->unk64E)
+        switch (sPokedexView->unk64E)
         {
             case 1:
             default:
@@ -3197,17 +3199,17 @@ void sub_80BF250(u8 taskId)
             if (!gPaletteFade.active)
             {
                 m4aMPlayStop(&gMPlayInfo_BGM);
-                gUnknown_02039B4C->unk64A = 6;
+                sPokedexView->unk64A = 6;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
                 sub_80C09B0(0x200);
-                gUnknown_02039B4C->selectedScreen = CRY_SCREEN;
+                sPokedexView->selectedScreen = CRY_SCREEN;
                 gMain.state = 1;
             }
             break;
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0);
-            CopyToBgTilemapBuffer(3, &gUnknown_08DC3198, 0, 0);
+            CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0);
             FillWindowPixelBuffer(0, 0);
             PutWindowTilemap(0);
             PutWindowTilemap(3);
@@ -3217,7 +3219,7 @@ void sub_80BF250(u8 taskId)
         case 2:
             sub_80BFCF4(0xD);
             sub_80BFD7C(1, 0xD);
-            sub_80BC844(gUnknown_02039B4C->unk64C_1);
+            sub_80BC844(sPokedexView->unk64C_1);
             gMain.state++;
             break;
         case 3:
@@ -3226,11 +3228,11 @@ void sub_80BF250(u8 taskId)
             break;
         case 4:
             sub_80BE8DC(gText_CryOf, 0x52, 33);
-            sub_80C0B44(0, gUnknown_02039B54->dexNum, 0x52, 49);
+            sub_80C0B44(0, sPokedexListItem->dexNum, 0x52, 49);
             gMain.state++;
             break;
         case 5:
-            gTasks[taskId].data[4] = sub_80C0E9C(gUnknown_02039B54->dexNum, 48, 56, 0);
+            gTasks[taskId].data[4] = sub_80C0E9C(sPokedexListItem->dexNum, 48, 56, 0);
             gSprites[gTasks[taskId].data[4]].oam.priority = 0;
             gDexCryScreenState = 0;
             gMain.state++;
@@ -3285,7 +3287,7 @@ void sub_80BF250(u8 taskId)
             gMain.state++;
             break;
         case 10:
-            gUnknown_02039B4C->unk64E = 0;
+            sPokedexView->unk64E = 0;
             gMain.state = 0;
             gTasks[taskId].func = sub_80BF5CC;
             break;
@@ -3304,7 +3306,7 @@ void sub_80BF5CC(u8 taskId)
     if (gMain.newKeys & A_BUTTON)
     {
         sub_80BF7FC(1);
-        sub_8145534(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum));
+        sub_8145534(NationalPokedexNumToSpecies(sPokedexListItem->dexNum));
         return;
     }
     else if (!gPaletteFade.active)
@@ -3313,7 +3315,7 @@ void sub_80BF5CC(u8 taskId)
         {
             BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
             m4aMPlayContinue(&gMPlayInfo_BGM);
-            gUnknown_02039B4C->unk64E = 1;
+            sPokedexView->unk64E = 1;
             gTasks[taskId].func = sub_80BF790;
             PlaySE(SE_PC_OFF);
             return;
@@ -3323,7 +3325,7 @@ void sub_80BF5CC(u8 taskId)
         {
             BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
             m4aMPlayContinue(&gMPlayInfo_BGM);
-            gUnknown_02039B4C->unk64E = 2;
+            sPokedexView->unk64E = 2;
             gTasks[taskId].func = sub_80BF790;
             PlaySE(SE_Z_PAGE);
             return;
@@ -3331,7 +3333,7 @@ void sub_80BF5CC(u8 taskId)
         if ((gMain.newKeys & DPAD_RIGHT)
          || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
         {
-            if (!gUnknown_02039B54->owned)
+            if (!sPokedexListItem->owned)
             {
                 PlaySE(SE_HAZURE);
             }
@@ -3339,7 +3341,7 @@ void sub_80BF5CC(u8 taskId)
             {
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
                 m4aMPlayContinue(&gMPlayInfo_BGM);
-                gUnknown_02039B4C->unk64E = 3;
+                sPokedexView->unk64E = 3;
                 gTasks[taskId].func = sub_80BF790;
                 PlaySE(SE_Z_PAGE);
             }
@@ -3354,7 +3356,7 @@ void sub_80BF790(u8 taskId)
     {
         sub_8145914();
         FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
-        switch (gUnknown_02039B4C->unk64E)
+        switch (sPokedexView->unk64E)
         {
             default:
             case 1:
@@ -3391,17 +3393,17 @@ void sub_80BF82C(u8 taskId)
         case 0:
             if (!gPaletteFade.active)
             {
-                gUnknown_02039B4C->unk64A = 7;
+                sPokedexView->unk64A = 7;
                 gUnknown_030060B4 = gMain.vblankCallback;
                 SetVBlankCallback(NULL);
                 sub_80C09B0(0x200);
-                gUnknown_02039B4C->selectedScreen = SIZE_SCREEN;
+                sPokedexView->selectedScreen = SIZE_SCREEN;
                 gMain.state = 1;
             }
             break;
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-            CopyToBgTilemapBuffer(3, gUnknown_08DC2E6C, 0, 0);
+            CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0);
             FillWindowPixelBuffer(0, 0);
             PutWindowTilemap(0);
             gMain.state++;
@@ -3409,7 +3411,7 @@ void sub_80BF82C(u8 taskId)
         case 2:
             sub_80BFCF4(0xD);
             sub_80BFD7C(2, 0xD);
-            sub_80BC844(gUnknown_02039B4C->unk64C_1);
+            sub_80BC844(sPokedexView->unk64C_1);
             gMain.state++;
             break;
         case 3:
@@ -3431,19 +3433,19 @@ void sub_80BF82C(u8 taskId)
             gSprites[spriteId].oam.affineMode = 1;
             gSprites[spriteId].oam.matrixNum = 1;
             gSprites[spriteId].oam.priority = 0;
-            gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_02039B54->dexNum].trainerOffset;
-            SetOamMatrix(1, gPokedexEntries[gUnknown_02039B54->dexNum].trainerScale, 0, 0, gPokedexEntries[gUnknown_02039B54->dexNum].trainerScale);
+            gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
+            SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale);
             LoadPalette(gUnknown_0856E610, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
             gTasks[taskId].data[5] = spriteId;
             gMain.state++;
             break;
         case 6:
-            spriteId = sub_80C0E9C(gUnknown_02039B54->dexNum, 88, 56, 1);
+            spriteId = sub_80C0E9C(sPokedexListItem->dexNum, 88, 56, 1);
             gSprites[spriteId].oam.affineMode = 1;
             gSprites[spriteId].oam.matrixNum = 2;
             gSprites[spriteId].oam.priority = 0;
-            gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_02039B54->dexNum].pokemonOffset;
-            SetOamMatrix(2, gPokedexEntries[gUnknown_02039B54->dexNum].pokemonScale, 0, 0, gPokedexEntries[gUnknown_02039B54->dexNum].pokemonScale);
+            gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
+            SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale);
             LoadPalette(gUnknown_0856E610, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
             gTasks[taskId].data[4] = spriteId;
             CopyWindowToVram(0, 3);
@@ -3471,7 +3473,7 @@ void sub_80BF82C(u8 taskId)
         case 9:
             if (!gPaletteFade.active)
             {
-                gUnknown_02039B4C->unk64E = 0;
+                sPokedexView->unk64E = 0;
                 gMain.state = 0;
                 gTasks[taskId].func = sub_80BFBB0;
             }
@@ -3484,7 +3486,7 @@ void sub_80BFBB0(u8 taskId)
     if (gMain.newKeys & B_BUTTON)
     {
         BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
-        gUnknown_02039B4C->unk64E = 1;
+        sPokedexView->unk64E = 1;
         gTasks[taskId].func = sub_80BFC78;
         PlaySE(SE_PC_OFF);
     }
@@ -3492,7 +3494,7 @@ void sub_80BFBB0(u8 taskId)
      || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
     {
         BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
-        gUnknown_02039B4C->unk64E = 2;
+        sPokedexView->unk64E = 2;
         gTasks[taskId].func = sub_80BFC78;
         PlaySE(SE_Z_PAGE);
     }
@@ -3504,7 +3506,7 @@ void sub_80BFC78(u8 taskId)
     {
         FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
         FreeAndDestroyTrainerPicSprite(gTasks[taskId].data[5]);
-        switch (gUnknown_02039B4C->unk64E)
+        switch (sPokedexView->unk64E)
         {
             default:
             case 1:
@@ -3519,12 +3521,12 @@ void sub_80BFC78(u8 taskId)
 
 void sub_80BFCDC(u16 a)
 {
-    CopyToBgTilemapBuffer(1, gUnknown_08DC2F5C, 0, 0);
+    CopyToBgTilemapBuffer(1, gPokedexTilemap_ScreenSelectBar1, 0, 0);
 }
 
 void sub_80BFCF4(u16 a)
 {
-    CopyToBgTilemapBuffer(1, gUnknown_08DC2FEC, 0, 0);
+    CopyToBgTilemapBuffer(1, gPokedexTilemap_ScreenSelectBar2, 0, 0);
 }
 
 #ifdef NONMATCHING
@@ -3748,7 +3750,7 @@ void sub_80BFE38(u8 taskId)
             break;
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-            CopyToBgTilemapBuffer(3, gUnknown_08DC3080, 0, 0);
+            CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0);
             FillWindowPixelBuffer(0, 0);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
@@ -4644,47 +4646,47 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
 
     for (i = 0, resultsCount = 0; i < NATIONAL_DEX_COUNT; i++)
     {
-        if (gUnknown_02039B4C->unk0[i].seen)
+        if (sPokedexView->pokedexList[i].seen)
         {
-            gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i];
+            sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
             resultsCount++;
         }
     }
-    gUnknown_02039B4C->pokemonListCount = resultsCount;
+    sPokedexView->pokemonListCount = resultsCount;
 
     // Search by name
     if (abcGroup != 0xFF)
     {
-        for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++)
+        for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
             u8 r3;
 
-            species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum);
+            species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
             r3 = gSpeciesNames[species][0];
             if ((r3 >= gUnknown_0856ED08[abcGroup][0] && r3 < gUnknown_0856ED08[abcGroup][0] + gUnknown_0856ED08[abcGroup][1])
              || (r3 >= gUnknown_0856ED08[abcGroup][2] && r3 < gUnknown_0856ED08[abcGroup][2] + gUnknown_0856ED08[abcGroup][3]))
             {
-                gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i];
+                sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
                 resultsCount++;
             }
         }
-        gUnknown_02039B4C->pokemonListCount = resultsCount;
+        sPokedexView->pokemonListCount = resultsCount;
     }
 
     // Search by body color
     if (bodyColor != 0xFF)
     {
-        for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++)
+        for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
-            species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum);
+            species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
             if (bodyColor == gBaseStats[species].bodyColor)
             {
-                gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i];
+                sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
                 resultsCount++;
             }
         }
-        gUnknown_02039B4C->pokemonListCount = resultsCount;
+        sPokedexView->pokemonListCount = resultsCount;
     }
 
     // Search by type
@@ -4698,17 +4700,17 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
 
         if (type2 == 0xFF)
         {
-            for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++)
+            for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
             {
-                if (gUnknown_02039B4C->unk0[i].owned)
+                if (sPokedexView->pokedexList[i].owned)
                 {
-                    species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum);
+                    species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
                     types[0] = gBaseStats[species].type1;
                     types[1] = gBaseStats[species].type2;
                     if (types[0] == type1 || types[1] == type1)
                     {
-                        gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i];
+                        sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
                         resultsCount++;
                     }
                 }
@@ -4716,32 +4718,32 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
         }
         else
         {
-            for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++)
+            for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
             {
-                if (gUnknown_02039B4C->unk0[i].owned)
+                if (sPokedexView->pokedexList[i].owned)
                 {
-                    species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum);
+                    species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
                     types[0] = gBaseStats[species].type1;
                     types[1] = gBaseStats[species].type2;
                     if ((types[0] == type1 && types[1] == type2) || (types[0] == type2 && types[1] == type1))
                     {
-                        gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i];
+                        sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
                         resultsCount++;
                     }
                 }
             }
         }
-        gUnknown_02039B4C->pokemonListCount = resultsCount;
+        sPokedexView->pokemonListCount = resultsCount;
     }
 
-    if (gUnknown_02039B4C->pokemonListCount != 0)
+    if (sPokedexView->pokemonListCount != 0)
     {
-        for (i = gUnknown_02039B4C->pokemonListCount; i < NATIONAL_DEX_COUNT; i++)
+        for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++)
         {
-            gUnknown_02039B4C->unk0[i].dexNum = 0xFFFF;
-            gUnknown_02039B4C->unk0[i].seen = FALSE;
-            gUnknown_02039B4C->unk0[i].owned = FALSE;
+            sPokedexView->pokedexList[i].dexNum = 0xFFFF;
+            sPokedexView->pokedexList[i].seen = FALSE;
+            sPokedexView->pokedexList[i].owned = FALSE;
 
         }
     }
@@ -4779,7 +4781,7 @@ void sub_80C12E0(u8 taskId)
         case 0:
             if (!gPaletteFade.active)
             {
-                gUnknown_02039B4C->unk64A = 2;
+                sPokedexView->unk64A = 2;
                 sub_80C09B0(0);
                 ResetBgsAndClearDma3BusyFlags(0);
                 InitBgsFromTemplates(0, gUnknown_0856EFF8, 4);
@@ -4801,8 +4803,8 @@ void sub_80C12E0(u8 taskId)
             }
             break;
         case 1:
-            LoadCompressedObjectPic(gSpriteSheets_0855D26C);
-            LoadSpritePalettes(gSpritePalettes_0855D26C);
+            LoadCompressedObjectPic(sInterfaceSpriteSheet);
+            LoadSpritePalettes(sInterfaceSpritePalette);
             sub_80C2594(taskId);
             for (i = 0; i < 16; i++)
                 gTasks[taskId].data[i] = 0;
@@ -4957,15 +4959,15 @@ void sub_80C170C(u8 taskId)
             if (gTasks[taskId].data[0] != 0)
             {
                 gUnknown_02039B52 = 0x40;
-                gUnknown_02039B4C->unk62A = 0x40;
+                sPokedexView->unk62A = 0x40;
                 gUnknown_02039B50 = 0;
-                gUnknown_02039B4C->unk610 = 0;
+                sPokedexView->unk610 = 0;
                 gSaveBlock2Ptr->pokedex.unknown1 = sub_80C2318(taskId, 5);
                 if (!IsNationalPokedexEnabled())
                     gSaveBlock2Ptr->pokedex.unknown1 = 0;
-                gUnknown_02039B4C->unk614 = gSaveBlock2Ptr->pokedex.unknown1;
+                sPokedexView->unk614 = gSaveBlock2Ptr->pokedex.unknown1;
                 gSaveBlock2Ptr->pokedex.order = sub_80C2318(taskId, 4);
-                gUnknown_02039B4C->unk618 = gSaveBlock2Ptr->pokedex.order;
+                sPokedexView->unk618 = gSaveBlock2Ptr->pokedex.order;
                 PlaySE(SE_PC_OFF);
                 gTasks[taskId].func = sub_80C1D38;
             }
@@ -5036,7 +5038,7 @@ void sub_80C1A4C(u8 taskId)
 {
     if (!IsSEPlaying())
     {
-        if (gUnknown_02039B4C->pokemonListCount != 0)
+        if (sPokedexView->pokemonListCount != 0)
         {
             PlaySE(SE_SEIKAI);
             sub_80C2618(gText_SearchCompleted);
@@ -5055,11 +5057,11 @@ void sub_80C1AB8(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        if (gUnknown_02039B4C->pokemonListCount != 0)
+        if (sPokedexView->pokemonListCount != 0)
         {
-            gUnknown_02039B4C->unk64E = 1;
-            gUnknown_02039B4C->dexMode = sub_80C2318(taskId, 5);
-            gUnknown_02039B4C->dexOrder = sub_80C2318(taskId, 4);
+            sPokedexView->unk64E = 1;
+            sPokedexView->dexMode = sub_80C2318(taskId, 5);
+            sPokedexView->dexOrder = sub_80C2318(taskId, 4);
             gTasks[taskId].func = sub_80C1D38;
             PlaySE(SE_PC_OFF);
         }
@@ -5100,7 +5102,7 @@ void sub_80C1BCC(u8 taskId)
     bool8 r3;
 
     r1 = gTasks[taskId].data[1];
-    r8 = gUnknown_0856EFC8[r1].unk0;
+    r8 = gUnknown_0856EFC8[r1].pokedexList;
     p1 = &gTasks[taskId].data[gUnknown_0856EFC8[r1].unk4];
     p2 = &gTasks[taskId].data[gUnknown_0856EFC8[r1].unk5];
     r2 = gUnknown_0856EFC8[r1].unk6 - 1;
@@ -5445,7 +5447,7 @@ void sub_80C21D4(u8 a)
 
 void sub_80C2294(u8 taskId)
 {
-    const struct UnknownStruct2 *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].unk0;
+    const struct UnknownStruct2 *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].pokedexList;
     const u16 *r8 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk4];
     const u16 *r7 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk5];
     u16 i;
@@ -5491,7 +5493,7 @@ void sub_80C23B8(u8 taskId)
 {
     u16 r3;
 
-    switch (gUnknown_02039B4C->unk614)
+    switch (sPokedexView->unk614)
     {
         default:
         case 0:
@@ -5503,7 +5505,7 @@ void sub_80C23B8(u8 taskId)
     }
     gTasks[taskId].data[2] = r3;
 
-    switch (gUnknown_02039B4C->unk618)
+    switch (sPokedexView->unk618)
     {
         default:
         case 0:
@@ -5586,12 +5588,12 @@ void sub_80C2594(u8 taskId)
 {
     u8 spriteId;
 
-    spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 4, 0);
+    spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 4, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = 0;
     gSprites[spriteId].callback = sub_80C24E0;
 
-    spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 108, 0);
+    spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 108, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = 1;
     gSprites[spriteId].vFlip = TRUE;
diff --git a/src/pokemon.c b/src/pokemon.c
index e5b6d02ae..f528ce331 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2270,9 +2270,9 @@ const u16 gUnknown_08329D54[] =
 {
     FACILITY_CLASS_COOLTRAINER_M, FACILITY_CLASS_BLACK_BELT, FACILITY_CLASS_CAMPER,
     FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_PSYCHIC_M, FACILITY_CLASS_BUG_CATCHER,
-    FACILITY_CLASS_PKMN_BREEDER_2, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F,
+    FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F,
     FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_LASS,
-    FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_PKMN_BREEDER_1,
+    FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_POKEMON_BREEDER_F,
     FACILITY_CLASS_BEAUTY
 };
 
@@ -7114,9 +7114,9 @@ u16 FacilityClassToPicIndex(u16 facilityClass)
 u16 PlayerGenderToFrontTrainerPicId(u8 playerGender)
 {
     if (playerGender != MALE)
-        return FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_MAY);
+        return FacilityClassToPicIndex(FACILITY_CLASS_MAY);
     else
-        return FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_BRENDAN);
+        return FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN);
 }
 
 void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality)
diff --git a/src/start_menu.c b/src/start_menu.c
index 455d26509..079f05be0 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -87,7 +87,7 @@ extern u8 gUnknown_03005DB4;
 extern void sub_80AF688(void);
 extern void var_800D_set_xB(void);
 extern void sub_808B864(void);
-extern void sub_80BB534(void);
+extern void CB2_Pokedex(void);
 extern void play_some_sound(void);
 extern void CB2_PartyMenuFromStartMenu(void);
 extern void CB2_PokeNav(void);
@@ -624,7 +624,7 @@ static bool8 StartMenuPokedexCallback(void)
         play_some_sound();
         RemoveExtraStartMenuWindows();
         overworld_free_bg_tilemaps();
-        SetMainCallback2(sub_80BB534); // Display pokedex
+        SetMainCallback2(CB2_Pokedex);
 
         return TRUE;
     }
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 18c02350f..040310901 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -404,9 +404,9 @@ u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass)
         switch (gender)
         {
         default:
-            return gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY];
+            return gFacilityClassToPicIndex[FACILITY_CLASS_MAY];
         case MALE:
-            return gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN];
+            return gFacilityClassToPicIndex[FACILITY_CLASS_BRENDAN];
         }
     }
     return gender;