diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
| commit | 58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch) | |
| tree | c27ab24ed83fdb16654b5814d681af487b119601 /src/battle_tent.c | |
| parent | 32ae13f9b66ab1b01146e5746e9350f97f055526 (diff) | |
| parent | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff) | |
Merge remote-tracking branch 'upstream/master' into berry_crush
Diffstat (limited to 'src/battle_tent.c')
| -rw-r--r-- | src/battle_tent.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_tent.c b/src/battle_tent.c index 250e2d8ee..26b2e8bb1 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -17,7 +17,6 @@ #include "constants/items.h" #include "constants/layouts.h" #include "constants/region_map_sections.h" -#include "constants/species.h" #include "constants/trainers.h" // This file's functions. @@ -418,7 +417,7 @@ static void GenerateOpponentMons(void) species[i] = gFacilityTrainerMons[sRandMonSetId].species; heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[sRandMonSetId].itemTableId]; - gUnknown_03006298[i] = sRandMonSetId; + gFrontierTempParty[i] = sRandMonSetId; i++; } } |