Merge pull request #207 from DizzyEggg/decompile_pokemon_123

Decompile and clean pokemon files

14 files changed, 89 insertions, 1064 deletions

diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc
index 1fe938099..034c1b62c 100644
--- a/data/battle_frontier/battle_frontier_trainers.inc
+++ b/data/battle_frontier/battle_frontier_trainers.inc
@@ -157,7 +157,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Peggy
 
 @ 6
-	.4byte FACILITY_CLASS_SCHOOL_KID_1
+	.4byte FACILITY_CLASS_SCHOOL_KID_M
 	.string "KEITH$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -183,7 +183,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Keith
 
 @ 7
-	.4byte FACILITY_CLASS_SCHOOL_KID_1
+	.4byte FACILITY_CLASS_SCHOOL_KID_M
 	.string "GRAYSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -209,7 +209,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Grayson
 
 @ 8
-	.4byte FACILITY_CLASS_SCHOOL_KID_1
+	.4byte FACILITY_CLASS_SCHOOL_KID_M
 	.string "GLENN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -235,7 +235,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Glenn
 
 @ 9
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "LILIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -261,7 +261,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Liliana
 
 @ 10
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "ELISE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -287,7 +287,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Elise
 
 @ 11
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "ZOEY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PLEASE
@@ -2965,7 +2965,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Rayna
 
 @ 114
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "EVAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_EVERY
@@ -2991,7 +2991,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Evan
 
 @ 115
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "JORDAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_GOOD
@@ -3017,7 +3017,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jordan
 
 @ 116
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "JOEL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_FUFUFU
@@ -3121,7 +3121,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Chloe
 
 @ 120
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "NORTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -3147,7 +3147,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Norton
 
 @ 121
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "LUKAS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -3173,7 +3173,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Lukas
 
 @ 122
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "ZACH$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -3199,7 +3199,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Zach
 
 @ 123
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "KAITLYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -3225,7 +3225,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kaitlyn
 
 @ 124
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "BREANNA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -3251,7 +3251,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Breanna
 
 @ 125
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "KENDRA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IF
@@ -3641,7 +3641,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Sofia
 
 @ 140
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "BRADEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_CHOOSE_YOU
@@ -3667,7 +3667,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Braden
 
 @ 141
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "KAYDEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THEY
@@ -3693,7 +3693,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kayden
 
 @ 142
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "COOPER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THIS
@@ -3719,7 +3719,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Cooper
 
 @ 143
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "JULIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_SPIRIT
@@ -3745,7 +3745,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Julia
 
 @ 144
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "AMARA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WROOOAAR_EXCL
@@ -3771,7 +3771,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Amara
 
 @ 145
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "LYNN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOUR
@@ -3797,7 +3797,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Lynn
 
 @ 146
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "JOVAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOUR
@@ -3823,7 +3823,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jovan
 
 @ 147
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "DOMINIC$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -3849,7 +3849,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dominic
 
 @ 148
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "NIKOLAS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -3875,7 +3875,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nikolas
 
 @ 149
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "VALERIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -3901,7 +3901,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Valeria
 
 @ 150
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "DELANEY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_SCHOOL
@@ -3927,7 +3927,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Delaney
 
 @ 151
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "MEGHAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_SCHOOL
@@ -4265,7 +4265,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kaila
 
 @ 164
-	.4byte FACILITY_CLASS_SCHOOL_KID_1
+	.4byte FACILITY_CLASS_SCHOOL_KID_M
 	.string "ISIAH$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4291,7 +4291,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Isiah
 
 @ 165
-	.4byte FACILITY_CLASS_SCHOOL_KID_1
+	.4byte FACILITY_CLASS_SCHOOL_KID_M
 	.string "GARRETT$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4317,7 +4317,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Garrett
 
 @ 166
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "HAYLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4343,7 +4343,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Haylie
 
 @ 167
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "MEGAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5721,7 +5721,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Tess
 
 @ 220
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "LEON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -5747,7 +5747,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Leon
 
 @ 221
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "ALONZO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_VE
@@ -5773,7 +5773,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alonzo
 
 @ 222
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "VINCE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -5799,7 +5799,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Vince
 
 @ 223
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "BRYON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -5825,7 +5825,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Bryon
 
 @ 224
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "AVA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -5851,7 +5851,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ava
 
 @ 225
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "MIRIAM$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OH
@@ -5877,7 +5877,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Miriam
 
 @ 226
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "CARRIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5903,7 +5903,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Carrie
 
 @ 227
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "GILLIAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5929,7 +5929,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gillian2
 
 @ 228
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "TYLER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YO
@@ -5955,7 +5955,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Tyler
 
 @ 229
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "CHAZ$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -5981,7 +5981,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Chaz
 
 @ 230
-	.4byte FACILITY_CLASS_PKMN_RANGER_1
+	.4byte FACILITY_CLASS_PKMN_RANGER_M
 	.string "NELSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WELL_THEN
@@ -6007,7 +6007,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nelson
 
 @ 231
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "SHANIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -6033,7 +6033,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Shania
 
 @ 232
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "STELLA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -6059,7 +6059,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Stella
 
 @ 233
-	.4byte FACILITY_CLASS_PKMN_RANGER_2
+	.4byte FACILITY_CLASS_PKMN_RANGER_F
 	.string "DORINE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -6319,7 +6319,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alana
 
 @ 243
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "ALEXAS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_GOOD
@@ -6345,7 +6345,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alexas
 
 @ 244
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "WESTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -6371,7 +6371,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Weston
 
 @ 245
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "JASPER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -6475,7 +6475,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Emma
 
 @ 249
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "ROLANDO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -6501,7 +6501,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Rolando
 
 @ 250
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "STANLY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THIS
@@ -6527,7 +6527,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Stanly
 
 @ 251
-	.4byte FACILITY_CLASS_PSYCHIC_1
+	.4byte FACILITY_CLASS_PSYCHIC_M
 	.string "DARIO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -6553,7 +6553,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dario
 
 @ 252
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "KARLEE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_SOMETHING
@@ -6579,7 +6579,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Karlee
 
 @ 253
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "JAYLIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_EVERY
@@ -6605,7 +6605,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jaylin
 
 @ 254
-	.4byte FACILITY_CLASS_PSYCHIC_2
+	.4byte FACILITY_CLASS_PSYCHIC_F
 	.string "INGRID$", 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 4975f0cd4..675314eb3 100644
--- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc
+++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
@@ -339,7 +339,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Conrad
 
 @ 13
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "MAKENNA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_SHOW
@@ -365,7 +365,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Makenna
 
 @ 14
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "BRAYAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_CAN
@@ -391,7 +391,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Brayan
 
 @ 15
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "MARIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -469,7 +469,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Gianna
 
 @ 18
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "YAHIR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc
index 6fdd85215..051514b94 100644
--- a/data/battle_frontier/slateport_battle_tent_trainers.inc
+++ b/data/battle_frontier/slateport_battle_tent_trainers.inc
@@ -339,7 +339,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Kyler
 
 @ 13
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "MAGGIE$", 8
 @ pre-battle speech
 	.2byte EC_POKEMON(VULPIX)
@@ -365,7 +365,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Maggie
 
 @ 14
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "STEPHON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -391,7 +391,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Stephon
 
 @ 15
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "REBECCA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THAT
@@ -469,7 +469,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Janae
 
 @ 18
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "CAIDEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
index a31f52ba6..b375ce811 100644
--- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc
+++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
@@ -339,7 +339,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Ernesto
 
 @ 13
-	.4byte FACILITY_CLASS_SCHOOL_KID_2
+	.4byte FACILITY_CLASS_SCHOOL_KID_F
 	.string "NALA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -365,7 +365,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Nala
 
 @ 14
-	.4byte FACILITY_CLASS_COOLTRAINER_1
+	.4byte FACILITY_CLASS_COOLTRAINER_M
 	.string "DARNELL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -391,7 +391,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Darnell
 
 @ 15
-	.4byte FACILITY_CLASS_COOLTRAINER_2
+	.4byte FACILITY_CLASS_COOLTRAINER_F
 	.string "ASHLYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -469,7 +469,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Justine
 
 @ 18
-	.4byte FACILITY_CLASS_EXPERT_1
+	.4byte FACILITY_CLASS_EXPERT_M
 	.string "TYSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU_RE
diff --git a/data/data2b.s b/data/data2b.s
index b34995bee..b65087d7a 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -22,31 +22,31 @@ gUnknown_082FF2B8:: @ 82FF2B8
 
 	.align 2
 gUnknown_082FF3A8:: @ 82FF3A8
