diff --git a/include/constants/battle_tent_mons.h b/include/constants/battle_tent_mons.h
new file mode 100644
index 0000000000..d9fc89a20b
--- /dev/null
+++ b/include/constants/battle_tent_mons.h
@@ -0,0 +1,173 @@
+#ifndef GUARD_CONSTANTS_BATTLE_TENT_MONS_H
+#define GUARD_CONSTANTS_BATTLE_TENT_MONS_H
+
+#define SLATEPORT_TENT_MON_ZIGZAGOON_1  0
+#define SLATEPORT_TENT_MON_ZIGZAGOON_2  1
+#define SLATEPORT_TENT_MON_BEAUTIFLY    2
+#define SLATEPORT_TENT_MON_DUSTOX       3
+#define SLATEPORT_TENT_MON_WAILMER_1    4
+#define SLATEPORT_TENT_MON_WAILMER_2    5
+#define SLATEPORT_TENT_MON_MARILL_1     6
+#define SLATEPORT_TENT_MON_WINGULL_1    7
+#define SLATEPORT_TENT_MON_PELIPPER_1   8
+#define SLATEPORT_TENT_MON_CACNEA_1     9
+#define SLATEPORT_TENT_MON_LOMBRE_1     10
+#define SLATEPORT_TENT_MON_LOTAD        11
+#define SLATEPORT_TENT_MON_SEEDOT       12
+#define SLATEPORT_TENT_MON_NUZLEAF      13
+#define SLATEPORT_TENT_MON_NINJASK_1    14
+#define SLATEPORT_TENT_MON_NINJASK_2    15
+#define SLATEPORT_TENT_MON_GRAVELER     16
+#define SLATEPORT_TENT_MON_BALTOY       17
+#define SLATEPORT_TENT_MON_MIGHTYENA_1  18
+#define SLATEPORT_TENT_MON_MIGHTYENA_2  19
+#define SLATEPORT_TENT_MON_LINOONE      20
+#define SLATEPORT_TENT_MON_GOLDEEN      21
+#define SLATEPORT_TENT_MON_ELECTRIKE_1  22
+#define SLATEPORT_TENT_MON_VOLTORB      23
+#define SLATEPORT_TENT_MON_ARON_1       24
+#define SLATEPORT_TENT_MON_ARON_2       25
+#define SLATEPORT_TENT_MON_TRAPINCH_1   26
+#define SLATEPORT_TENT_MON_CACNEA_2     27
+#define SLATEPORT_TENT_MON_TAILLOW      28
+#define SLATEPORT_TENT_MON_SWELLOW      29
+#define SLATEPORT_TENT_MON_GOLBAT_1     30
+#define SLATEPORT_TENT_MON_LOUDRED      31
+#define SLATEPORT_TENT_MON_SPINDA       32
+#define SLATEPORT_TENT_MON_MAGNEMITE    33
+#define SLATEPORT_TENT_MON_WHISMUR      34
+#define SLATEPORT_TENT_MON_MAKUHITA     35
+#define SLATEPORT_TENT_MON_NUMEL_1      36
+#define SLATEPORT_TENT_MON_BARBOACH     37
+#define SLATEPORT_TENT_MON_TENTACOOL    38
+#define SLATEPORT_TENT_MON_VIGOROTH     39
+#define SLATEPORT_TENT_MON_MAGIKARP     40
+#define SLATEPORT_TENT_MON_SEVIPER_1    41
+#define SLATEPORT_TENT_MON_SOLROCK      42
+#define SLATEPORT_TENT_MON_KECLEON_1    43
+#define SLATEPORT_TENT_MON_KECLEON_2    44
+#define SLATEPORT_TENT_MON_SHROOMISH_1  45
+#define SLATEPORT_TENT_MON_SHROOMISH_2  46
+#define SLATEPORT_TENT_MON_LOMBRE_2     47
+#define SLATEPORT_TENT_MON_NUMEL_2      48
+#define SLATEPORT_TENT_MON_TRAPINCH_2   49
+#define SLATEPORT_TENT_MON_PELIPPER_2   50
+#define SLATEPORT_TENT_MON_WINGULL_2    51
+#define SLATEPORT_TENT_MON_MARILL_2     52
+#define SLATEPORT_TENT_MON_SKITTY       53
+#define SLATEPORT_TENT_MON_SEVIPER_2    54
+#define SLATEPORT_TENT_MON_GOLBAT_2     55
+#define SLATEPORT_TENT_MON_RALTS        56
+#define SLATEPORT_TENT_MON_SANDSHREW    57
+#define SLATEPORT_TENT_MON_SWALOT       58
+#define SLATEPORT_TENT_MON_VOLBEAT      59
+#define SLATEPORT_TENT_MON_ILLUMISE     60
+#define SLATEPORT_TENT_MON_KADABRA      61
+#define SLATEPORT_TENT_MON_KIRLIA       62
+#define SLATEPORT_TENT_MON_BRELOOM      63
+#define SLATEPORT_TENT_MON_PLUSLE_1     64
+#define SLATEPORT_TENT_MON_PLUSLE_2     65
+#define SLATEPORT_TENT_MON_ELECTRIKE_2  66
+#define SLATEPORT_TENT_MON_SWABLU       67
+#define SLATEPORT_TENT_MON_MACHOP       68
+#define SLATEPORT_TENT_MON_MACHOKE      69
+
+#define NUM_SLATEPORT_TENT_MONS         70
+
+#define VERDANTURF_TENT_MON_POOCHYENA   0
+#define VERDANTURF_TENT_MON_ZIGZAGOON   1
+#define VERDANTURF_TENT_MON_DUSTOX      2
+#define VERDANTURF_TENT_MON_TAILLOW     3
+#define VERDANTURF_TENT_MON_SHROOMISH   4
+#define VERDANTURF_TENT_MON_MACHOP      5
+#define VERDANTURF_TENT_MON_MAGIKARP    6
+#define VERDANTURF_TENT_MON_BARBOACH    7
+#define VERDANTURF_TENT_MON_WINGULL     8
+#define VERDANTURF_TENT_MON_ARON_1      9
+#define VERDANTURF_TENT_MON_NUMEL_1     10
+#define VERDANTURF_TENT_MON_SWALOT      11
+#define VERDANTURF_TENT_MON_KECLEON     12
+#define VERDANTURF_TENT_MON_BALTOY      13
+#define VERDANTURF_TENT_MON_NINJASK     14
+#define VERDANTURF_TENT_MON_MAKUHITA    15
+#define VERDANTURF_TENT_MON_SWABLU      16
+#define VERDANTURF_TENT_MON_GOLDEEN_1   17
+#define VERDANTURF_TENT_MON_LOTAD       18
+#define VERDANTURF_TENT_MON_NUMEL_2     19
+#define VERDANTURF_TENT_MON_LINOONE     20
+#define VERDANTURF_TENT_MON_SEVIPER     21
+#define VERDANTURF_TENT_MON_SKARMORY    22
+#define VERDANTURF_TENT_MON_SWELLOW     23
+#define VERDANTURF_TENT_MON_GOLDEEN_2   24
+#define VERDANTURF_TENT_MON_ELECTRIKE   25
+#define VERDANTURF_TENT_MON_NUZLEAF     26
+#define VERDANTURF_TENT_MON_ARON_2      27
+#define VERDANTURF_TENT_MON_MIGHTYENA   28
+#define VERDANTURF_TENT_MON_SOLROCK     29
+#define VERDANTURF_TENT_MON_GRAVELER    30
+#define VERDANTURF_TENT_MON_KADABRA     31
+#define VERDANTURF_TENT_MON_VOLTORB     32
+#define VERDANTURF_TENT_MON_MAGNEMITE   33
+#define VERDANTURF_TENT_MON_PELIPPER    34
+#define VERDANTURF_TENT_MON_LOUDRED     35
+#define VERDANTURF_TENT_MON_MARILL      36
+#define VERDANTURF_TENT_MON_TRAPINCH    37
+#define VERDANTURF_TENT_MON_TENTACOOL   38
+#define VERDANTURF_TENT_MON_VIGOROTH    39
+#define VERDANTURF_TENT_MON_WAILMER     40
+#define VERDANTURF_TENT_MON_ILLUMISE    41
+#define VERDANTURF_TENT_MON_MACHOKE     42
+#define VERDANTURF_TENT_MON_WHISMUR     43
+#define VERDANTURF_TENT_MON_CACNEA      44
+
+#define NUM_VERDANTURF_TENT_MONS        45
+
+#define FALLARBOR_TENT_MON_NUMEL        0
+#define FALLARBOR_TENT_MON_LINOONE_1    1
+#define FALLARBOR_TENT_MON_PLUSLE       2
+#define FALLARBOR_TENT_MON_POOCHYENA    3
+#define FALLARBOR_TENT_MON_KECLEON      4
+#define FALLARBOR_TENT_MON_MAGIKARP     5
+#define FALLARBOR_TENT_MON_SOLROCK      6
+#define FALLARBOR_TENT_MON_MAKUHITA     7
+#define FALLARBOR_TENT_MON_MACHOKE      8
+#define FALLARBOR_TENT_MON_NINCADA      9
+#define FALLARBOR_TENT_MON_BEAUTIFLY    10
+#define FALLARBOR_TENT_MON_DUSTOX       11
+#define FALLARBOR_TENT_MON_ILLUMISE     12
+#define FALLARBOR_TENT_MON_VOLBEAT      13
+#define FALLARBOR_TENT_MON_NINJASK_1    14
+#define FALLARBOR_TENT_MON_NINJASK_2    15
+#define FALLARBOR_TENT_MON_ARON_1       16
+#define FALLARBOR_TENT_MON_ARON_2       17
+#define FALLARBOR_TENT_MON_ELECTRIKE    18
+#define FALLARBOR_TENT_MON_MAGNEMITE    19
+#define FALLARBOR_TENT_MON_VOLTORB      20
+#define FALLARBOR_TENT_MON_WHISMUR      21
+#define FALLARBOR_TENT_MON_LOUDRED      22
+#define FALLARBOR_TENT_MON_LINOONE_2    23
+#define FALLARBOR_TENT_MON_MIGHTYENA    24
+#define FALLARBOR_TENT_MON_SWABLU       25
+#define FALLARBOR_TENT_MON_SKARMORY     26
+#define FALLARBOR_TENT_MON_GOLBAT       27
+#define FALLARBOR_TENT_MON_WINGULL      28
+#define FALLARBOR_TENT_MON_PELIPPER     29
+#define FALLARBOR_TENT_MON_BARBOACH     30
+#define FALLARBOR_TENT_MON_WAILMER      31
+#define FALLARBOR_TENT_MON_MARILL       32
+#define FALLARBOR_TENT_MON_GOLDEEN_1    33
+#define FALLARBOR_TENT_MON_GOLDEEN_2    34
+#define FALLARBOR_TENT_MON_TRAPINCH     35
+#define FALLARBOR_TENT_MON_BALTOY       36
+#define FALLARBOR_TENT_MON_GRAVELER     37
+#define FALLARBOR_TENT_MON_SANDSHREW    38
+#define FALLARBOR_TENT_MON_SWALOT       39
+#define FALLARBOR_TENT_MON_SHROOMISH    40
+#define FALLARBOR_TENT_MON_KIRLIA       41
+#define FALLARBOR_TENT_MON_LOMBRE       42
+#define FALLARBOR_TENT_MON_NUZLEAF      43
+#define FALLARBOR_TENT_MON_CACNEA       44
+
+#define NUM_FALLARBOR_TENT_MONS         45
+
+#endif  // GUARD_CONSTANTS_BATTLE_TENT_MONS_H
diff --git a/include/constants/battle_tent_trainers.h b/include/constants/battle_tent_trainers.h
new file mode 100644
index 0000000000..3629da0ca9
--- /dev/null
+++ b/include/constants/battle_tent_trainers.h
@@ -0,0 +1,99 @@
+#ifndef GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
+#define GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
+
+#define SLATEPORT_TENT_TRAINER_JOLIE    0
+#define SLATEPORT_TENT_TRAINER_MALACHI  1
+#define SLATEPORT_TENT_TRAINER_KELSIE   2
+#define SLATEPORT_TENT_TRAINER_DAVON    3
+#define SLATEPORT_TENT_TRAINER_GLENDA   4
+#define SLATEPORT_TENT_TRAINER_HELENA   5
+#define SLATEPORT_TENT_TRAINER_RODOLFO  6
+#define SLATEPORT_TENT_TRAINER_DAVION   7
+#define SLATEPORT_TENT_TRAINER_KENDALL  8
+#define SLATEPORT_TENT_TRAINER_COLTEN   9
+#define SLATEPORT_TENT_TRAINER_IRVIN    10
+#define SLATEPORT_TENT_TRAINER_SHAUN    11
+#define SLATEPORT_TENT_TRAINER_KYLER    12
+#define SLATEPORT_TENT_TRAINER_MAGGIE   13
+#define SLATEPORT_TENT_TRAINER_STEPHON  14
+#define SLATEPORT_TENT_TRAINER_REBECCA  15
+#define SLATEPORT_TENT_TRAINER_REGGIE   16
+#define SLATEPORT_TENT_TRAINER_JANAE    17
+#define SLATEPORT_TENT_TRAINER_CAIDEN   18
+#define SLATEPORT_TENT_TRAINER_KIRSTEN  19
+#define SLATEPORT_TENT_TRAINER_KURTIS   20
+#define SLATEPORT_TENT_TRAINER_STEFAN   21
+#define SLATEPORT_TENT_TRAINER_AVERY    22
+#define SLATEPORT_TENT_TRAINER_DWANE    23
+#define SLATEPORT_TENT_TRAINER_MCKENNA  24
+#define SLATEPORT_TENT_TRAINER_CAMRYN   25
+#define SLATEPORT_TENT_TRAINER_NATASHA  26
+#define SLATEPORT_TENT_TRAINER_AUSTYN   27
+#define SLATEPORT_TENT_TRAINER_DONOVAN  28
+#define SLATEPORT_TENT_TRAINER_TAMIA    29
+
+#define VERDANTURF_TENT_TRAINER_BRENNA  0
+#define VERDANTURF_TENT_TRAINER_DILAN   1
+#define VERDANTURF_TENT_TRAINER_ELIANA  2
+#define VERDANTURF_TENT_TRAINER_MARKUS  3
+#define VERDANTURF_TENT_TRAINER_CAITLYN 4
+#define VERDANTURF_TENT_TRAINER_DESIREE 5
+#define VERDANTURF_TENT_TRAINER_RONALD  6
+#define VERDANTURF_TENT_TRAINER_ASHTEN  7
+#define VERDANTURF_TENT_TRAINER_GERARD  8
+#define VERDANTURF_TENT_TRAINER_BRADLY  9
+#define VERDANTURF_TENT_TRAINER_DENNIS  10
+#define VERDANTURF_TENT_TRAINER_PRESTIN 11
+#define VERDANTURF_TENT_TRAINER_ERNESTO 12
+#define VERDANTURF_TENT_TRAINER_NALA    13
+#define VERDANTURF_TENT_TRAINER_DARNELL 14
+#define VERDANTURF_TENT_TRAINER_ASHLYN  15
+#define VERDANTURF_TENT_TRAINER_ADDISON 16
+#define VERDANTURF_TENT_TRAINER_JUSTINE 17
+#define VERDANTURF_TENT_TRAINER_TYSON   18
+#define VERDANTURF_TENT_TRAINER_LAILA   19
+#define VERDANTURF_TENT_TRAINER_WAREN   20
+#define VERDANTURF_TENT_TRAINER_TOBIAS  21
+#define VERDANTURF_TENT_TRAINER_JOSIAH  22
+#define VERDANTURF_TENT_TRAINER_DION    23
+#define VERDANTURF_TENT_TRAINER_KENZIE  24
+#define VERDANTURF_TENT_TRAINER_LILLIAN 25
+#define VERDANTURF_TENT_TRAINER_LESLEY  26
+#define VERDANTURF_TENT_TRAINER_MARQUIS 27
+#define VERDANTURF_TENT_TRAINER_FREDDY  28
+#define VERDANTURF_TENT_TRAINER_CECILIA 29
+
+#define FALLARBOR_TENT_TRAINER_AMBER    0
+#define FALLARBOR_TENT_TRAINER_JAVIER   1
+#define FALLARBOR_TENT_TRAINER_NATALIA  2
+#define FALLARBOR_TENT_TRAINER_TREVE    3
+#define FALLARBOR_TENT_TRAINER_ARIANNA  4
+#define FALLARBOR_TENT_TRAINER_JADYN    5
+#define FALLARBOR_TENT_TRAINER_GERARDO  6
+#define FALLARBOR_TENT_TRAINER_JONN     7
+#define FALLARBOR_TENT_TRAINER_ESTEBAN  8
+#define FALLARBOR_TENT_TRAINER_JAMESON  9
+#define FALLARBOR_TENT_TRAINER_ALANZO   10
+#define FALLARBOR_TENT_TRAINER_HOWARD   11
+#define FALLARBOR_TENT_TRAINER_CONRAD   12
+#define FALLARBOR_TENT_TRAINER_MAKENNA  13
+#define FALLARBOR_TENT_TRAINER_BRAYAN   14
+#define FALLARBOR_TENT_TRAINER_MARIANA  15
+#define FALLARBOR_TENT_TRAINER_SHELDON  16
+#define FALLARBOR_TENT_TRAINER_GIANNA   17
+#define FALLARBOR_TENT_TRAINER_YAHIR    18
+#define FALLARBOR_TENT_TRAINER_BRITNEY  19
+#define FALLARBOR_TENT_TRAINER_HECTER   20
+#define FALLARBOR_TENT_TRAINER_TANNOR   21
+#define FALLARBOR_TENT_TRAINER_BENJI    22
+#define FALLARBOR_TENT_TRAINER_RORY     23
+#define FALLARBOR_TENT_TRAINER_ELEANOR  24
+#define FALLARBOR_TENT_TRAINER_EVELYN   25
+#define FALLARBOR_TENT_TRAINER_ARIELLE  26
+#define FALLARBOR_TENT_TRAINER_CONNAR   27
+#define FALLARBOR_TENT_TRAINER_MAURICE  28
+#define FALLARBOR_TENT_TRAINER_KIANNA   29
+
+#define NUM_BATTLE_TENT_TRAINERS 30
+
+#endif  // GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 25b2d995d1..8e4d078fe1 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -6155,7 +6155,6 @@ int TrainerIdToDomeTournamentId(u16 trainerId)
     return i;
 }
 
