Add battle tent mon/trainer constants

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

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

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];

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)

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"