Add battle tent mon/trainer constants

This commit is contained in:
GriffinR
2020-01-08 01:07:53 -05:00
parent fb5bea98ce
commit 017fa294b5
6 changed files with 1223 additions and 948 deletions

View File

@@ -6155,7 +6155,6 @@ int TrainerIdToDomeTournamentId(u16 trainerId)
return i;
}
// TODO:
static u8 sub_81953E8(u8 tournamentId, u8 round)
{
u8 tournamentIds[2];

View File

@@ -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)

View File

@@ -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"

File diff suppressed because it is too large Load Diff