-	.byte 0x00, 0x80, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0x88, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0x90, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0x98, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+	obj_frame_tiles gHeap + 0x8000, 0x800
+	obj_frame_tiles gHeap + 0x8800, 0x800
+	obj_frame_tiles gHeap + 0x9000, 0x800
+	obj_frame_tiles gHeap + 0x9800, 0x800
 
 	.align 2
 gUnknown_082FF3C8:: @ 82FF3C8
-	.byte 0x00, 0xa0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xa8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xb0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xb8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+	obj_frame_tiles gHeap + 0xA000, 0x800
+	obj_frame_tiles gHeap + 0xA800, 0x800
+	obj_frame_tiles gHeap + 0xB000, 0x800
+	obj_frame_tiles gHeap + 0xB800, 0x800
 
 	.align 2
 gUnknown_082FF3E8:: @ 82FF3E8
-	.byte 0x00, 0xc0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xc8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xd0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xd8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+	obj_frame_tiles gHeap + 0xC000, 0x800
+	obj_frame_tiles gHeap + 0xC800, 0x800
+	obj_frame_tiles gHeap + 0xD000, 0x800
+	obj_frame_tiles gHeap + 0xD800, 0x800
 
 	.align 2
 gUnknown_082FF408:: @ 82FF408
-	.byte 0x00, 0xe0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xe8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xf0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0xf8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+	obj_frame_tiles gHeap + 0xE000, 0x800
+	obj_frame_tiles gHeap + 0xE800, 0x800
+	obj_frame_tiles gHeap + 0xF000, 0x800
+	obj_frame_tiles gHeap + 0xF800, 0x800
 
 	.align 2
 gUnknown_082FF428:: @ 82FF428