-// TODO:
 static u8 sub_81953E8(u8 tournamentId, u8 round)
 {
     u8 tournamentIds[2];
diff --git a/src/battle_tent.c b/src/battle_tent.c
index 7cde528abd..b2db0e39cf 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -12,6 +12,8 @@
 #include "frontier_util.h"
 #include "string_util.h"
 #include "constants/battle_tent.h"
+#include "constants/battle_tent_trainers.h"
+#include "constants/battle_tent_mons.h"
 #include "constants/items.h"
 #include "constants/layouts.h"
 #include "constants/region_map_sections.h"
@@ -311,7 +313,7 @@ static void GenerateInitialRentalMons(void)
     while (i != PARTY_SIZE)
     {
         // Cannot have two pokemon of the same species.
-        monSetId = Random() % 70;
+        monSetId = Random() % NUM_SLATEPORT_TENT_MONS;
         for (j = firstMonId; j < firstMonId + i; j++)
         {
             u16 monId = monIds[j];
@@ -365,7 +367,7 @@ static void GenerateOpponentMons(void)
     {
         do
         {
-            trainerId = Random() % 30;
+            trainerId = Random() % NUM_BATTLE_TENT_TRAINERS;
             for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
             {
                 if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 879e5f3e34..5efd444525 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -25,6 +25,8 @@
 #include "battle_factory.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_frontier_mons.h"
+#include "constants/battle_tent_mons.h"
+#include "constants/battle_tent_trainers.h"
 #include "constants/battle_tower.h"
 #include "constants/frontier_util.h"
 #include "constants/items.h"
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index a6d59c8b7c..bf89c5bc38 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -1,515 +1,515 @@
 // Slateport Battle Tent.
 const u16 gSlateportBattleTentTrainerMons_Jolie[] = 
 {
-    9,
-    10,
-    13,
-    27,
-    35,
-    37,
-    42,
-    44,
-    45,
-    46,
-    63,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Malachi[] = 
 {
-    9,
-    16,
-    17,
-    27,
-    36,
-    39,
-    42,
-    45,
-    48,
-    49,
-    53,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SKITTY,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kelsie[] = 
 {
-    4,
-    5,
-    6,
-    11,
-    28,
-    34,
-    35,
-    37,
-    43,
-    51,
-    53,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_SKITTY,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Davon[] = 
 {
-    4,
-    5,
-    6,
-    12,
-    26,
-    36,
-    37,
-    38,
-    40,
-    44,
-    46,
-    50,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_TRAPINCH_1,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_PELIPPER_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Glenda[] = 
 {
-    0,
-    1,
-    17,
-    18,
-    19,
-    22,
-    23,
-    33,
-    42,
-    61,
-    64,
-    65,
-    66,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Helena[] = 
 {
-    18,
-    19,
-    21,
-    38,
-    39,
-    41,
-    42,
-    52,
-    54,
-    58,
-    63,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SEVIPER_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = 
 {
-    0,
-    1,
-    4,
-    5,
-    7,
-    8,
-    18,
-    20,
-    21,
-    37,
-    38,
-    40,
-    62,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Davion[] = 
 {
-    17,
-    23,
-    24,
-    25,
-    31,
-    32,
-    33,
-    34,
-    39,
-    43,
-    44,
-    49,
-    57,
-    69,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kendall[] = 
 {
-    4,
-    7,
-    8,
-    9,
-    11,
-    12,
-    13,
-    27,
-    38,
-    40,
-    45,
-    46,
-    47,
-    63,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Colten[] = 
 {
-    0,
-    2,
-    12,
-    22,
-    28,
-    30,
-    35,
-    38,
-    43,
-    44,
-    56,
-    57,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_RALTS,
+    SLATEPORT_TENT_MON_SANDSHREW,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Irvin[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    14,
-    15,
-    24,
-    25,
-    32,
-    34,
-    39,
-    59,
-    60,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Shaun[] = 
 {
-    17,
-    18,
-    19,
-    22,
-    29,
-    36,
-    42,
-    48,
-    61,
-    62,
-    66,
-    68,
-    69,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_ELECTRIKE_2,
+    SLATEPORT_TENT_MON_MACHOP,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kyler[] = 
 {
-    22,
-    23,
-    28,
-    29,
-    31,
-    32,
-    34,
-    39,
-    55,
-    64,
-    65,
-    67,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_GOLBAT_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Maggie[] = 
 {
-    10,
-    13,
-    17,
-    27,
-    45,
-    46,
-    53,
-    56,
-    61,
-    62,
-    63,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_RALTS,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Stephon[] = 
 {
-    8,
-    10,
-    16,
-    23,
-    29,
-    43,
-    44,
-    60,
-    62,
-    63,
-    68,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_ILLUMISE,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_BRELOOM,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Rebecca[] = 
 {
-    8,
-    13,
-    21,
-    29,
-    33,
-    41,
-    48,
-    54,
-    59,
-    61,
-    68,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_SEVIPER_2,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Reggie[] = 
 {
-    6,
-    7,
-    17,
-    23,
-    24,
-    26,
-    32,
-    36,
-    52,
-    53,
-    57,
-    65,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_TRAPINCH_1,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Janae[] = 
 {
-    0,
-    1,
-    27,
-    28,
-    32,
-    34,
-    36,
-    37,
-    52,
-    53,
-    57,
-    65,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Caiden[] = 
 {
-    10,
-    14,
-    15,
-    16,
-    20,
-    21,
-    25,
-    30,
-    35,
-    47,
-    48,
-    50,
-    69,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_PELIPPER_2,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kirsten[] = 
 {
-    10,
-    16,
-    18,
-    19,
-    20,
-    21,
-    25,
-    30,
-    35,
-    39,
-    41,
-    48,
-    69,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kurtis[] = 
 {
-    0,
-    1,
-    36,
-    37,
-    40,
-    46,
-    49,
-    51,
-    64,
-    67,
-    68,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_SWABLU,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Stefan[] = 
 {
-    4,
-    5,
-    21,
-    33,
-    37,
-    38,
-    40,
-    51,
-    52,
-    64,
-    65,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Avery[] = 
 {
-    2,
-    3,
-    7,
-    8,
-    22,
-    23,
-    28,
-    29,
-    30,
-    51,
-    67,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Dwane[] = 
 {
-    14,
-    15,
-    30,
-    43,
-    44,
-    45,
-    46,
-    55,
-    58,
-    59,
-    63,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_GOLBAT_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Mckenna[] = 
 {
-    27,
-    29,
-    30,
-    32,
-    36,
-    48,
-    51,
-    52,
-    53,
-    57,
-    67,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Camryn[] = 
 {
-    5,
-    6,
-    7,
-    8,
-    10,
-    16,
-    17,
-    20,
-    21,
-    37,
-    43,
-    44,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Natasha[] = 
 {
-    1,
-    3,
-    4,
-    5,
-    9,
-    11,
-    12,
-    20,
-    21,
-    22,
-    51,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Austyn[] = 
 {
-    25,
-    31,
-    35,
-    37,
-    38,
-    39,
-    50,
-    51,
-    52,
-    58,
-    68,
-    69,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_PELIPPER_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_MACHOP,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Donovan[] = 
 {
-    10,
-    16,
-    17,
-    24,
-    25,
-    43,
-    44,
-    47,
-    49,
-    53,
-    59,
-    60,
-    64,
-    65,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_ILLUMISE,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Tamia[] = 
 {
-    2,
-    6,
-    9,
-    13,
-    17,
-    19,
-    20,
-    24,
-    27,
-    29,
-    30,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
     -1
 };
 
-const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [SLATEPORT_TENT_TRAINER_JOLIE] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("JOLIE"),
         .speechBefore = {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_I, EC_WORD_BE, EC_WORD_TOMORROW, EC_WORD_QUES},
@@ -517,7 +517,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_MONDAY, EC_WORD_ELLIPSIS},
         .monSet = gSlateportBattleTentTrainerMons_Jolie
     },
-    [1] = {
+    [SLATEPORT_TENT_TRAINER_MALACHI] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("MALACHI"),
         .speechBefore = {EC_WORD_BAD, EC_WORD_NEWS, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_A, EC_MOVE(SAND_TOMB)},
@@ -525,7 +525,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SAND_TOMB), EC_WORD_ELLIPSIS},
         .monSet = gSlateportBattleTentTrainerMons_Malachi
     },
-    [2] = {
+    [SLATEPORT_TENT_TRAINER_KELSIE] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("KELSIE"),
         .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL},
@@ -533,7 +533,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL},
         .monSet = gSlateportBattleTentTrainerMons_Kelsie
     },
-    [3] = {
+    [SLATEPORT_TENT_TRAINER_DAVON] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("DAVON"),
         .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES},
@@ -541,7 +541,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_DON_T, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_IN, EC_WORD_THAT, EC_MOVE(WHIRLPOOL)},
         .monSet = gSlateportBattleTentTrainerMons_Davon
     },
-    [4] = {
+    [SLATEPORT_TENT_TRAINER_GLENDA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("GLENDA"),
         .speechBefore = {EC_WORD_CONVERSATION, EC_WORD_CAN, EC_WORD_WAIT, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN},
@@ -549,7 +549,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_SERIOUS},
         .monSet = gSlateportBattleTentTrainerMons_Glenda
     },
-    [5] = {
+    [SLATEPORT_TENT_TRAINER_HELENA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("HELENA"),
         .speechBefore = {EC_WORD_DOES, EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES},
@@ -557,7 +557,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_DO, EC_WORD_SO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_EXCL},
         .monSet = gSlateportBattleTentTrainerMons_Helena
     },
-    [6] = {
+    [SLATEPORT_TENT_TRAINER_RODOLFO] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("RODOLFO"),
         .speechBefore = {EC_WORD_GO, EC_WORD_GET, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_FOR, EC_WORD_ME},
@@ -565,7 +565,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_BADLY},
         .monSet = gSlateportBattleTentTrainerMons_Rodolfo
     },
-    [7] = {
+    [SLATEPORT_TENT_TRAINER_DAVION] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("DAVION"),
         .speechBefore = {EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL, EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL},
@@ -573,7 +573,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_URGH, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, -1, -1},
         .monSet = gSlateportBattleTentTrainerMons_Davion
     },
-    [8] = {
+    [SLATEPORT_TENT_TRAINER_KENDALL] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("KENDALL"),
         .speechBefore = {EC_WORD_A_LITTLE, EC_MOVE2(PETAL_DANCE), EC_WORD_TO, EC_WORD_PLEASE, EC_WORD_YOU, EC_WORD_EXCL},
@@ -581,7 +581,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_MOVE2(POUND), EC_WORD_ME, EC_WORD_QUES},
         .monSet = gSlateportBattleTentTrainerMons_Kendall
     },
-    [9] = {
+    [SLATEPORT_TENT_TRAINER_COLTEN] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("COLTEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_RUN, EC_WORD_AROUND},
@@ -589,7 +589,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_GOOD, EC_WORD_TOO},
         .monSet = gSlateportBattleTentTrainerMons_Colten
     },
-    [10] = {
+    [SLATEPORT_TENT_TRAINER_IRVIN] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("IRVIN"),
         .speechBefore = {EC_WORD_HAVE, EC_WORD_A, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE(CONFUSE_RAY)},
@@ -597,7 +597,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL},
         .monSet = gSlateportBattleTentTrainerMons_Irvin
     },
-    [11] = {
+    [SLATEPORT_TENT_TRAINER_SHAUN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("SHAUN"),
         .speechBefore = {EC_WORD_LISTEN, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_GOOD},
@@ -605,7 +605,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_YES, EC_WORD_YES, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SOMETHING},
         .monSet = gSlateportBattleTentTrainerMons_Shaun
     },
-    [12] = {
+    [SLATEPORT_TENT_TRAINER_KYLER] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("KYLER"),
         .speechBefore = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_QUES},
@@ -613,7 +613,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_WOW},
         .monSet = gSlateportBattleTentTrainerMons_Kyler
     },
-    [13] = {
+    [SLATEPORT_TENT_TRAINER_MAGGIE] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MAGGIE"),
         .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON2(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS},
@@ -621,7 +621,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON2(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH},
         .monSet = gSlateportBattleTentTrainerMons_Maggie
     },
-    [14] = {
+    [SLATEPORT_TENT_TRAINER_STEPHON] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("STEPHON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_AN, EC_WORD_EGG},
@@ -629,7 +629,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_AWFUL, EC_WORD_EXCL_EXCL, -1, EC_WORD_JUST, EC_WORD_AWFUL, EC_WORD_EXCL_EXCL},
         .monSet = gSlateportBattleTentTrainerMons_Stephon
     },
-    [15] = {
+    [SLATEPORT_TENT_TRAINER_REBECCA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("REBECCA"),
         .speechBefore = {EC_WORD_THAT, EC_WORD_EGG, EC_WORD_HAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SHINE},
@@ -637,7 +637,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_STOP, EC_WORD_ELLIPSIS},
         .monSet = gSlateportBattleTentTrainerMons_Rebecca
     },
-    [16] = {
+    [SLATEPORT_TENT_TRAINER_REGGIE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("REGGIE"),
         .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY},
@@ -645,7 +645,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_THICK, EC_WORD_ELLIPSIS},
         .monSet = gSlateportBattleTentTrainerMons_Reggie
     },
-    [17] = {
+    [SLATEPORT_TENT_TRAINER_JANAE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JANAE"),
         .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK},
@@ -653,7 +653,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_TRAINER},
         .monSet = gSlateportBattleTentTrainerMons_Janae
     },
-    [18] = {
+    [SLATEPORT_TENT_TRAINER_CAIDEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("CAIDEN"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_BREAK, EC_WORD_YOUR, EC_WORD_SPIRIT},
@@ -661,7 +661,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_LAST, EC_WORD_FOREVER, -1},
         .monSet = gSlateportBattleTentTrainerMons_Caiden
     },
-    [19] = {
+    [SLATEPORT_TENT_TRAINER_KIRSTEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("KIRSTEN"),
         .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES},
@@ -669,7 +669,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_TO, EC_WORD_YOUR, EC_MOVE(STRENGTH)},
         .monSet = gSlateportBattleTentTrainerMons_Kirsten
     },
-    [20] = {
+    [SLATEPORT_TENT_TRAINER_KURTIS] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("KURTIS"),
         .speechBefore = {EC_WORD_SORRY, EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_MOVE2(BEAT_UP)},
@@ -677,7 +677,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_I, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_QUES},
         .monSet = gSlateportBattleTentTrainerMons_Kurtis
     },
-    [21] = {
+    [SLATEPORT_TENT_TRAINER_STEFAN] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("STEFAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_WANT, EC_WORD_CUTE, EC_WORD_POKEMON, -1},
@@ -685,7 +685,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_ELLIPSIS, -1},
         .monSet = gSlateportBattleTentTrainerMons_Stefan
     },
-    [22] = {
+    [SLATEPORT_TENT_TRAINER_AVERY] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("AVERY"),
         .speechBefore = {EC_WORD_TOYS, EC_WORD_EXCL, EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_TOYS},
@@ -693,7 +693,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_MONEY},
         .monSet = gSlateportBattleTentTrainerMons_Avery
     },
-    [23] = {
+    [SLATEPORT_TENT_TRAINER_DWANE] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("DWANE"),
         .speechBefore = {EC_WORD_MMM, EC_WORD_TASTY, EC_WORD_ELLIPSIS, EC_WORD_WONDER, EC_WORD_WHAT, EC_WORD_QUES},
@@ -701,7 +701,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_OH_YEAH, EC_WORD_THIS_IS_IT_EXCL, -1},
         .monSet = gSlateportBattleTentTrainerMons_Dwane
     },
-    [24] = {
+    [SLATEPORT_TENT_TRAINER_MCKENNA] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("MCKENNA"),
         .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SMALL, EC_WORD_TALK, EC_WORD_LET_S, EC_WORD_GO},
@@ -709,7 +709,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_KTHX_BYE, -1, -1, -1, -1, -1},
         .monSet = gSlateportBattleTentTrainerMons_Mckenna
     },
-    [25] = {
+    [SLATEPORT_TENT_TRAINER_CAMRYN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("CAMRYN"),
         .speechBefore = {EC_WORD_MR, EC_WORD_JUDGE, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_OUR, EC_WORD_TRUST},
@@ -717,7 +717,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_MY, EC_WORD_IDOL, EC_WORD_DREAM},
         .monSet = gSlateportBattleTentTrainerMons_Camryn
     },
-    [26] = {
+    [SLATEPORT_TENT_TRAINER_NATASHA] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("NATASHA"),
         .speechBefore = {EC_WORD_COME_OVER, EC_WORD_TO, EC_WORD_MY, EC_WORD_PLACE, EC_WORD_OK_QUES, -1},
@@ -725,7 +725,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_AWW, EC_WORD_WON_T, EC_WORD_YOU, EC_WORD_COME_OVER, EC_WORD_QUES, -1},
         .monSet = gSlateportBattleTentTrainerMons_Natasha
     },
-    [27] = {
+    [SLATEPORT_TENT_TRAINER_AUSTYN] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("AUSTYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_CARE, EC_WORD_HOW, EC_WORD_WE, EC_WORD_MATCH_UP},
@@ -733,7 +733,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MY, EC_WORD_LESSONS},
         .monSet = gSlateportBattleTentTrainerMons_Austyn
     },
-    [28] = {
+    [SLATEPORT_TENT_TRAINER_DONOVAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("DONOVAN"),
         .speechBefore = {EC_WORD_OH, EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SLIMY, EC_WORD_ALL, EC_WORD_OVER},
@@ -741,7 +741,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
         .speechLose = {EC_WORD_I_AM, EC_WORD_NATURALLY, EC_WORD_SLIMY, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
         .monSet = gSlateportBattleTentTrainerMons_Donovan
     },
-    [29] = {
+    [SLATEPORT_TENT_TRAINER_TAMIA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("TAMIA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_ELLIPSIS},
@@ -751,492 +751,492 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] =
     }
 };
 
-const struct FacilityMon gSlateportBattleTentMons[] = 
+const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] = 
 {
-    [0] = {
+    [SLATEPORT_TENT_MON_ZIGZAGOON_1] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [1] = {
+    [SLATEPORT_TENT_MON_ZIGZAGOON_2] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [2] = {
+    [SLATEPORT_TENT_MON_BEAUTIFLY] = {
         .species = SPECIES_BEAUTIFLY,
         .moves = {MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [SLATEPORT_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST},
         .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [4] = {
+    [SLATEPORT_TENT_MON_WAILMER_1] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [5] = {
+    [SLATEPORT_TENT_MON_WAILMER_2] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [6] = {
+    [SLATEPORT_TENT_MON_MARILL_1] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [7] = {
+    [SLATEPORT_TENT_MON_WINGULL_1] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [8] = {
+    [SLATEPORT_TENT_MON_PELIPPER_1] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [9] = {
+    [SLATEPORT_TENT_MON_CACNEA_1] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_JOLLY
     },
-    [10] = {
+    [SLATEPORT_TENT_MON_LOMBRE_1] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB},
         .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [11] = {
+    [SLATEPORT_TENT_MON_LOTAD] = {
         .species = SPECIES_LOTAD,
         .moves = {MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [12] = {
+    [SLATEPORT_TENT_MON_SEEDOT] = {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [13] = {
+    [SLATEPORT_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [14] = {
+    [SLATEPORT_TENT_MON_NINJASK_1] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [15] = {
+    [SLATEPORT_TENT_MON_NINJASK_2] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [16] = {
+    [SLATEPORT_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [17] = {
+    [SLATEPORT_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [18] = {
+    [SLATEPORT_TENT_MON_MIGHTYENA_1] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [19] = {
+    [SLATEPORT_TENT_MON_MIGHTYENA_2] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [20] = {
+    [SLATEPORT_TENT_MON_LINOONE] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [21] = {
+    [SLATEPORT_TENT_MON_GOLDEEN] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CALM
     },
-    [22] = {
+    [SLATEPORT_TENT_MON_ELECTRIKE_1] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [23] = {
+    [SLATEPORT_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_MILD
     },
-    [24] = {
+    [SLATEPORT_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [25] = {
+    [SLATEPORT_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [26] = {
+    [SLATEPORT_TENT_MON_TRAPINCH_1] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [27] = {
+    [SLATEPORT_TENT_MON_CACNEA_2] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [28] = {
+    [SLATEPORT_TENT_MON_TAILLOW] = {
         .species = SPECIES_TAILLOW,
         .moves = {MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [29] = {
+    [SLATEPORT_TENT_MON_SWELLOW] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [30] = {
+    [SLATEPORT_TENT_MON_GOLBAT_1] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SPELL_TAG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_TIMID
     },
-    [31] = {
+    [SLATEPORT_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [32] = {
+    [SLATEPORT_TENT_MON_SPINDA] = {
         .species = SPECIES_SPINDA,
         .moves = {MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [33] = {
+    [SLATEPORT_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_SERIOUS
     },
-    [34] = {
+    [SLATEPORT_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [35] = {
+    [SLATEPORT_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [36] = {
+    [SLATEPORT_TENT_MON_NUMEL_1] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [37] = {
+    [SLATEPORT_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [38] = {
+    [SLATEPORT_TENT_MON_TENTACOOL] = {
         .species = SPECIES_TENTACOOL,
         .moves = {MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [39] = {
+    [SLATEPORT_TENT_MON_VIGOROTH] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_AGUAV_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [40] = {
+    [SLATEPORT_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [41] = {
+    [SLATEPORT_TENT_MON_SEVIPER_1] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [42] = {
+    [SLATEPORT_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [43] = {
+    [SLATEPORT_TENT_MON_KECLEON_1] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [44] = {
+    [SLATEPORT_TENT_MON_KECLEON_2] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [45] = {
+    [SLATEPORT_TENT_MON_SHROOMISH_1] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [46] = {
+    [SLATEPORT_TENT_MON_SHROOMISH_2] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK,
         .nature = NATURE_BRAVE
     },
-    [47] = {
+    [SLATEPORT_TENT_MON_LOMBRE_2] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [48] = {
+    [SLATEPORT_TENT_MON_NUMEL_2] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [49] = {
+    [SLATEPORT_TENT_MON_TRAPINCH_2] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [50] = {
+    [SLATEPORT_TENT_MON_PELIPPER_2] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [51] = {
+    [SLATEPORT_TENT_MON_WINGULL_2] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [52] = {
+    [SLATEPORT_TENT_MON_MARILL_2] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [53] = {
+    [SLATEPORT_TENT_MON_SKITTY] = {
         .species = SPECIES_SKITTY,
         .moves = {MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [54] = {
+    [SLATEPORT_TENT_MON_SEVIPER_2] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BRAVE
     },
-    [55] = {
+    [SLATEPORT_TENT_MON_GOLBAT_2] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [56] = {
+    [SLATEPORT_TENT_MON_RALTS] = {
         .species = SPECIES_RALTS,
         .moves = {MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [57] = {
+    [SLATEPORT_TENT_MON_SANDSHREW] = {
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = 0,
         .nature = NATURE_HARDY
     },
-    [58] = {
+    [SLATEPORT_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [59] = {
+    [SLATEPORT_TENT_MON_VOLBEAT] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [60] = {
+    [SLATEPORT_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [61] = {
+    [SLATEPORT_TENT_MON_KADABRA] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [62] = {
+    [SLATEPORT_TENT_MON_KIRLIA] = {
         .species = SPECIES_KIRLIA,
         .moves = {MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [63] = {
+    [SLATEPORT_TENT_MON_BRELOOM] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [64] = {
+    [SLATEPORT_TENT_MON_PLUSLE_1] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [65] = {
+    [SLATEPORT_TENT_MON_PLUSLE_2] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [66] = {
+    [SLATEPORT_TENT_MON_ELECTRIKE_2] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_APICOT_BERRY,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [67] = {
+    [SLATEPORT_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [68] = {
+    [SLATEPORT_TENT_MON_MACHOP] = {
         .species = SPECIES_MACHOP,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [69] = {
+    [SLATEPORT_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
@@ -1248,321 +1248,321 @@ const struct FacilityMon gSlateportBattleTentMons[] =
 // Verdanturf Battle Tent.
 const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = 
 {
-    4,
-    11,
-    13,
-    18,
-    26,
+    VERDANTURF_TENT_MON_SHROOMISH,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = 
 {
-    30,
-    37,
-    13,
-    29,
-    42,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = 
 {
-    6,
-    7,
-    17,
-    18,
-    40,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Markus[] = 
 {
-    6,
-    7,
-    18,
-    24,
-    38,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_TENTACOOL,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = 
 {
-    0,
-    12,
-    25,
-    28,
-    22,
-    44,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = 
 {
-    8,
-    12,
-    21,
-    22,
-    31,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_KADABRA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = 
 {
-    1,
-    20,
-    23,
-    25,
-    32,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_LINOONE,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_VOLTORB,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = 
 {
-    9,
-    12,
-    27,
-    37,
-    43,
+    VERDANTURF_TENT_MON_ARON_1,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_ARON_2,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = 
 {
-    36,
-    7,
-    34,
-    6,
-    40,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = 
 {
-    26,
-    3,
-    0,
-    2,
-    17,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_TAILLOW,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = 
 {
-    14,
-    37,
-    2,
-    38,
-    27,
+    VERDANTURF_TENT_MON_NINJASK,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_ARON_2,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = 
 {
-    31,
-    28,
-    22,
-    25,
-    44,
-    43,
-    41,
+    VERDANTURF_TENT_MON_KADABRA,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_CACNEA,
+    VERDANTURF_TENT_MON_WHISMUR,
+    VERDANTURF_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = 
 {
-    33,
-    32,
-    25,
-    35,
-    34,
+    VERDANTURF_TENT_MON_MAGNEMITE,
+    VERDANTURF_TENT_MON_VOLTORB,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_LOUDRED,
+    VERDANTURF_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Nala[] = 
 {
-    1,
-    4,
-    8,
-    11,
-    17,
-    40,
-    34,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SHROOMISH,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_WAILMER,
+    VERDANTURF_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = 
 {
-    0,
-    29,
-    35,
-    37,
-    39,
-    43,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_LOUDRED,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = 
 {
-    29,
-    36,
-    32,
-    30,
-    17,
-    6,
-    44,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_VOLTORB,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Addison[] = 
 {
-    0,
-    1,
-    16,
-    31,
-    6,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_KADABRA,
+    VERDANTURF_TENT_MON_MAGIKARP,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Justine[] = 
 {
-    0,
-    1,
-    16,
-    36,
-    18,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_LOTAD,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = 
 {
-    5,
-    15,
-    22,
-    30,
-    16,
-    39,
-    43,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Laila[] = 
 {
-    5,
-    15,
-    19,
-    24,
-    41,
-    43,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_NUMEL_2,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_ILLUMISE,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Waren[] = 
 {
-    0,
-    9,
-    10,
-    11,
-    23,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ARON_1,
+    VERDANTURF_TENT_MON_NUMEL_1,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_SWELLOW,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = 
 {
-    6,
-    7,
-    24,
-    38,
-    40,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = 
 {
-    8,
-    16,
-    23,
-    34,
-    3,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_TAILLOW,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dion[] = 
 {
-    14,
-    2,
-    11,
-    39,
-    21,
-    38,
+    VERDANTURF_TENT_MON_NINJASK,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_TENTACOOL,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = 
 {
-    18,
-    10,
-    16,
-    26,
-    25,
-    27,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_NUMEL_1,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_ARON_2,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = 
 {
-    24,
-    34,
-    36,
-    38,
-    5,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = 
 {
-    26,
-    0,
-    18,
-    13,
-    25,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_ELECTRIKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = 
 {
-    24,
-    34,
-    5,
-    15,
-    7,
-    42,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = 
 {
-    18,
-    21,
-    26,
-    29,
-    41,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = 
 {
-    23,
-    26,
-    27,
-    28,
-    31,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_ARON_2,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_KADABRA,
     -1
 };
 
-const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [VERDANTURF_TENT_TRAINER_BRENNA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("BRENNA"),
         .speechBefore = {EC_WORD_NO, EC_WORD_DAYS, EC_WORD_GO, EC_WORD_WITHOUT, EC_WORD_MY, EC_MOVE(FAKE_TEARS)},
@@ -1570,7 +1570,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_ALL, EC_WORD_I, EC_WORD_EVER, EC_WORD_GET, EC_WORD_IS, EC_MOVE(TORMENT)},
         .monSet = gVerdanturfBattleTentTrainerMons_Brenna
     },
-    [1] = {
+    [VERDANTURF_TENT_TRAINER_DILAN] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("DILAN"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_BORED, EC_WORD_I_AM},
@@ -1578,7 +1578,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_EXCITING, EC_WORD_EXCL_EXCL, EC_WORD_BYE_BYE, EC_WORD_TO, EC_WORD_BEING, EC_WORD_BORED},
         .monSet = gVerdanturfBattleTentTrainerMons_Dilan
     },
-    [2] = {
+    [VERDANTURF_TENT_TRAINER_ELIANA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("ELIANA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON},
@@ -1586,7 +1586,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_NO, EC_WORD_SLEEP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_GET, EC_WORD_HOME},
         .monSet = gVerdanturfBattleTentTrainerMons_Eliana
     },
-    [3] = {
+    [VERDANTURF_TENT_TRAINER_MARKUS] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("MARKUS"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)},
@@ -1594,7 +1594,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_TIME, EC_WORD_TO, EC_MOVE(SELF_DESTRUCT)},
         .monSet = gVerdanturfBattleTentTrainerMons_Markus
     },
-    [4] = {
+    [VERDANTURF_TENT_TRAINER_CAITLYN] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("CAITLYN"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_OF, EC_WORD_BEING, EC_WORD_AN, EC_WORD_IDOL},
@@ -1602,7 +1602,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, EC_WORD_AT, EC_WORD_ALL},
         .monSet = gVerdanturfBattleTentTrainerMons_Caitlyn
     },
-    [5] = {
+    [VERDANTURF_TENT_TRAINER_DESIREE] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("DESIREE"),
         .speechBefore = {EC_WORD_DOESN_T, EC_WORD_MY, EC_WORD_BEAUTY, EC_MOVE(ASTONISH), EC_WORD_YOU, EC_WORD_QUES},
@@ -1610,7 +1610,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_DID, EC_WORD_NOTHING, EC_WORD_FOR, EC_WORD_YOU},
         .monSet = gVerdanturfBattleTentTrainerMons_Desiree
     },
-    [6] = {
+    [VERDANTURF_TENT_TRAINER_RONALD] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("RONALD"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_WILL, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1},
@@ -1618,7 +1618,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE2(BATON_PASS)},
         .monSet = gVerdanturfBattleTentTrainerMons_Ronald
     },
-    [7] = {
+    [VERDANTURF_TENT_TRAINER_ASHTEN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("ASHTEN"),
         .speechBefore = {EC_WORD_OH_YEAH, EC_WORD_ANOTHER, EC_WORD_EXCITING, EC_WORD_BATTLE, EC_WORD_EXCL, -1},
@@ -1626,7 +1626,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_LOSS, EC_WORD_WOW, EC_WORD_EXCL},
         .monSet = gVerdanturfBattleTentTrainerMons_Ashten
     },
-    [8] = {
+    [VERDANTURF_TENT_TRAINER_GERARD] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("GERARD"),
         .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_SUPER, EC_MOVE2(TEETER_DANCE), EC_WORD_EXCL},
@@ -1634,7 +1634,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGIVE, EC_WORD_YOU, EC_WORD_FOR, EC_WORD_THAT},
         .monSet = gVerdanturfBattleTentTrainerMons_Gerard
     },
-    [9] = {
+    [VERDANTURF_TENT_TRAINER_BRADLY] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("BRADLY"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_LONESOME, EC_WORD_BUT, EC_WORD_I, EC_WORD_VACATION, EC_WORD_ALONE},
@@ -1642,7 +1642,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_OH, EC_WORD_ELLIPSIS, -1, EC_WORD_ALONE, EC_WORD_AS, EC_WORD_ALWAYS},
         .monSet = gVerdanturfBattleTentTrainerMons_Bradly
     },
-    [10] = {
+    [VERDANTURF_TENT_TRAINER_DENNIS] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("DENNIS"),
         .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_STRONG, EC_WORD_QUES, -1},
@@ -1650,7 +1650,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_NICE, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WAS, EC_WORD_CHILD_S_PLAY},
         .monSet = gVerdanturfBattleTentTrainerMons_Dennis
     },
-    [11] = {
+    [VERDANTURF_TENT_TRAINER_PRESTIN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("PRESTIN"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_FOR, EC_WORD_YOU},
@@ -1658,7 +1658,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_WAKE_UP, EC_WORD_FROM, EC_WORD_THIS},
         .monSet = gVerdanturfBattleTentTrainerMons_Prestin
     },
-    [12] = {
+    [VERDANTURF_TENT_TRAINER_ERNESTO] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("ERNESTO"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_PARTY, EC_WORD_GOES, EC_WORD_ON, EC_WORD_FOREVER, EC_WORD_EXCL},
@@ -1666,7 +1666,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_CAN_T, EC_WORD_STOP},
         .monSet = gVerdanturfBattleTentTrainerMons_Ernesto
     },
-    [13] = {
+    [VERDANTURF_TENT_TRAINER_NALA] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("NALA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_THE, EC_WORD_WORLD, EC_WORD_MOVIE, EC_WORD_COLLECTION},
@@ -1674,7 +1674,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_EXCL},
         .monSet = gVerdanturfBattleTentTrainerMons_Nala
     },
-    [14] = {
+    [VERDANTURF_TENT_TRAINER_DARNELL] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("DARNELL"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO_EASY, EC_WORD_ON, EC_WORD_YOU, -1},
@@ -1682,7 +1682,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE, EC_WORD_ELLIPSIS},
         .monSet = gVerdanturfBattleTentTrainerMons_Darnell
     },
-    [15] = {
+    [VERDANTURF_TENT_TRAINER_ASHLYN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("ASHLYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_LOOK, EC_WORD_TOUGH, EC_WORD_DO, EC_WORD_I, EC_WORD_QUES},
@@ -1690,7 +1690,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL_EXCL, -1, -1, -1},
         .monSet = gVerdanturfBattleTentTrainerMons_Ashlyn
     },
-    [16] = {
+    [VERDANTURF_TENT_TRAINER_ADDISON] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("ADDISON"),
         .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL},
@@ -1698,7 +1698,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_BUT, EC_WORD_WHY, EC_WORD_QUES},
         .monSet = gVerdanturfBattleTentTrainerMons_Addison
     },
-    [17] = {
+    [VERDANTURF_TENT_TRAINER_JUSTINE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JUSTINE"),
         .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY},
@@ -1706,7 +1706,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL_EXCL, -1, -1, -1, -1},
         .monSet = gVerdanturfBattleTentTrainerMons_Justine
     },
-    [18] = {
+    [VERDANTURF_TENT_TRAINER_TYSON] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("TYSON"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_PRESSURE, EC_WORD_ME, EC_WORD_QUES},
@@ -1714,7 +1714,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_THIS, EC_WORD_DOESN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY, EC_WORD_EXCL},
         .monSet = gVerdanturfBattleTentTrainerMons_Tyson
     },
-    [19] = {
+    [VERDANTURF_TENT_TRAINER_LAILA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("LAILA"),
         .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1},
@@ -1722,7 +1722,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_YOU, EC_WORD_WON},
         .monSet = gVerdanturfBattleTentTrainerMons_Laila
     },
-    [20] = {
+    [VERDANTURF_TENT_TRAINER_WAREN] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("WAREN"),
         .speechBefore = {EC_WORD_DANGER, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SENSE, EC_WORD_DANGER},
@@ -1730,7 +1730,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DID, EC_WORD_SENSE, EC_WORD_DANGER, EC_WORD_ELLIPSIS},
         .monSet = gVerdanturfBattleTentTrainerMons_Waren
     },
-    [21] = {
+    [VERDANTURF_TENT_TRAINER_TOBIAS] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TOBIAS"),
         .speechBefore = {EC_MOVE2(BARRIER), EC_WORD_EXCL_EXCL, -1, EC_WORD_NOW, EC_WORD_COME_ON, EC_WORD_EXCL},
@@ -1738,7 +1738,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_KNOW, EC_WORD_THAT, EC_WORD_IT_S, EC_WORD_HOPELESS},
         .monSet = gVerdanturfBattleTentTrainerMons_Tobias
     },
-    [22] = {
+    [VERDANTURF_TENT_TRAINER_JOSIAH] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("JOSIAH"),
         .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_IF_I_LOSE, -1},
@@ -1746,7 +1746,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_SOMETIME, EC_WORD_SOON},
         .monSet = gVerdanturfBattleTentTrainerMons_Josiah
     },
-    [23] = {
+    [VERDANTURF_TENT_TRAINER_DION] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("DION"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_TRENDY, EC_WORD_UM, EC_WORD_BATTLE, EC_WORD_SOMETHING, -1},
@@ -1754,7 +1754,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_GOURMET, EC_WORD_QUES},
         .monSet = gVerdanturfBattleTentTrainerMons_Dion
     },
-    [24] = {
+    [VERDANTURF_TENT_TRAINER_KENZIE] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("KENZIE"),
         .speechBefore = {EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_GIVES, EC_WORD_ME, EC_MOVE(STRENGTH), -1},
@@ -1762,7 +1762,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TERRIBLE, EC_MOVE(SANDSTORM), EC_WORD_ELLIPSIS},
         .monSet = gVerdanturfBattleTentTrainerMons_Kenzie
     },
-    [25] = {
+    [VERDANTURF_TENT_TRAINER_LILLIAN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("LILLIAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_WORD_MY, EC_WORD_OWN_TEMPO},
@@ -1770,7 +1770,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_AWW, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_NAP},
         .monSet = gVerdanturfBattleTentTrainerMons_Lillian
     },
-    [26] = {
+    [VERDANTURF_TENT_TRAINER_LESLEY] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("LESLEY"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_LOLLING, EC_WORD_ABOUT},
@@ -1778,7 +1778,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_EXCL},
         .monSet = gVerdanturfBattleTentTrainerMons_Lesley
     },
-    [27] = {
+    [VERDANTURF_TENT_TRAINER_MARQUIS] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("MARQUIS"),
         .speechBefore = {EC_WORD_NONE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_SENSE},
@@ -1786,7 +1786,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_QUES},
         .monSet = gVerdanturfBattleTentTrainerMons_Marquis
     },
-    [28] = {
+    [VERDANTURF_TENT_TRAINER_FREDDY] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("FREDDY"),
         .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_THIS, EC_WORD_CUTE, EC_WORD_TELEVISION, EC_WORD_IDOL},
@@ -1794,7 +1794,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
         .speechLose = {EC_WORD_LATE, EC_WORD_NIGHT, EC_WORD_TELEVISION, EC_WORD_IS, EC_WORD_MY, EC_WORD_LIFE},
         .monSet = gVerdanturfBattleTentTrainerMons_Freddy
     },
-    [29] = {
+    [VERDANTURF_TENT_TRAINER_CECILIA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("CECILIA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_CUTENESS, EC_WORD_IS, EC_WORD_IN, EC_WORD_FASHION},
@@ -1804,317 +1804,317 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] =
     }
 };
 
-const struct FacilityMon gVerdanturfBattleTentMons[] = 
+const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] = 
 {
-    [0] = {
+    [VERDANTURF_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
         .moves = {MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [1] = {
+    [VERDANTURF_TENT_MON_ZIGZAGOON] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [2] = {
+    [VERDANTURF_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [VERDANTURF_TENT_MON_TAILLOW] = {
         .species = SPECIES_TAILLOW,
         .moves = {MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [4] = {
+    [VERDANTURF_TENT_MON_SHROOMISH] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [5] = {
+    [VERDANTURF_TENT_MON_MACHOP] = {
         .species = SPECIES_MACHOP,
         .moves = {MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [6] = {
+    [VERDANTURF_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [7] = {
+    [VERDANTURF_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_HASTY
     },
-    [8] = {
+    [VERDANTURF_TENT_MON_WINGULL] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [9] = {
+    [VERDANTURF_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [10] = {
+    [VERDANTURF_TENT_MON_NUMEL_1] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SASSY
     },
-    [11] = {
+    [VERDANTURF_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [12] = {
+    [VERDANTURF_TENT_MON_KECLEON] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIET
     },
-    [13] = {
+    [VERDANTURF_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [14] = {
+    [VERDANTURF_TENT_MON_NINJASK] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [15] = {
+    [VERDANTURF_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [16] = {
+    [VERDANTURF_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MILD
     },
-    [17] = {
+    [VERDANTURF_TENT_MON_GOLDEEN_1] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_GENTLE
     },
-    [18] = {
+    [VERDANTURF_TENT_MON_LOTAD] = {
         .species = SPECIES_LOTAD,
         .moves = {MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [19] = {
+    [VERDANTURF_TENT_MON_NUMEL_2] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_RELAXED
     },
-    [20] = {
+    [VERDANTURF_TENT_MON_LINOONE] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [21] = {
+    [VERDANTURF_TENT_MON_SEVIPER] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [22] = {
+    [VERDANTURF_TENT_MON_SKARMORY] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_MACHO_BRACE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [23] = {
+    [VERDANTURF_TENT_MON_SWELLOW] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [24] = {
+    [VERDANTURF_TENT_MON_GOLDEEN_2] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [25] = {
+    [VERDANTURF_TENT_MON_ELECTRIKE] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [26] = {
+    [VERDANTURF_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [27] = {
+    [VERDANTURF_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [28] = {
+    [VERDANTURF_TENT_MON_MIGHTYENA] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [29] = {
+    [VERDANTURF_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [30] = {
+    [VERDANTURF_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [31] = {
+    [VERDANTURF_TENT_MON_KADABRA] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [32] = {
+    [VERDANTURF_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [33] = {
+    [VERDANTURF_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [34] = {
+    [VERDANTURF_TENT_MON_PELIPPER] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY,
         .evSpread = 0,
         .nature = NATURE_BRAVE
     },
-    [35] = {
+    [VERDANTURF_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [36] = {
+    [VERDANTURF_TENT_MON_MARILL] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [37] = {
+    [VERDANTURF_TENT_MON_TRAPINCH] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [38] = {
+    [VERDANTURF_TENT_MON_TENTACOOL] = {
         .species = SPECIES_TENTACOOL,
         .moves = {MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [39] = {
+    [VERDANTURF_TENT_MON_VIGOROTH] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [40] = {
+    [VERDANTURF_TENT_MON_WAILMER] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [41] = {
+    [VERDANTURF_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [42] = {
+    [VERDANTURF_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_CALM
     },
-    [43] = {
+    [VERDANTURF_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [44] = {
+    [VERDANTURF_TENT_MON_CACNEA] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
@@ -2126,324 +2126,324 @@ const struct FacilityMon gVerdanturfBattleTentMons[] =
 // Fallarbor Battle Tent.
 const u16 gFallarborBattleTentTrainerMons_Amber[] = 
 {
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
+    FALLARBOR_TENT_MON_SWALOT,
+    FALLARBOR_TENT_MON_SHROOMISH,
+    FALLARBOR_TENT_MON_KIRLIA,
+    FALLARBOR_TENT_MON_LOMBRE,
+    FALLARBOR_TENT_MON_NUZLEAF,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Javier[] = 
 {
-    6,
-    35,
-    36,
-    37,
-    38,
-    44,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_TRAPINCH,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_GRAVELER,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Natalie[] = 
 {
-    5,
-    29,
-    30,
-    32,
-    34,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Treve[] = 
 {
-    28,
-    29,
-    30,
-    32,
-    33,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Arianna[] = 
 {
-    18,
-    23,
-    24,
-    27,
-    44,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jadyn[] = 
 {
-    0,
-    22,
-    24,
-    27,
-    32,
-    39,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Gerardo[] = 
 {
-    6,
-    18,
-    23,
-    24,
-    29,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jonn[] = 
 {
-    16,
-    17,
-    21,
-    22,
-    37,
+    FALLARBOR_TENT_MON_ARON_1,
+    FALLARBOR_TENT_MON_ARON_2,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Esteban[] = 
 {
-    5,
-    28,
-    30,
-    33,
-    42,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_LOMBRE,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jameson[] = 
 {
-    1,
-    2,
-    3,
-    5,
-    9,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_NINCADA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Alanzo[] = 
 {
-    9,
-    10,
-    11,
-    12,
-    13,
-    14,
-    15,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_BEAUTIFLY,
+    FALLARBOR_TENT_MON_DUSTOX,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_VOLBEAT,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_NINJASK_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Howard[] = 
 {
-    18,
-    23,
-    31,
-    38,
-    43,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Conrad[] = 
 {
-    18,
-    19,
-    20,
-    21,
-    22,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_VOLTORB,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_LOUDRED,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Makenna[] = 
 {
-    4,
-    21,
-    25,
-    36,
-    40,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_SWABLU,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_SHROOMISH,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Brayan[] = 
 {
-    0,
-    4,
-    6,
-    12,
-    19,
-    23,
-    28,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WINGULL,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Mariana[] = 
 {
-    0,
-    4,
-    13,
-    19,
-    28,
-    30,
-    37,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_VOLBEAT,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Sheldon[] = 
 {
-    2,
-    3,
-    21,
-    31,
-    39,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Gianna[] = 
 {
-    1,
-    2,
-    30,
-    32,
-    41,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Yahir[] = 
 {
-    4,
-    8,
-    15,
-    17,
-    22,
-    24,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MACHOKE,
+    FALLARBOR_TENT_MON_NINJASK_2,
+    FALLARBOR_TENT_MON_ARON_2,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Britney[] = 
 {
-    4,
-    7,
-    14,
-    20,
-    23,
-    43,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MAKUHITA,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_VOLTORB,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Hecter[] = 
 {
-    0,
-    1,
-    2,
-    5,
-    9,
-    35,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_TRAPINCH,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Tannor[] = 
 {
-    5,
-    30,
-    31,
-    33,
-    34,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Benji[] = 
 {
-    25,
-    26,
-    27,
-    28,
-    29,
+    FALLARBOR_TENT_MON_SWABLU,
+    FALLARBOR_TENT_MON_SKARMORY,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Rory[] = 
 {
-    9,
-    11,
-    14,
-    15,
-    27,
-    39,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_DUSTOX,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_NINJASK_2,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Eleanor[] = 
 {
-    23,
-    28,
-    31,
-    36,
-    38,
-    42,
-    44,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_LOMBRE,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Evelyn[] = 
 {
-    29,
-    31,
-    32,
-    33,
-    34,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Arielle[] = 
 {
-    1,
-    3,
-    38,
-    39,
-    41,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_SWALOT,
+    FALLARBOR_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Connar[] = 
 {
-    7,
-    8,
-    28,
-    29,
-    31,
-    32,
+    FALLARBOR_TENT_MON_MAKUHITA,
+    FALLARBOR_TENT_MON_MACHOKE,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_MARILL,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Maurice[] = 
 {
-    4,
-    5,
-    6,
-    12,
-    13,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_VOLBEAT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Kianna[] = 
 {
-    22,
-    24,
-    26,
-    27,
-    34,
-    37,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_SKARMORY,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
-const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [FALLARBOR_TENT_TRAINER_AMBER] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("AMBER"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DIET, EC_WORD_EVERY, EC_WORD_DAY},
@@ -2451,7 +2451,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_LOSE},
         .monSet = gFallarborBattleTentTrainerMons_Amber
     },
-    [1] = {
+    [FALLARBOR_TENT_TRAINER_JAVIER] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("JAVIER"),
         .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_EVER, EC_WORD_HAVE, EC_WORD_ENOUGH, EC_WORD_MONEY},
@@ -2459,7 +2459,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY, EC_WORD_FOR, EC_WORD_A, EC_WORD_BIKE},
         .monSet = gFallarborBattleTentTrainerMons_Javier
     },
-    [2] = {
+    [FALLARBOR_TENT_TRAINER_NATALIA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("NATALIE"),
         .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD},
@@ -2467,7 +2467,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_GIVE_ME, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH, EC_WORD_NEXT, EC_WORD_TIME},
         .monSet = gFallarborBattleTentTrainerMons_Natalie
     },
-    [3] = {
+    [FALLARBOR_TENT_TRAINER_TREVE] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("TREVE"),
         .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP},
@@ -2475,7 +2475,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_ELLIPSIS, -1},
         .monSet = gFallarborBattleTentTrainerMons_Treve
     },
-    [4] = {
+    [FALLARBOR_TENT_TRAINER_ARIANNA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ARIANNA"),
         .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_GIVE_ME, EC_WORD_POKEMON, EC_WORD_FOR, EC_WORD_MY, EC_WORD_COLLECTION},
@@ -2483,7 +2483,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ELLIPSIS},
         .monSet = gFallarborBattleTentTrainerMons_Arianna
     },
-    [5] = {
+    [FALLARBOR_TENT_TRAINER_JADYN] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("JADYN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_A, EC_WORD_MYSTERY},
@@ -2491,7 +2491,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_YOUR, EC_WORD_MOTHER},
         .monSet = gFallarborBattleTentTrainerMons_Jadyn
     },
-    [6] = {
+    [FALLARBOR_TENT_TRAINER_GERARDO] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("GERARDO"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST, EC_WORD_HERO, EC_WORD_EVER, EC_WORD_EXCL},
@@ -2499,7 +2499,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_WERE, EC_WORD_RIGHT, EC_WORD_QUES, -1},
         .monSet = gFallarborBattleTentTrainerMons_Gerardo
     },
-    [7] = {
+    [FALLARBOR_TENT_TRAINER_JONN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("JONN"),
         .speechBefore = {EC_WORD_THE, EC_WORD_WORLD, EC_MOVE2(SUPERPOWER), EC_MOVE2(STOMP), EC_WORD_CONTEST, EC_WORD_EXCL_EXCL},
@@ -2507,7 +2507,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_NO_1, EC_WORD_EXCL},
         .monSet = gFallarborBattleTentTrainerMons_Jonn
     },
-    [8] = {
+    [FALLARBOR_TENT_TRAINER_ESTEBAN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("ESTEBAN"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_GOOD, EC_WORD_TRAINER, EC_WORD_QUES, EC_WORD_UNBELIEVABLE},
@@ -2515,7 +2515,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_ME},
         .monSet = gFallarborBattleTentTrainerMons_Esteban
     },
-    [9] = {
+    [FALLARBOR_TENT_TRAINER_JAMESON] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("JAMESON"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_EXCL},
@@ -2523,7 +2523,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(STRUGGLE), EC_WORD_IN, EC_WORD_YOUR, EC_WORD_STICKY_HOLD},
         .monSet = gFallarborBattleTentTrainerMons_Jameson
     },
-    [10] = {
+    [FALLARBOR_TENT_TRAINER_ALANZO] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("ALANZO"),
         .speechBefore = {EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_A, EC_WORD_POWER, EC_WORD_I, EC_WORD_HAVE},
@@ -2531,7 +2531,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_RIGHT, EC_WORD_EXCL},
         .monSet = gFallarborBattleTentTrainerMons_Alanzo
     },
-    [11] = {
+    [FALLARBOR_TENT_TRAINER_HOWARD] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("HOWARD"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, -1},
@@ -2539,7 +2539,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_ELLIPSIS},
         .monSet = gFallarborBattleTentTrainerMons_Howard
     },
-    [12] = {
+    [FALLARBOR_TENT_TRAINER_CONRAD] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("CONRAD"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_PRETTY, EC_WORD_WILD, EC_WORD_EXCL},
@@ -2547,7 +2547,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_MY, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ON, EC_WORD_ELLIPSIS},
         .monSet = gFallarborBattleTentTrainerMons_Conrad
     },
-    [13] = {
+    [FALLARBOR_TENT_TRAINER_MAKENNA] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MAKENNA"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT},
@@ -2555,7 +2555,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_AWW, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO},
         .monSet = gFallarborBattleTentTrainerMons_Makenna
     },
-    [14] = {
+    [FALLARBOR_TENT_TRAINER_BRAYAN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("BRAYAN"),
         .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_MY, EC_WORD_POWER, EC_WORD_QUES},
@@ -2563,7 +2563,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_AM, EC_WORD_I, EC_WORD_THE, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_QUES},
         .monSet = gFallarborBattleTentTrainerMons_Brayan
     },
-    [15] = {
+    [FALLARBOR_TENT_TRAINER_MARIANA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("MARIANA"),
         .speechBefore = {EC_WORD_A, EC_WORD_LIE, EC_WORD_CAN, EC_WORD_BE, EC_WORD_KIND, EC_WORD_ELLIPSIS},
@@ -2571,7 +2571,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_FROM, EC_WORD_A, EC_WORD_MOVIE},
         .monSet = gFallarborBattleTentTrainerMons_Mariana
     },
-    [16] = {
+    [FALLARBOR_TENT_TRAINER_SHELDON] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("SHELDON"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)},
@@ -2579,7 +2579,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_GO, EC_WORD_WORK, EC_WORD_BYE_BYE},
         .monSet = gFallarborBattleTentTrainerMons_Sheldon
     },
-    [17] = {
+    [FALLARBOR_TENT_TRAINER_GIANNA] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("GIANNA"),
         .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD},
@@ -2587,7 +2587,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_POKEMON, EC_WORD_QUES, -1},
         .monSet = gFallarborBattleTentTrainerMons_Gianna
     },
-    [18] = {
+    [FALLARBOR_TENT_TRAINER_YAHIR] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("YAHIR"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_COME_ON, EC_WORD_EXCL},
@@ -2595,7 +2595,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_NOT, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_ENOUGH},
         .monSet = gFallarborBattleTentTrainerMons_Yahir
     },
-    [19] = {
+    [FALLARBOR_TENT_TRAINER_BRITNEY] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("BRITNEY"),
         .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD},
@@ -2603,7 +2603,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_COOL, EC_WORD_HERO, EC_WORD_AT, EC_WORD_THIS},
         .monSet = gFallarborBattleTentTrainerMons_Britney
     },
-    [20] = {
+    [FALLARBOR_TENT_TRAINER_HECTER] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("HECTER"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(HIDDEN_POWER), EC_WORD_IS, EC_WORD_EXCITING, EC_WORD_ME, EC_WORD_EXCL},
@@ -2611,7 +2611,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_YOU, EC_MOVE2(MIMIC), EC_WORD_ME},
         .monSet = gFallarborBattleTentTrainerMons_Hecter
     },
-    [21] = {
+    [FALLARBOR_TENT_TRAINER_TANNOR] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TANNOR"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_BE, EC_WORD_JOKING},
@@ -2619,7 +2619,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BEING, EC_WORD_FUNNY, EC_WORD_AT, EC_WORD_ALL},
         .monSet = gFallarborBattleTentTrainerMons_Tannor
     },
-    [22] = {
+    [FALLARBOR_TENT_TRAINER_BENJI] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("BENJI"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_THINK, EC_WORD_VERY, EC_WORD_FAST, EC_WORD_HUH_QUES},
@@ -2627,7 +2627,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_ELLIPSIS},
         .monSet = gFallarborBattleTentTrainerMons_Benji
     },
-    [23] = {
+    [FALLARBOR_TENT_TRAINER_RORY] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("RORY"),
         .speechBefore = {EC_WORD_DON_T, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_YOU, EC_WORD_EXCL},
@@ -2635,7 +2635,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR)},
         .monSet = gFallarborBattleTentTrainerMons_Rory
     },
-    [24] = {
+    [FALLARBOR_TENT_TRAINER_ELEANOR] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("ELEANOR"),
         .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_WANT, EC_WORD_TO, EC_WORD_PARTY, -1},
@@ -2643,7 +2643,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PARTY, EC_WORD_QUES},
         .monSet = gFallarborBattleTentTrainerMons_Eleanor
     },
-    [25] = {
+    [FALLARBOR_TENT_TRAINER_EVELYN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("EVELYN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_PC, EC_WORD_IS, EC_WORD_MY, EC_WORD_SECRET_BASE, EC_WORD_EXCL},
@@ -2651,7 +2651,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REJECT, EC_WORD_THIS},
         .monSet = gFallarborBattleTentTrainerMons_Evelyn
     },
-    [26] = {
+    [FALLARBOR_TENT_TRAINER_ARIELLE] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("ARIELLE"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_I, EC_WORD_TRY},
@@ -2659,7 +2659,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_PRETTY, EC_WORD_MEAN, EC_WORD_OF, EC_WORD_YOU, EC_WORD_EXCL},
         .monSet = gFallarborBattleTentTrainerMons_Arielle
     },
-    [27] = {
+    [FALLARBOR_TENT_TRAINER_CONNAR] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("CONNAR"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_THIS},
@@ -2667,7 +2667,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, -1, -1, -1},
         .monSet = gFallarborBattleTentTrainerMons_Connar
     },
-    [28] = {
+    [FALLARBOR_TENT_TRAINER_MAURICE] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("MAURICE"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_RADIO, EC_WORD_OR, EC_WORD_TELEVISION},
@@ -2675,7 +2675,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
         .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ENJOY, EC_WORD_MYSELF, EC_WORD_WITHOUT, EC_WORD_MONEY},
         .monSet = gFallarborBattleTentTrainerMons_Maurice
     },
-    [29] = {
+    [FALLARBOR_TENT_TRAINER_KIANNA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("KIANNA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_DEPT_STORE, EC_WORD_SHOPPING},
@@ -2685,317 +2685,317 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] =
     }
 };
 
-const struct FacilityMon gFallarborBattleTentMons[] = 
+const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] = 
 {
-    [0] = {
+    [FALLARBOR_TENT_MON_NUMEL] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [1] = {
+    [FALLARBOR_TENT_MON_LINOONE_1] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_SASSY
     },
-    [2] = {
+    [FALLARBOR_TENT_MON_PLUSLE] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [FALLARBOR_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
         .moves = {MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [4] = {
+    [FALLARBOR_TENT_MON_KECLEON] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [5] = {
+    [FALLARBOR_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [6] = {
+    [FALLARBOR_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [7] = {
+    [FALLARBOR_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [8] = {
+    [FALLARBOR_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [9] = {
+    [FALLARBOR_TENT_MON_NINCADA] = {
         .species = SPECIES_NINCADA,
         .moves = {MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SERIOUS
     },
-    [10] = {
+    [FALLARBOR_TENT_MON_BEAUTIFLY] = {
         .species = SPECIES_BEAUTIFLY,
         .moves = {MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [11] = {
+    [FALLARBOR_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [12] = {
+    [FALLARBOR_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [13] = {
+    [FALLARBOR_TENT_MON_VOLBEAT] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [14] = {
+    [FALLARBOR_TENT_MON_NINJASK_1] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [15] = {
+    [FALLARBOR_TENT_MON_NINJASK_2] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [16] = {
+    [FALLARBOR_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [17] = {
+    [FALLARBOR_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_GENTLE
     },
-    [18] = {
+    [FALLARBOR_TENT_MON_ELECTRIKE] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HASTY
     },
-    [19] = {
+    [FALLARBOR_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [20] = {
+    [FALLARBOR_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [21] = {
+    [FALLARBOR_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [22] = {
+    [FALLARBOR_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [23] = {
+    [FALLARBOR_TENT_MON_LINOONE_2] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [24] = {
+    [FALLARBOR_TENT_MON_MIGHTYENA] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [25] = {
+    [FALLARBOR_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [26] = {
+    [FALLARBOR_TENT_MON_SKARMORY] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [27] = {
+    [FALLARBOR_TENT_MON_GOLBAT] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [28] = {
+    [FALLARBOR_TENT_MON_WINGULL] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [29] = {
+    [FALLARBOR_TENT_MON_PELIPPER] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [30] = {
+    [FALLARBOR_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [31] = {
+    [FALLARBOR_TENT_MON_WAILMER] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [32] = {
+    [FALLARBOR_TENT_MON_MARILL] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [33] = {
+    [FALLARBOR_TENT_MON_GOLDEEN_1] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HASTY
     },
-    [34] = {
+    [FALLARBOR_TENT_MON_GOLDEEN_2] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [35] = {
+    [FALLARBOR_TENT_MON_TRAPINCH] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [36] = {
+    [FALLARBOR_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [37] = {
+    [FALLARBOR_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [38] = {
+    [FALLARBOR_TENT_MON_SANDSHREW] = {
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [39] = {
+    [FALLARBOR_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [40] = {
+    [FALLARBOR_TENT_MON_SHROOMISH] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [41] = {
+    [FALLARBOR_TENT_MON_KIRLIA] = {
         .species = SPECIES_KIRLIA,
         .moves = {MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [42] = {
+    [FALLARBOR_TENT_MON_LOMBRE] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [43] = {
+    [FALLARBOR_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [44] = {
+    [FALLARBOR_TENT_MON_CACNEA] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,