diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-29 14:13:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 14:13:39 -0500 |
| commit | 8e5c72766c2efd2d3d4e490232fcd5f6c265fe06 (patch) | |
| tree | ac0ff8a6501ac194c9123a2c4273630c3d8b33c5 /include/battle_tower.h | |
| parent | aca96b07f063f2d4d6543f5dd6f415a0a4c427db (diff) | |
| parent | 3dea8fa2658cb1055fb835983e8a738cf543e232 (diff) | |
Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1
Decompile battle_dome
Diffstat (limited to 'include/battle_tower.h')
| -rw-r--r-- | include/battle_tower.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index e1655f2c6..d7ff70006 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -24,7 +24,7 @@ union BattleTowerRecord struct BattleFrontierTrainer { - u32 trainerClass; + u32 facilityClass; u8 trainerName[8]; u16 speechBefore[6]; u16 speechWin[6]; @@ -32,7 +32,17 @@ struct BattleFrontierTrainer u16 *btMonPool; }; -extern struct BattleFrontierTrainer *gUnknown_0203BC88; +struct FacilityMon +{ + u16 species; + u16 moves[4]; + u8 itemTableId; + u8 evSpread; + u8 nature; +}; + +extern const struct BattleFrontierTrainer *gFacilityTrainers; +extern const struct FacilityMon *gFacilityTrainerMons; u16 sub_8164FCC(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); @@ -40,7 +50,7 @@ bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void sub_81628A0(union BattleTowerRecord *); void sub_8162614(u16 trainerId, u8); -void ConvertBattleFrontierTrainerSpeechToString(u16 *words); +void ConvertBattleFrontierTrainerSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); |