diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 14:05:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 14:05:40 -0600 |
| commit | f639c7c309bbd32fc60278eafa726db5c0c49914 (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /include/battle_tower.h | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
| parent | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (diff) | |
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
Diffstat (limited to 'include/battle_tower.h')
| -rw-r--r-- | include/battle_tower.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index 5fe8d1190..90c22c982 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -21,7 +21,7 @@ struct BattleFrontierTrainer u16 speechBefore[6]; u16 speechWin[6]; u16 speechLose[6]; - const u16 *bfMonPool; + const u16 *monSets; }; struct FacilityMon @@ -52,7 +52,7 @@ u8 GetFrontierOpponentClass(u16 trainerId); void GetFrontierTrainerName(u8 *dst, u16 trainerId); void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount); -u16 RandomizeFacilityTrainerMonId(u16 trainerId); +u16 RandomizeFacilityTrainerMonSet(u16 trainerId); void FrontierSpeechToString(const u16 *words); void DoSpecialTrainerBattle(void); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record); |