diff options
author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
---|---|---|
committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
commit | 1c3d75f6736445324fdcba31d5dbd858997e22c4 (patch) | |
tree | e0a94bdb8c2a3323048c9dc9540fa6b5af004c83 /include/battle_tower.h | |
parent | fe40c0c4663d732c8ba9ca5f5e00b3c14a17d304 (diff) | |
parent | 585f313c646cb9494bed48395572daf1502978a5 (diff) |
Merge branch 'master' into reverts
Diffstat (limited to 'include/battle_tower.h')
-rw-r--r-- | include/battle_tower.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index 3bf2f004b..30649719b 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -43,7 +43,9 @@ extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; extern const struct FacilityMon gSlateportBattleTentMons[]; extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern u16 gUnknown_03006298[]; +// Temporary storage for monIds of the opponent team +// during team generation in battle factory and similar facilities. +extern u16 gFrontierTempParty[]; extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; |