dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Add some battle frontier constant usage

Browse Source
This commit is contained in:
GriffinR committed 2022-06-09 12:57:28 -04:00
1 parent 78b0c20738
commit 7143865f6f
21 files changed
+189 -143
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/battle_tent.c
+22 -18
View File
@@ -56,10 +56,8 @@ static void GenerateInitialRentalMons(void);
*
*/
// IWRAM bss
static u16 sRandMonSetId;
static u16 sRandMonId;
// const rom data
void static (*const sVerdanturfTentFuncs[])(void) =
{
[VERDANTURF_TENT_FUNC_INIT] = InitVerdanturfTentChallenge,
@@ -357,7 +355,7 @@ static void GenerateOpponentMons(void)
const u16 *monSet;
u16 species[FRONTIER_PARTY_SIZE];
u16 heldItems[FRONTIER_PARTY_SIZE];
s32 monId = 0;
s32 numMons = 0;
gFacilityTrainers = gSlateportBattleTentTrainers;
gFacilityTrainerMons = gSlateportBattleTentMons;
@@ -366,6 +364,7 @@ static void GenerateOpponentMons(void)
{
do
{
// Choose a random trainer, ensuring no repeats in this challenge
trainerId = Random() % NUM_BATTLE_TENT_TRAINERS;
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{
@@ -376,48 +375,53 @@ static void GenerateOpponentMons(void)
gTrainerBattleOpponent_A = trainerId;
monSet = gFacilityTrainers[gTrainerBattleOpponent_A].monSet;
while (monSet[monId] != 0xFFFF)
monId++;
if (monId > 8)
while (monSet[numMons] != 0xFFFF)
numMons++;
if (numMons > 8)
break;
monId = 0;
numMons = 0;
}
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2)
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < TENT_STAGES_PER_CHALLENGE - 1)
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
monSet = gFacilityTrainers[gTrainerBattleOpponent_A].monSet;
i = 0;
while (i != FRONTIER_PARTY_SIZE)
{
sRandMonSetId = monSet[Random() % monId];
for (j = 0; j < 6; j++)
sRandMonId = monSet[Random() % numMons];
// Ensure none of the opponent's pokemon are the same as the potential rental pokemon for the player
for (j = 0; j < (int)ARRAY_COUNT(gSaveBlock2Ptr->frontier.rentalMons); j++)
{
if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
if (gFacilityTrainerMons[sRandMonId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
break;
}
if (j != 6)
if (j != (int)ARRAY_COUNT(gSaveBlock2Ptr->frontier.rentalMons))
continue;
// Ensure this species hasn't already been chosen for the opponent
for (k = 0; k < i; k++)
{
if (species[k] == gFacilityTrainerMons[sRandMonSetId].species)
if (species[k] == gFacilityTrainerMons[sRandMonId].species)
break;
}
if (k != i)
continue;
// Ensure held items don't repeat on the opponent's team
for (k = 0; k < i; k++)
{
if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[sRandMonSetId].itemTableId])
if (heldItems[k] != ITEM_NONE && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[sRandMonId].itemTableId])
break;
}
if (k != i)
continue;
species[i] = gFacilityTrainerMons[sRandMonSetId].species;
heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[sRandMonSetId].itemTableId];
gFrontierTempParty[i] = sRandMonSetId;
// Successful selection
species[i] = gFacilityTrainerMons[sRandMonId].species;
heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[sRandMonId].itemTableId];
gFrontierTempParty[i] = sRandMonId;
i++;
}
}