diff --git a/data/data2e.s b/data/data2e.s
deleted file mode 100644
index 597d53067..000000000
--- a/data/data2e.s
+++ /dev/null
@@ -1,151 +0,0 @@
-#include "constants/abilities.h"
-#include "constants/items.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/trainers.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-
-@ 83299EC
-	.include "data/graphics/pokemon/front_anim_ids_table.inc"
-
-@ 8329B87
-	.include "data/graphics/pokemon/animation_delay_table.inc"
-
-	.align 1
-gUnknown_08329D22:: @ 8329D22
-@ Masks for getting PP Up count, also PP Max values
-	.byte 0x03, 0x0c, 0x30, 0xc0
-
-	.align 1
-gUnknown_08329D26:: @ 8329D26
-@ Masks for setting PP Up count
-	.byte 0xfc, 0xf3, 0xcf, 0x3f
-
-	.align 1
-gUnknown_08329D2A:: @ 8329D2A
-@ Values added to PP Up count
-	.byte 0x01, 0x04, 0x10, 0x40
-
-	.align 1
-gStatStageRatios:: @ 8329D2E
-	.byte 0x0a, 0x28
-	.byte 0x0a, 0x23
-	.byte 0x0a, 0x1e
-	.byte 0x0a, 0x19
-	.byte 0x0a, 0x14
-	.byte 0x0a, 0x0f
-	.byte 0x0a, 0x0a
-	.byte 0x0f, 0x0a
-	.byte 0x14, 0x0a
-	.byte 0x19, 0x0a
-	.byte 0x1e, 0x0a
-	.byte 0x23, 0x0a
-	.byte 0x28, 0x0a
-
-	.align 1
-gUnknown_08329D48:: @ 8329D48
-	.2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a
-
-	.align 1
-gUnknown_08329D54:: @ 8329D54
-	.2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019
-	.2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014
-
-	.align 1
-gHoldEffectToType:: @ 8329D74
-	.byte 0x1f, 0x06
-	.byte 0x2a, 0x08
-	.byte 0x2e, 0x04
-	.byte 0x2f, 0x05
-	.byte 0x30, 0x0c
-	.byte 0x31, 0x11
-	.byte 0x32, 0x01
-	.byte 0x33, 0x0d
-	.byte 0x34, 0x0b
-	.byte 0x35, 0x02
-	.byte 0x36, 0x03
-	.byte 0x37, 0x0f
-	.byte 0x38, 0x07
-	.byte 0x39, 0x0e
-	.byte 0x3a, 0x0a
-	.byte 0x3b, 0x10
-	.byte 0x3c, 0x00
-	.byte 0x00, 0x00
-
-	.align 2
-gUnknown_08329D98:: @ 8329D98
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent
-
-	.align 2
-gUnknown_08329DF8:: @ 8329DF8
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4
-	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4
-
-gSecretBaseTrainerClasses:: @ 8329EB8
-	.byte FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOLTRAINER_1
-	.byte FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_2, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOLTRAINER_2
-
-gUnknown_08329EC2:: @ 8329EC2
-	.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
-
-gUnknown_08329EC8:: @ 8329EC8
-	.byte 1, 1, 3, 2, 4, 6
-
-gUnknown_08329ECE:: @ 8329ECE
-@ Happiness deltas
-	.byte 0x05, 0x03, 0x02
-	.byte 0x05, 0x03, 0x02
-	.byte 0x01, 0x01, 0x00
-	.byte 0x03, 0x02, 0x01
-	.byte 0x01, 0x01, 0x00
-	.byte 0x01, 0x01, 0x01
-	.byte 0xff, 0xff, 0xff
-	.byte 0xfb, 0xfb, 0xf6
-	.byte 0xfb, 0xfb, 0xf6
-
-	.align 1
-gHMMoves:: @ 8329EEA
-	.2byte MOVE_CUT
-	.2byte MOVE_FLY
-	.2byte MOVE_SURF
-	.2byte MOVE_STRENGTH
-	.2byte MOVE_FLASH
-	.2byte MOVE_ROCK_SMASH
-	.2byte MOVE_WATERFALL
-	.2byte MOVE_DIVE
-	.2byte 0xffff
-
-	.align 1
-gAlteringCaveWildMonHeldItems:: @ 8329EFC
-	.2byte 0, ITEM_NONE
-	.2byte SPECIES_MAREEP,		ITEM_GANLON_BERRY
-	.2byte SPECIES_PINECO,		ITEM_APICOT_BERRY
-	.2byte SPECIES_HOUNDOUR,	ITEM_BIG_MUSHROOM
-	.2byte SPECIES_TEDDIURSA,	ITEM_PETAYA_BERRY
-	.2byte SPECIES_AIPOM,		ITEM_BERRY_JUICE
-	.2byte SPECIES_SHUCKLE,		ITEM_BERRY_JUICE
-	.2byte SPECIES_STANTLER,	ITEM_PETAYA_BERRY
-	.2byte SPECIES_SMEARGLE,	ITEM_SALAC_BERRY
-
-	.align 2
-gUnknown_08329F20:: @ 8329F20
-	.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_08329F28:: @ 8329F28
-	spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
diff --git a/data/graphics/pokemon/animation_delay_table.inc b/data/graphics/pokemon/animation_delay_table.inc
deleted file mode 100644
index be517649b..000000000
--- a/data/graphics/pokemon/animation_delay_table.inc
+++ /dev/null
@@ -1,412 +0,0 @@
-gMonAnimationDelayTable:: @ 8329B87
-	.byte 0x00 @ SPECIES_BULBASAUR
-	.byte 0x00 @ SPECIES_IVYSAUR
-	.byte 0x00 @ SPECIES_VENUSAUR
-	.byte 0x00 @ SPECIES_CHARMANDER
-	.byte 0x00 @ SPECIES_CHARMELEON
-	.byte 0x00 @ SPECIES_CHARIZARD
-	.byte 0x00 @ SPECIES_SQUIRTLE
-	.byte 0x00 @ SPECIES_WARTORTLE
-	.byte 0x32 @ SPECIES_BLASTOISE
-	.byte 0x00 @ SPECIES_CATERPIE
-	.byte 0x00 @ SPECIES_METAPOD
-	.byte 0x00 @ SPECIES_BUTTERFREE
-	.byte 0x0a @ SPECIES_WEEDLE
-	.byte 0x14 @ SPECIES_KAKUNA
-	.byte 0x23 @ SPECIES_BEEDRILL
-	.byte 0x00 @ SPECIES_PIDGEY
-	.byte 0x19 @ SPECIES_PIDGEOTTO
-	.byte 0x00 @ SPECIES_PIDGEOT
-	.byte 0x00 @ SPECIES_RATTATA
-	.byte 0x00 @ SPECIES_RATICATE
-	.byte 0x00 @ SPECIES_SPEAROW
-	.byte 0x02 @ SPECIES_FEAROW
-	.byte 0x1e @ SPECIES_EKANS
-	.byte 0x00 @ SPECIES_ARBOK
-	.byte 0x00 @ SPECIES_PIKACHU
-	.byte 0x00 @ SPECIES_RAICHU
-	.byte 0x00 @ SPECIES_SANDSHREW
-	.byte 0x00 @ SPECIES_SANDSLASH
-	.byte 0x1c @ SPECIES_NIDORAN_F
-	.byte 0x00 @ SPECIES_NIDORINA
-	.byte 0x00 @ SPECIES_NIDOQUEEN
-	.byte 0x00 @ SPECIES_NIDORAN_M
-	.byte 0x00 @ SPECIES_NIDORINO
-	.byte 0x19 @ SPECIES_NIDOKING
-	.byte 0x00 @ SPECIES_CLEFAIRY
-	.byte 0x00 @ SPECIES_CLEFABLE
-	.byte 0x00 @ SPECIES_VULPIX
-	.byte 0x00 @ SPECIES_NINETALES
-	.byte 0x00 @ SPECIES_JIGGLYPUFF
-	.byte 0x00 @ SPECIES_WIGGLYTUFF
-	.byte 0x00 @ SPECIES_ZUBAT
-	.byte 0x00 @ SPECIES_GOLBAT
-	.byte 0x00 @ SPECIES_ODDISH
-	.byte 0x00 @ SPECIES_GLOOM
-	.byte 0x00 @ SPECIES_VILEPLUME
-	.byte 0x0a @ SPECIES_PARAS
-	.byte 0x2d @ SPECIES_PARASECT
-	.byte 0x14 @ SPECIES_VENONAT
-	.byte 0x00 @ SPECIES_VENOMOTH
-	.byte 0x19 @ SPECIES_DIGLETT
-	.byte 0x23 @ SPECIES_DUGTRIO
-	.byte 0x28 @ SPECIES_MEOWTH
-	.byte 0x14 @ SPECIES_PERSIAN
-	.byte 0x00 @ SPECIES_PSYDUCK
-	.byte 0x00 @ SPECIES_GOLDUCK
-	.byte 0x14 @ SPECIES_MANKEY
-	.byte 0x00 @ SPECIES_PRIMEAPE
-	.byte 0x1e @ SPECIES_GROWLITHE
-	.byte 0x28 @ SPECIES_ARCANINE
-	.byte 0x00 @ SPECIES_POLIWAG
-	.byte 0x05 @ SPECIES_POLIWHIRL
-	.byte 0x00 @ SPECIES_POLIWRATH
-	.byte 0x00 @ SPECIES_ABRA
-	.byte 0x00 @ SPECIES_KADABRA
-	.byte 0x00 @ SPECIES_ALAKAZAM
-	.byte 0x00 @ SPECIES_MACHOP
-	.byte 0x00 @ SPECIES_MACHOKE
-	.byte 0x00 @ SPECIES_MACHAMP
-	.byte 0x00 @ SPECIES_BELLSPROUT
-	.byte 0x03 @ SPECIES_WEEPINBELL
-	.byte 0x00 @ SPECIES_VICTREEBEL
-	.byte 0x00 @ SPECIES_TENTACOOL
-	.byte 0x00 @ SPECIES_TENTACRUEL
-	.byte 0x00 @ SPECIES_GEODUDE
-	.byte 0x00 @ SPECIES_GRAVELER
-	.byte 0x00 @ SPECIES_GOLEM
-	.byte 0x00 @ SPECIES_PONYTA
-	.byte 0x00 @ SPECIES_RAPIDASH
-	.byte 0x00 @ SPECIES_SLOWPOKE
-	.byte 0x00 @ SPECIES_SLOWBRO
-	.byte 0x00 @ SPECIES_MAGNEMITE
-	.byte 0x00 @ SPECIES_MAGNETON
-	.byte 0x00 @ SPECIES_FARFETCHD
-	.byte 0x00 @ SPECIES_DODUO
-	.byte 0x00 @ SPECIES_DODRIO
-	.byte 0x00 @ SPECIES_SEEL
-	.byte 0x00 @ SPECIES_DEWGONG
-	.byte 0x00 @ SPECIES_GRIMER
-	.byte 0x2d @ SPECIES_MUK
-	.byte 0x14 @ SPECIES_SHELLDER
-	.byte 0x00 @ SPECIES_CLOYSTER
-	.byte 0x00 @ SPECIES_GASTLY
-	.byte 0x17 @ SPECIES_HAUNTER
-	.byte 0x00 @ SPECIES_GENGAR
-	.byte 0x00 @ SPECIES_ONIX
-	.byte 0x30 @ SPECIES_DROWZEE
-	.byte 0x28 @ SPECIES_HYPNO
-	.byte 0x00 @ SPECIES_KRABBY
-	.byte 0x00 @ SPECIES_KINGLER
-	.byte 0x00 @ SPECIES_VOLTORB
-	.byte 0x00 @ SPECIES_ELECTRODE
-	.byte 0x00 @ SPECIES_EXEGGCUTE
-	.byte 0x00 @ SPECIES_EXEGGUTOR
-	.byte 0x00 @ SPECIES_CUBONE
-	.byte 0x00 @ SPECIES_MAROWAK
-	.byte 0x00 @ SPECIES_HITMONLEE
-	.byte 0x19 @ SPECIES_HITMONCHAN
-	.byte 0x00 @ SPECIES_LICKITUNG
-	.byte 0x00 @ SPECIES_KOFFING
-	.byte 0x00 @ SPECIES_WEEZING
-	.byte 0x00 @ SPECIES_RHYHORN
-	.byte 0x00 @ SPECIES_RHYDON
-	.byte 0x00 @ SPECIES_CHANSEY
-	.byte 0x00 @ SPECIES_TANGELA
-	.byte 0x00 @ SPECIES_KANGASKHAN
-	.byte 0x00 @ SPECIES_HORSEA
-	.byte 0x00 @ SPECIES_SEADRA
-	.byte 0x00 @ SPECIES_GOLDEEN
-	.byte 0x00 @ SPECIES_SEAKING
-	.byte 0x00 @ SPECIES_STARYU
-	.byte 0x00 @ SPECIES_STARMIE
-	.byte 0x00 @ SPECIES_MR_MIME
-	.byte 0x0a @ SPECIES_SCYTHER
-	.byte 0x00 @ SPECIES_JYNX
-	.byte 0x00 @ SPECIES_ELECTABUZZ
-	.byte 0x00 @ SPECIES_MAGMAR
-	.byte 0x00 @ SPECIES_PINSIR
-	.byte 0x0a @ SPECIES_TAUROS
-	.byte 0x00 @ SPECIES_MAGIKARP
-	.byte 0x00 @ SPECIES_GYARADOS
-	.byte 0x00 @ SPECIES_LAPRAS
-	.byte 0x00 @ SPECIES_DITTO
-	.byte 0x00 @ SPECIES_EEVEE
-	.byte 0x00 @ SPECIES_VAPOREON
-	.byte 0x00 @ SPECIES_JOLTEON
-	.byte 0x00 @ SPECIES_FLAREON
-	.byte 0x00 @ SPECIES_PORYGON
-	.byte 0x00 @ SPECIES_OMANYTE
-	.byte 0x00 @ SPECIES_OMASTAR
-	.byte 0x00 @ SPECIES_KABUTO
-	.byte 0x00 @ SPECIES_KABUTOPS
-	.byte 0x00 @ SPECIES_AERODACTYL
-	.byte 0x00 @ SPECIES_SNORLAX
-	.byte 0x00 @ SPECIES_ARTICUNO
-	.byte 0x00 @ SPECIES_ZAPDOS
-	.byte 0x00 @ SPECIES_MOLTRES
-	.byte 0x00 @ SPECIES_DRATINI
-	.byte 0x00 @ SPECIES_DRAGONAIR
-	.byte 0x00 @ SPECIES_DRAGONITE
-	.byte 0x00 @ SPECIES_MEWTWO
-	.byte 0x00 @ SPECIES_MEW
-	.byte 0x00 @ SPECIES_CHIKORITA
-	.byte 0x00 @ SPECIES_BAYLEEF
-	.byte 0x00 @ SPECIES_MEGANIUM
-	.byte 0x00 @ SPECIES_CYNDAQUIL
-	.byte 0x00 @ SPECIES_QUILAVA
-	.byte 0x14 @ SPECIES_TYPHLOSION
-	.byte 0x00 @ SPECIES_TOTODILE
-	.byte 0x00 @ SPECIES_CROCONAW
-	.byte 0x05 @ SPECIES_FERALIGATR
-	.byte 0x00 @ SPECIES_SENTRET
-	.byte 0x00 @ SPECIES_FURRET
-	.byte 0x00 @ SPECIES_HOOTHOOT
-	.byte 0x00 @ SPECIES_NOCTOWL
-	.byte 0x00 @ SPECIES_LEDYBA
-	.byte 0x00 @ SPECIES_LEDIAN
-	.byte 0x00 @ SPECIES_SPINARAK
-	.byte 0x00 @ SPECIES_ARIADOS
-	.byte 0x00 @ SPECIES_CROBAT
-	.byte 0x00 @ SPECIES_CHINCHOU
-	.byte 0x00 @ SPECIES_LANTURN
-	.byte 0x00 @ SPECIES_PICHU
-	.byte 0x00 @ SPECIES_CLEFFA
-	.byte 0x00 @ SPECIES_IGGLYBUFF
-	.byte 0x00 @ SPECIES_TOGEPI
-	.byte 0x00 @ SPECIES_TOGETIC
-	.byte 0x1e @ SPECIES_NATU
-	.byte 0x00 @ SPECIES_XATU
-	.byte 0x32 @ SPECIES_MAREEP
-	.byte 0x00 @ SPECIES_FLAAFFY
-	.byte 0x0a @ SPECIES_AMPHAROS
-	.byte 0x00 @ SPECIES_BELLOSSOM
-	.byte 0x00 @ SPECIES_MARILL
-	.byte 0x00 @ SPECIES_AZUMARILL
-	.byte 0x00 @ SPECIES_SUDOWOODO
-	.byte 0x28 @ SPECIES_POLITOED
-	.byte 0x00 @ SPECIES_HOPPIP
-	.byte 0x00 @ SPECIES_SKIPLOOM
-	.byte 0x00 @ SPECIES_JUMPLUFF
-	.byte 0x00 @ SPECIES_AIPOM
-	.byte 0x00 @ SPECIES_SUNKERN
-	.byte 0x00 @ SPECIES_SUNFLORA
-	.byte 0x00 @ SPECIES_YANMA
-	.byte 0x00 @ SPECIES_WOOPER
-	.byte 0x00 @ SPECIES_QUAGSIRE
-	.byte 0x00 @ SPECIES_ESPEON
-	.byte 0x00 @ SPECIES_UMBREON
-	.byte 0x00 @ SPECIES_MURKROW
-	.byte 0x00 @ SPECIES_SLOWKING
-	.byte 0x00 @ SPECIES_MISDREAVUS
-	.byte 0x00 @ SPECIES_UNOWN
-	.byte 0x00 @ SPECIES_WOBBUFFET
-	.byte 0x00 @ SPECIES_GIRAFARIG
-	.byte 0x00 @ SPECIES_PINECO
-	.byte 0x00 @ SPECIES_FORRETRESS
-	.byte 0x0a @ SPECIES_DUNSPARCE
-	.byte 0x00 @ SPECIES_GLIGAR
-	.byte 0x2d @ SPECIES_STEELIX
-	.byte 0x00 @ SPECIES_SNUBBULL
-	.byte 0x00 @ SPECIES_GRANBULL
-	.byte 0x27 @ SPECIES_QWILFISH
-	.byte 0x13 @ SPECIES_SCIZOR
-	.byte 0x00 @ SPECIES_SHUCKLE
-	.byte 0x00 @ SPECIES_HERACROSS
-	.byte 0x00 @ SPECIES_SNEASEL
-	.byte 0x00 @ SPECIES_TEDDIURSA
-	.byte 0x00 @ SPECIES_URSARING
-	.byte 0x00 @ SPECIES_SLUGMA
-	.byte 0x00 @ SPECIES_MAGCARGO
-	.byte 0x00 @ SPECIES_SWINUB
-	.byte 0x00 @ SPECIES_PILOSWINE
-	.byte 0x00 @ SPECIES_CORSOLA
-	.byte 0x00 @ SPECIES_REMORAID
-	.byte 0x14 @ SPECIES_OCTILLERY
-	.byte 0x00 @ SPECIES_DELIBIRD
-	.byte 0x00 @ SPECIES_MANTINE
-	.byte 0x00 @ SPECIES_SKARMORY
-	.byte 0x00 @ SPECIES_HOUNDOUR
-	.byte 0x00 @ SPECIES_HOUNDOOM
-	.byte 0x00 @ SPECIES_KINGDRA
-	.byte 0x00 @ SPECIES_PHANPY
-	.byte 0x00 @ SPECIES_DONPHAN
-	.byte 0x00 @ SPECIES_PORYGON2
-	.byte 0x00 @ SPECIES_STANTLER
-	.byte 0x00 @ SPECIES_SMEARGLE
-	.byte 0x00 @ SPECIES_TYROGUE
-	.byte 0x00 @ SPECIES_HITMONTOP
-	.byte 0x28 @ SPECIES_SMOOCHUM
-	.byte 0x00 @ SPECIES_ELEKID
-	.byte 0x00 @ SPECIES_MAGBY
-	.byte 0x00 @ SPECIES_MILTANK
-	.byte 0x00 @ SPECIES_BLISSEY
-	.byte 0x00 @ SPECIES_RAIKOU
-	.byte 0x00 @ SPECIES_ENTEI
-	.byte 0x00 @ SPECIES_SUICUNE
-	.byte 0x00 @ SPECIES_LARVITAR
-	.byte 0x00 @ SPECIES_PUPITAR
-	.byte 0x0a @ SPECIES_TYRANITAR
-	.byte 0x14 @ SPECIES_LUGIA
-	.byte 0x00 @ SPECIES_HO_OH
-	.byte 0x00 @ SPECIES_CELEBI
-	.byte 0x00 @ 252
-	.byte 0x00 @ 253
-	.byte 0x00 @ 254
-	.byte 0x00 @ 255
-	.byte 0x00 @ 256
-	.byte 0x00 @ 257
-	.byte 0x00 @ 258
-	.byte 0x00 @ 259
-	.byte 0x00 @ 260
-	.byte 0x00 @ 261
-	.byte 0x00 @ 262
-	.byte 0x00 @ 263
-	.byte 0x00 @ 264
-	.byte 0x00 @ 265
-	.byte 0x00 @ 266
-	.byte 0x00 @ 267
-	.byte 0x00 @ 268
-	.byte 0x00 @ 269
-	.byte 0x00 @ 270
-	.byte 0x00 @ 271
-	.byte 0x00 @ 272
-	.byte 0x00 @ 273
-	.byte 0x00 @ 274
-	.byte 0x00 @ 275
-	.byte 0x00 @ 276
-	.byte 0x00 @ SPECIES_TREECKO
-	.byte 0x00 @ SPECIES_GROVYLE
-	.byte 0x00 @ SPECIES_SCEPTILE
-	.byte 0x00 @ SPECIES_TORCHIC
-	.byte 0x00 @ SPECIES_COMBUSKEN
-	.byte 0x00 @ SPECIES_BLAZIKEN
-	.byte 0x00 @ SPECIES_MUDKIP
-	.byte 0x00 @ SPECIES_MARSHTOMP
-	.byte 0x00 @ SPECIES_SWAMPERT
-	.byte 0x00 @ SPECIES_POOCHYENA
-	.byte 0x00 @ SPECIES_MIGHTYENA
-	.byte 0x00 @ SPECIES_ZIGZAGOON
-	.byte 0x00 @ SPECIES_LINOONE
-	.byte 0x00 @ SPECIES_WURMPLE
-	.byte 0x00 @ SPECIES_SILCOON
-	.byte 0x00 @ SPECIES_BEAUTIFLY
-	.byte 0x00 @ SPECIES_CASCOON
-	.byte 0x00 @ SPECIES_DUSTOX
-	.byte 0x00 @ SPECIES_LOTAD
-	.byte 0x00 @ SPECIES_LOMBRE
-	.byte 0x00 @ SPECIES_LUDICOLO
-	.byte 0x00 @ SPECIES_SEEDOT
-	.byte 0x00 @ SPECIES_NUZLEAF
-	.byte 0x00 @ SPECIES_SHIFTRY
-	.byte 0x00 @ SPECIES_NINCADA
-	.byte 0x00 @ SPECIES_NINJASK
-	.byte 0x00 @ SPECIES_SHEDINJA
-	.byte 0x00 @ SPECIES_TAILLOW
-	.byte 0x00 @ SPECIES_SWELLOW
-	.byte 0x00 @ SPECIES_SHROOMISH
-	.byte 0x00 @ SPECIES_BRELOOM
-	.byte 0x00 @ SPECIES_SPINDA
-	.byte 0x00 @ SPECIES_WINGULL
-	.byte 0x00 @ SPECIES_PELIPPER
-	.byte 0x00 @ SPECIES_SURSKIT
-	.byte 0x00 @ SPECIES_MASQUERAIN
-	.byte 0x00 @ SPECIES_WAILMER
-	.byte 0x0a @ SPECIES_WAILORD
-	.byte 0x00 @ SPECIES_SKITTY
-	.byte 0x00 @ SPECIES_DELCATTY
-	.byte 0x1e @ SPECIES_KECLEON
-	.byte 0x00 @ SPECIES_BALTOY
-	.byte 0x00 @ SPECIES_CLAYDOL
-	.byte 0x00 @ SPECIES_NOSEPASS
-	.byte 0x00 @ SPECIES_TORKOAL
-	.byte 0x00 @ SPECIES_SABLEYE
-	.byte 0x00 @ SPECIES_BARBOACH
-	.byte 0x00 @ SPECIES_WHISCASH
-	.byte 0x00 @ SPECIES_LUVDISC
-	.byte 0x00 @ SPECIES_CORPHISH
-	.byte 0x00 @ SPECIES_CRAWDAUNT
-	.byte 0x00 @ SPECIES_FEEBAS
-	.byte 0x2d @ SPECIES_MILOTIC
-	.byte 0x00 @ SPECIES_CARVANHA
-	.byte 0x00 @ SPECIES_SHARPEDO
-	.byte 0x00 @ SPECIES_TRAPINCH
-	.byte 0x00 @ SPECIES_VIBRAVA
-	.byte 0x00 @ SPECIES_FLYGON
-	.byte 0x00 @ SPECIES_MAKUHITA
-	.byte 0x00 @ SPECIES_HARIYAMA
-	.byte 0x00 @ SPECIES_ELECTRIKE
-	.byte 0x00 @ SPECIES_MANECTRIC
-	.byte 0x00 @ SPECIES_NUMEL
-	.byte 0x00 @ SPECIES_CAMERUPT
-	.byte 0x0f @ SPECIES_SPHEAL
-	.byte 0x00 @ SPECIES_SEALEO
-	.byte 0x00 @ SPECIES_WALREIN
-	.byte 0x00 @ SPECIES_CACNEA
-	.byte 0x00 @ SPECIES_CACTURNE
-	.byte 0x14 @ SPECIES_SNORUNT
-	.byte 0x00 @ SPECIES_GLALIE
-	.byte 0x00 @ SPECIES_LUNATONE
-	.byte 0x00 @ SPECIES_SOLROCK
-	.byte 0x00 @ SPECIES_AZURILL
-	.byte 0x00 @ SPECIES_SPOINK
-	.byte 0x0f @ SPECIES_GRUMPIG
-	.byte 0x00 @ SPECIES_PLUSLE
-	.byte 0x00 @ SPECIES_MINUN
-	.byte 0x00 @ SPECIES_MAWILE
-	.byte 0x00 @ SPECIES_MEDITITE
-	.byte 0x00 @ SPECIES_MEDICHAM
-	.byte 0x00 @ SPECIES_SWABLU
-	.byte 0x00 @ SPECIES_ALTARIA
-	.byte 0x0f @ SPECIES_WYNAUT
-	.byte 0x00 @ SPECIES_DUSKULL
-	.byte 0x1e @ SPECIES_DUSCLOPS
-	.byte 0x00 @ SPECIES_ROSELIA
-	.byte 0x00 @ SPECIES_SLAKOTH
-	.byte 0x00 @ SPECIES_VIGOROTH
-	.byte 0x00 @ SPECIES_SLAKING
-	.byte 0x00 @ SPECIES_GULPIN
-	.byte 0x00 @ SPECIES_SWALOT
-	.byte 0x00 @ SPECIES_TROPIUS
-	.byte 0x00 @ SPECIES_WHISMUR
-	.byte 0x00 @ SPECIES_LOUDRED
-	.byte 0x00 @ SPECIES_EXPLOUD
-	.byte 0x00 @ SPECIES_CLAMPERL
-	.byte 0x00 @ SPECIES_HUNTAIL
-	.byte 0x00 @ SPECIES_GOREBYSS
-	.byte 0x2d @ SPECIES_ABSOL
-	.byte 0x00 @ SPECIES_SHUPPET
-	.byte 0x00 @ SPECIES_BANETTE
-	.byte 0x00 @ SPECIES_SEVIPER
-	.byte 0x00 @ SPECIES_ZANGOOSE
-	.byte 0x00 @ SPECIES_RELICANTH
-	.byte 0x00 @ SPECIES_ARON
-	.byte 0x00 @ SPECIES_LAIRON
-	.byte 0x00 @ SPECIES_AGGRON
-	.byte 0x00 @ SPECIES_CASTFORM
-	.byte 0x00 @ SPECIES_VOLBEAT
-	.byte 0x00 @ SPECIES_ILLUMISE
-	.byte 0x00 @ SPECIES_LILEEP
-	.byte 0x00 @ SPECIES_CRADILY
-	.byte 0x00 @ SPECIES_ANORITH
-	.byte 0x00 @ SPECIES_ARMALDO
-	.byte 0x00 @ SPECIES_RALTS
-	.byte 0x00 @ SPECIES_KIRLIA
-	.byte 0x00 @ SPECIES_GARDEVOIR
-	.byte 0x00 @ SPECIES_BAGON
-	.byte 0x00 @ SPECIES_SHELGON
-	.byte 0x46 @ SPECIES_SALAMENCE
-	.byte 0x00 @ SPECIES_BELDUM
-	.byte 0x00 @ SPECIES_METANG
-	.byte 0x00 @ SPECIES_METAGROSS
-	.byte 0x00 @ SPECIES_REGIROCK
-	.byte 0x00 @ SPECIES_REGICE
-	.byte 0x00 @ SPECIES_REGISTEEL
-	.byte 0x3c @ SPECIES_KYOGRE
-	.byte 0x00 @ SPECIES_GROUDON
-	.byte 0x3c @ SPECIES_RAYQUAZA
-	.byte 0x00 @ SPECIES_LATIAS
-	.byte 0x00 @ SPECIES_LATIOS
-	.byte 0x00 @ SPECIES_JIRACHI
-	.byte 0x00 @ SPECIES_DEOXYS
-	.byte 0x00 @ SPECIES_CHIMECHO
diff --git a/data/graphics/pokemon/front_anim_ids_table.inc b/data/graphics/pokemon/front_anim_ids_table.inc
deleted file mode 100644
index 4f225348a..000000000
--- a/data/graphics/pokemon/front_anim_ids_table.inc
+++ /dev/null
@@ -1,412 +0,0 @@
-gMonFrontAnimIdsTable:: @ 83299EC
-	.byte 0x06 @ SPECIES_BULBASAUR
-	.byte 0x17 @ SPECIES_IVYSAUR
-	.byte 0x2f @ SPECIES_VENUSAUR
-	.byte 0x52 @ SPECIES_CHARMANDER
-	.byte 0x25 @ SPECIES_CHARMELEON
-	.byte 0x10 @ SPECIES_CHARIZARD
-	.byte 0x0b @ SPECIES_SQUIRTLE
-	.byte 0x13 @ SPECIES_WARTORTLE
-	.byte 0x19 @ SPECIES_BLASTOISE
-	.byte 0x0b @ SPECIES_CATERPIE
-	.byte 0x0b @ SPECIES_METAPOD
-	.byte 0x1d @ SPECIES_BUTTERFREE
-	.byte 0x46 @ SPECIES_WEEDLE
-	.byte 0x20 @ SPECIES_KAKUNA
-	.byte 0x02 @ SPECIES_BEEDRILL
-	.byte 0x47 @ SPECIES_PIDGEY
-	.byte 0x17 @ SPECIES_PIDGEOTTO
-	.byte 0x29 @ SPECIES_PIDGEOT
-	.byte 0x43 @ SPECIES_RATTATA
-	.byte 0x2b @ SPECIES_RATICATE
-	.byte 0x18 @ SPECIES_SPEAROW
-	.byte 0x2b @ SPECIES_FEAROW
-	.byte 0x16 @ SPECIES_EKANS
-	.byte 0x17 @ SPECIES_ARBOK
-	.byte 0x2c @ SPECIES_PIKACHU
-	.byte 0x17 @ SPECIES_RAICHU
-	.byte 0x2d @ SPECIES_SANDSHREW
-	.byte 0x17 @ SPECIES_SANDSLASH
-	.byte 0x00 @ SPECIES_NIDORAN_F
-	.byte 0x17 @ SPECIES_NIDORINA
-	.byte 0x0f @ SPECIES_NIDOQUEEN
-	.byte 0x09 @ SPECIES_NIDORAN_M
-	.byte 0x13 @ SPECIES_NIDORINO
-	.byte 0x0f @ SPECIES_NIDOKING
-	.byte 0x00 @ SPECIES_CLEFAIRY
-	.byte 0x4a @ SPECIES_CLEFABLE
-	.byte 0x17 @ SPECIES_VULPIX
-	.byte 0x10 @ SPECIES_NINETALES
-	.byte 0x48 @ SPECIES_JIGGLYPUFF
-	.byte 0x31 @ SPECIES_WIGGLYTUFF
-	.byte 0x00 @ SPECIES_ZUBAT
-	.byte 0x1d @ SPECIES_GOLBAT
-	.byte 0x00 @ SPECIES_ODDISH
-	.byte 0x45 @ SPECIES_GLOOM
-	.byte 0x49 @ SPECIES_VILEPLUME
-	.byte 0x46 @ SPECIES_PARAS
-	.byte 0x0f @ SPECIES_PARASECT
-	.byte 0x06 @ SPECIES_VENONAT
-	.byte 0x4b @ SPECIES_VENOMOTH
-	.byte 0x10 @ SPECIES_DIGLETT
-	.byte 0x4c @ SPECIES_DUGTRIO
-	.byte 0x52 @ SPECIES_MEOWTH
-	.byte 0x17 @ SPECIES_PERSIAN
-	.byte 0x06 @ SPECIES_PSYDUCK
-	.byte 0x4c @ SPECIES_GOLDUCK
-	.byte 0x32 @ SPECIES_MANKEY
-	.byte 0x48 @ SPECIES_PRIMEAPE
-	.byte 0x25 @ SPECIES_GROWLITHE
-	.byte 0x02 @ SPECIES_ARCANINE
-	.byte 0x00 @ SPECIES_POLIWAG
-	.byte 0x32 @ SPECIES_POLIWHIRL
-	.byte 0x19 @ SPECIES_POLIWRATH
-	.byte 0x31 @ SPECIES_ABRA
-	.byte 0x09 @ SPECIES_KADABRA
-	.byte 0x17 @ SPECIES_ALAKAZAM
-	.byte 0x00 @ SPECIES_MACHOP
-	.byte 0x10 @ SPECIES_MACHOKE
-	.byte 0x31 @ SPECIES_MACHAMP
-	.byte 0x17 @ SPECIES_BELLSPROUT
-	.byte 0x0d @ SPECIES_WEEPINBELL
-	.byte 0x32 @ SPECIES_VICTREEBEL
-	.byte 0x00 @ SPECIES_TENTACOOL
-	.byte 0x00 @ SPECIES_TENTACRUEL
-	.byte 0x48 @ SPECIES_GEODUDE
-	.byte 0x48 @ SPECIES_GRAVELER
-	.byte 0x2f @ SPECIES_GOLEM
-	.byte 0x20 @ SPECIES_PONYTA
-	.byte 0x11 @ SPECIES_RAPIDASH
-	.byte 0x45 @ SPECIES_SLOWPOKE
-	.byte 0x0b @ SPECIES_SLOWBRO
-	.byte 0x54 @ SPECIES_MAGNEMITE
-	.byte 0x2c @ SPECIES_MAGNETON
-	.byte 0x48 @ SPECIES_FARFETCHD
-	.byte 0x4c @ SPECIES_DODUO
-	.byte 0x41 @ SPECIES_DODRIO
-	.byte 0x0b @ SPECIES_SEEL
-	.byte 0x45 @ SPECIES_DEWGONG
-	.byte 0x46 @ SPECIES_GRIMER
-	.byte 0x30 @ SPECIES_MUK
-	.byte 0x12 @ SPECIES_SHELLDER
-	.byte 0x1d @ SPECIES_CLOYSTER
-	.byte 0x15 @ SPECIES_GASTLY
-	.byte 0x35 @ SPECIES_HAUNTER
-	.byte 0x3a @ SPECIES_GENGAR
-	.byte 0x43 @ SPECIES_ONIX
-	.byte 0x4f @ SPECIES_DROWZEE
-	.byte 0x09 @ SPECIES_HYPNO
-	.byte 0x03 @ SPECIES_KRABBY
-	.byte 0x4b @ SPECIES_KINGLER
-	.byte 0x00 @ SPECIES_VOLTORB
-	.byte 0x00 @ SPECIES_ELECTRODE
-	.byte 0x46 @ SPECIES_EXEGGCUTE
-	.byte 0x32 @ SPECIES_EXEGGUTOR
-	.byte 0x48 @ SPECIES_CUBONE
-	.byte 0x05 @ SPECIES_MAROWAK
-	.byte 0x16 @ SPECIES_HITMONLEE
-	.byte 0x09 @ SPECIES_HITMONCHAN
-	.byte 0x45 @ SPECIES_LICKITUNG
-	.byte 0x13 @ SPECIES_KOFFING
-	.byte 0x04 @ SPECIES_WEEZING
-	.byte 0x10 @ SPECIES_RHYHORN
-	.byte 0x13 @ SPECIES_RHYDON
-	.byte 0x45 @ SPECIES_CHANSEY
-	.byte 0x48 @ SPECIES_TANGELA
-	.byte 0x17 @ SPECIES_KANGASKHAN
-	.byte 0x12 @ SPECIES_HORSEA
-	.byte 0x04 @ SPECIES_SEADRA
-	.byte 0x0d @ SPECIES_GOLDEEN
-	.byte 0x1c @ SPECIES_SEAKING
-	.byte 0x4e @ SPECIES_STARYU
-	.byte 0x12 @ SPECIES_STARMIE
-	.byte 0x46 @ SPECIES_MR_MIME
-	.byte 0x02 @ SPECIES_SCYTHER
-	.byte 0x17 @ SPECIES_JYNX
-	.byte 0x2c @ SPECIES_ELECTABUZZ
-	.byte 0x0f @ SPECIES_MAGMAR
-	.byte 0x09 @ SPECIES_PINSIR
-	.byte 0x19 @ SPECIES_TAUROS
-	.byte 0x05 @ SPECIES_MAGIKARP
-	.byte 0x48 @ SPECIES_GYARADOS
-	.byte 0x17 @ SPECIES_LAPRAS
-	.byte 0x01 @ SPECIES_DITTO
-	.byte 0x17 @ SPECIES_EEVEE
-	.byte 0x17 @ SPECIES_VAPOREON
-	.byte 0x00 @ SPECIES_JOLTEON
-	.byte 0x17 @ SPECIES_FLAREON
-	.byte 0x52 @ SPECIES_PORYGON
-	.byte 0x51 @ SPECIES_OMANYTE
-	.byte 0x09 @ SPECIES_OMASTAR
-	.byte 0x1d @ SPECIES_KABUTO
-	.byte 0x0f @ SPECIES_KABUTOPS
-	.byte 0x47 @ SPECIES_AERODACTYL
-	.byte 0x0b @ SPECIES_SNORLAX
-	.byte 0x09 @ SPECIES_ARTICUNO
-	.byte 0x2c @ SPECIES_ZAPDOS
-	.byte 0x45 @ SPECIES_MOLTRES
-	.byte 0x00 @ SPECIES_DRATINI
-	.byte 0x10 @ SPECIES_DRAGONAIR
-	.byte 0x47 @ SPECIES_DRAGONITE
-	.byte 0x09 @ SPECIES_MEWTWO
-	.byte 0x0d @ SPECIES_MEW
-	.byte 0x00 @ SPECIES_CHIKORITA
-	.byte 0x00 @ SPECIES_BAYLEEF
-	.byte 0x17 @ SPECIES_MEGANIUM
-	.byte 0x52 @ SPECIES_CYNDAQUIL
-	.byte 0x17 @ SPECIES_QUILAVA
-	.byte 0x10 @ SPECIES_TYPHLOSION
-	.byte 0x31 @ SPECIES_TOTODILE
-	.byte 0x0f @ SPECIES_CROCONAW
-	.byte 0x0f @ SPECIES_FERALIGATR
-	.byte 0x00 @ SPECIES_SENTRET
-	.byte 0x32 @ SPECIES_FURRET
-	.byte 0x47 @ SPECIES_HOOTHOOT
-	.byte 0x17 @ SPECIES_NOCTOWL
-	.byte 0x52 @ SPECIES_LEDYBA
-	.byte 0x47 @ SPECIES_LEDIAN
-	.byte 0x4f @ SPECIES_SPINARAK
-	.byte 0x0f @ SPECIES_ARIADOS
-	.byte 0x00 @ SPECIES_CROBAT
-	.byte 0x45 @ SPECIES_CHINCHOU
-	.byte 0x51 @ SPECIES_LANTURN
-	.byte 0x1e @ SPECIES_PICHU
-	.byte 0x52 @ SPECIES_CLEFFA
-	.byte 0x0c @ SPECIES_IGGLYBUFF
-	.byte 0x0b @ SPECIES_TOGEPI
-	.byte 0x00 @ SPECIES_TOGETIC
-	.byte 0x31 @ SPECIES_NATU
-	.byte 0x09 @ SPECIES_XATU
-	.byte 0x00 @ SPECIES_MAREEP
-	.byte 0x1e @ SPECIES_FLAAFFY
-	.byte 0x2c @ SPECIES_AMPHAROS
-	.byte 0x0b @ SPECIES_BELLOSSOM
-	.byte 0x00 @ SPECIES_MARILL
-	.byte 0x4a @ SPECIES_AZUMARILL
-	.byte 0x46 @ SPECIES_SUDOWOODO
-	.byte 0x32 @ SPECIES_POLITOED
-	.byte 0x1c @ SPECIES_HOPPIP
-	.byte 0x18 @ SPECIES_SKIPLOOM
-	.byte 0x51 @ SPECIES_JUMPLUFF
-	.byte 0x32 @ SPECIES_AIPOM
-	.byte 0x52 @ SPECIES_SUNKERN
-	.byte 0x00 @ SPECIES_SUNFLORA
-	.byte 0x2b @ SPECIES_YANMA
-	.byte 0x00 @ SPECIES_WOOPER
-	.byte 0x16 @ SPECIES_QUAGSIRE
-	.byte 0x09 @ SPECIES_ESPEON
-	.byte 0x10 @ SPECIES_UMBREON
-	.byte 0x00 @ SPECIES_MURKROW
-	.byte 0x13 @ SPECIES_SLOWKING
-	.byte 0x1c @ SPECIES_MISDREAVUS
-	.byte 0x0a @ SPECIES_UNOWN
-	.byte 0x30 @ SPECIES_WOBBUFFET
-	.byte 0x1e @ SPECIES_GIRAFARIG
-	.byte 0x0b @ SPECIES_PINECO
-	.byte 0x10 @ SPECIES_FORRETRESS
-	.byte 0x00 @ SPECIES_DUNSPARCE
-	.byte 0x13 @ SPECIES_GLIGAR
-	.byte 0x0f @ SPECIES_STEELIX
-	.byte 0x17 @ SPECIES_SNUBBULL
-	.byte 0x10 @ SPECIES_GRANBULL
-	.byte 0x3a @ SPECIES_QWILFISH
-	.byte 0x02 @ SPECIES_SCIZOR
-	.byte 0x0b @ SPECIES_SHUCKLE
-	.byte 0x41 @ SPECIES_HERACROSS
-	.byte 0x16 @ SPECIES_SNEASEL
-	.byte 0x17 @ SPECIES_TEDDIURSA
-	.byte 0x10 @ SPECIES_URSARING
-	.byte 0x17 @ SPECIES_SLUGMA
-	.byte 0x17 @ SPECIES_MAGCARGO
-	.byte 0x00 @ SPECIES_SWINUB
-	.byte 0x0f @ SPECIES_PILOSWINE
-	.byte 0x03 @ SPECIES_CORSOLA
-	.byte 0x52 @ SPECIES_REMORAID
-	.byte 0x17 @ SPECIES_OCTILLERY
-	.byte 0x52 @ SPECIES_DELIBIRD
-	.byte 0x0d @ SPECIES_MANTINE
-	.byte 0x17 @ SPECIES_SKARMORY
-	.byte 0x17 @ SPECIES_HOUNDOUR
-	.byte 0x10 @ SPECIES_HOUNDOOM
-	.byte 0x42 @ SPECIES_KINGDRA
-	.byte 0x32 @ SPECIES_PHANPY
-	.byte 0x19 @ SPECIES_DONPHAN
-	.byte 0x00 @ SPECIES_PORYGON2
-	.byte 0x00 @ SPECIES_STANTLER
-	.byte 0x31 @ SPECIES_SMEARGLE
-	.byte 0x16 @ SPECIES_TYROGUE
-	.byte 0x02 @ SPECIES_HITMONTOP
-	.byte 0x09 @ SPECIES_SMOOCHUM
-	.byte 0x2c @ SPECIES_ELEKID
-	.byte 0x00 @ SPECIES_MAGBY
-	.byte 0x45 @ SPECIES_MILTANK
-	.byte 0x00 @ SPECIES_BLISSEY
-	.byte 0x2c @ SPECIES_RAIKOU
-	.byte 0x09 @ SPECIES_ENTEI
-	.byte 0x10 @ SPECIES_SUICUNE
-	.byte 0x52 @ SPECIES_LARVITAR
-	.byte 0x10 @ SPECIES_PUPITAR
-	.byte 0x0f @ SPECIES_TYRANITAR
-	.byte 0x3a @ SPECIES_LUGIA
-	.byte 0x09 @ SPECIES_HO_OH
-	.byte 0x18 @ SPECIES_CELEBI
-	.byte 0x00 @ 252
-	.byte 0x00 @ 253
-	.byte 0x00 @ 254
-	.byte 0x00 @ 255
-	.byte 0x00 @ 256
-	.byte 0x00 @ 257
-	.byte 0x00 @ 258
-	.byte 0x00 @ 259
-	.byte 0x00 @ 260
-	.byte 0x00 @ 261
-	.byte 0x00 @ 262
-	.byte 0x00 @ 263
-	.byte 0x00 @ 264
-	.byte 0x00 @ 265
-	.byte 0x00 @ 266
-	.byte 0x00 @ 267
-	.byte 0x00 @ 268
-	.byte 0x00 @ 269
-	.byte 0x00 @ 270
-	.byte 0x00 @ 271
-	.byte 0x00 @ 272
-	.byte 0x00 @ 273
-	.byte 0x00 @ 274
-	.byte 0x00 @ 275
-	.byte 0x00 @ 276
-	.byte 0x00 @ SPECIES_TREECKO
-	.byte 0x17 @ SPECIES_GROVYLE
-	.byte 0x10 @ SPECIES_SCEPTILE
-	.byte 0x16 @ SPECIES_TORCHIC
-	.byte 0x06 @ SPECIES_COMBUSKEN
-	.byte 0x0f @ SPECIES_BLAZIKEN
-	.byte 0x01 @ SPECIES_MUDKIP
-	.byte 0x04 @ SPECIES_MARSHTOMP
-	.byte 0x1e @ SPECIES_SWAMPERT
-	.byte 0x10 @ SPECIES_POOCHYENA
-	.byte 0x10 @ SPECIES_MIGHTYENA
-	.byte 0x03 @ SPECIES_ZIGZAGOON
-	.byte 0x09 @ SPECIES_LINOONE
-	.byte 0x00 @ SPECIES_WURMPLE
-	.byte 0x00 @ SPECIES_SILCOON
-	.byte 0x04 @ SPECIES_BEAUTIFLY
-	.byte 0x04 @ SPECIES_CASCOON
-	.byte 0x06 @ SPECIES_DUSTOX
-	.byte 0x00 @ SPECIES_LOTAD
-	.byte 0x00 @ SPECIES_LOMBRE
-	.byte 0x49 @ SPECIES_LUDICOLO
-	.byte 0x05 @ SPECIES_SEEDOT
-	.byte 0x00 @ SPECIES_NUZLEAF
-	.byte 0x02 @ SPECIES_SHIFTRY
-	.byte 0x00 @ SPECIES_NINCADA
-	.byte 0x46 @ SPECIES_NINJASK
-	.byte 0x1c @ SPECIES_SHEDINJA
-	.byte 0x1e @ SPECIES_TAILLOW
-	.byte 0x01 @ SPECIES_SWELLOW
-	.byte 0x00 @ SPECIES_SHROOMISH
-	.byte 0x00 @ SPECIES_BRELOOM
-	.byte 0x31 @ SPECIES_SPINDA
-	.byte 0x1b @ SPECIES_WINGULL
-	.byte 0x1c @ SPECIES_PELIPPER
-	.byte 0x00 @ SPECIES_SURSKIT
-	.byte 0x00 @ SPECIES_MASQUERAIN
-	.byte 0x01 @ SPECIES_WAILMER
-	.byte 0x1c @ SPECIES_WAILORD
-	.byte 0x00 @ SPECIES_SKITTY
-	.byte 0x17 @ SPECIES_DELCATTY
-	.byte 0x35 @ SPECIES_KECLEON
-	.byte 0x1d @ SPECIES_BALTOY
-	.byte 0x51 @ SPECIES_CLAYDOL
-	.byte 0x49 @ SPECIES_NOSEPASS
-	.byte 0x17 @ SPECIES_TORKOAL
-	.byte 0x15 @ SPECIES_SABLEYE
-	.byte 0x49 @ SPECIES_BARBOACH
-	.byte 0x49 @ SPECIES_WHISCASH
-	.byte 0x1d @ SPECIES_LUVDISC
-	.byte 0x10 @ SPECIES_CORPHISH
-	.byte 0x09 @ SPECIES_CRAWDAUNT
-	.byte 0x49 @ SPECIES_FEEBAS
-	.byte 0x22 @ SPECIES_MILOTIC
-	.byte 0x49 @ SPECIES_CARVANHA
-	.byte 0x56 @ SPECIES_SHARPEDO
-	.byte 0x10 @ SPECIES_TRAPINCH
-	.byte 0x0f @ SPECIES_VIBRAVA
-	.byte 0x4b @ SPECIES_FLYGON
-	.byte 0x0b @ SPECIES_MAKUHITA
-	.byte 0x34 @ SPECIES_HARIYAMA
-	.byte 0x00 @ SPECIES_ELECTRIKE
-	.byte 0x00 @ SPECIES_MANECTRIC
-	.byte 0x04 @ SPECIES_NUMEL
-	.byte 0x10 @ SPECIES_CAMERUPT
-	.byte 0x53 @ SPECIES_SPHEAL
-	.byte 0x17 @ SPECIES_SEALEO
-	.byte 0x0f @ SPECIES_WALREIN
-	.byte 0x49 @ SPECIES_CACNEA
-	.byte 0x04 @ SPECIES_CACTURNE
-	.byte 0x45 @ SPECIES_SNORUNT
-	.byte 0x0a @ SPECIES_GLALIE
-	.byte 0x0e @ SPECIES_LUNATONE
-	.byte 0x08 @ SPECIES_SOLROCK
-	.byte 0x00 @ SPECIES_AZURILL
-	.byte 0x56 @ SPECIES_SPOINK
-	.byte 0x32 @ SPECIES_GRUMPIG
-	.byte 0x00 @ SPECIES_PLUSLE
-	.byte 0x01 @ SPECIES_MINUN
-	.byte 0x00 @ SPECIES_MAWILE
-	.byte 0x05 @ SPECIES_MEDITITE
-	.byte 0x45 @ SPECIES_MEDICHAM
-	.byte 0x04 @ SPECIES_SWABLU
-	.byte 0x16 @ SPECIES_ALTARIA
-	.byte 0x32 @ SPECIES_WYNAUT
-	.byte 0x0a @ SPECIES_DUSKULL
-	.byte 0x02 @ SPECIES_DUSCLOPS
-	.byte 0x45 @ SPECIES_ROSELIA
-	.byte 0x45 @ SPECIES_SLAKOTH
-	.byte 0x31 @ SPECIES_VIGOROTH
-	.byte 0x45 @ SPECIES_SLAKING
-	.byte 0x00 @ SPECIES_GULPIN
-	.byte 0x45 @ SPECIES_SWALOT
-	.byte 0x10 @ SPECIES_TROPIUS
-	.byte 0x03 @ SPECIES_WHISMUR
-	.byte 0x49 @ SPECIES_LOUDRED
-	.byte 0x19 @ SPECIES_EXPLOUD
-	.byte 0x12 @ SPECIES_CLAMPERL
-	.byte 0x09 @ SPECIES_HUNTAIL
-	.byte 0x1c @ SPECIES_GOREBYSS
-	.byte 0x11 @ SPECIES_ABSOL
-	.byte 0x1c @ SPECIES_SHUPPET
-	.byte 0x0d @ SPECIES_BANETTE
-	.byte 0x17 @ SPECIES_SEVIPER
-	.byte 0x09 @ SPECIES_ZANGOOSE
-	.byte 0x1a @ SPECIES_RELICANTH
-	.byte 0x45 @ SPECIES_ARON
-	.byte 0x00 @ SPECIES_LAIRON
-	.byte 0x19 @ SPECIES_AGGRON
-	.byte 0x1d @ SPECIES_CASTFORM
-	.byte 0x00 @ SPECIES_VOLBEAT
-	.byte 0x05 @ SPECIES_ILLUMISE
-	.byte 0x17 @ SPECIES_LILEEP
-	.byte 0x19 @ SPECIES_CRADILY
-	.byte 0x12 @ SPECIES_ANORITH
-	.byte 0x10 @ SPECIES_ARMALDO
-	.byte 0x45 @ SPECIES_RALTS
-	.byte 0x00 @ SPECIES_KIRLIA
-	.byte 0x00 @ SPECIES_GARDEVOIR
-	.byte 0x19 @ SPECIES_BAGON
-	.byte 0x04 @ SPECIES_SHELGON
-	.byte 0x0f @ SPECIES_SALAMENCE
-	.byte 0x0f @ SPECIES_BELDUM
-	.byte 0x04 @ SPECIES_METANG
-	.byte 0x10 @ SPECIES_METAGROSS
-	.byte 0x01 @ SPECIES_REGIROCK
-	.byte 0x44 @ SPECIES_REGICE
-	.byte 0x09 @ SPECIES_REGISTEEL
-	.byte 0x2d @ SPECIES_KYOGRE
-	.byte 0x10 @ SPECIES_GROUDON
-	.byte 0x0f @ SPECIES_RAYQUAZA
-	.byte 0x2d @ SPECIES_LATIAS
-	.byte 0x10 @ SPECIES_LATIOS
-	.byte 0x0d @ SPECIES_JIRACHI
-	.byte 0x1b @ SPECIES_DEOXYS
-	.byte 0x1d @ SPECIES_CHIMECHO
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc
index afaf9a605..0435692f4 100644
--- a/data/scripts/maps/BirthIsland_Exterior.inc
+++ b/data/scripts/maps/BirthIsland_Exterior.inc
@@ -86,7 +86,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	setvar VAR_0x8004, 410
 	setvar VAR_0x8005, 30
 	setvar VAR_0x8006, 0
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLegendaryBattle
 	waitstate
diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc
index d3132b202..23bdac560 100644
--- a/data/scripts/maps/FarawayIsland_Interior.inc
+++ b/data/scripts/maps/FarawayIsland_Interior.inc
@@ -143,7 +143,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	setvar VAR_0x8004, 151
 	setvar VAR_0x8005, 30
 	setvar VAR_0x8006, 0
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLegendaryBattle
 	waitstate
diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc
index dc99ec7f7..cce93e624 100644
--- a/data/scripts/maps/NavelRock_Bottom.inc
+++ b/data/scripts/maps/NavelRock_Bottom.inc
@@ -59,7 +59,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	setvar VAR_0x8004, 249
 	setvar VAR_0x8005, 70
 	setvar VAR_0x8006, 0
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLegendaryBattle
 	waitstate
diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc
index af3586554..07a90e7b7 100644
--- a/data/scripts/maps/NavelRock_Top.inc
+++ b/data/scripts/maps/NavelRock_Top.inc
@@ -63,7 +63,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	setvar VAR_0x8004, 250
 	setvar VAR_0x8005, 70
 	setvar VAR_0x8006, 0
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLegendaryBattle
 	waitstate
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 057c4581d..cbaaa905a 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -121,14 +121,14 @@ SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4
 	setvar VAR_0x8004, 408
 	setvar VAR_0x8005, 50
 	setvar VAR_0x8006, 191
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	return
 
 SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7
 	setvar VAR_0x8004, 407
 	setvar VAR_0x8005, 50
 	setvar VAR_0x8006, 191
-	special DoScriptedWildBattle
+	special CreateObedientEnemyMon
 	return
 
 SouthernIsland_Interior_Movement_242BCA: @ 8242BCA
diff --git a/data/specials.inc b/data/specials.inc
index ac4a47b69..a4bd17699 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -490,7 +490,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_813AF48
 	def_special sub_813AFC8
 	def_special sub_813B1D0
-	def_special DoScriptedWildBattle
+	def_special CreateObedientEnemyMon
 	def_special sub_81BEB54
 	def_special sub_81BEB68
 	def_special sub_81BEB7C