diff options
author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /include/trainer_see.h | |
parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'include/trainer_see.h')
-rw-r--r-- | include/trainer_see.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/include/trainer_see.h b/include/trainer_see.h index ab035d9f8..847380782 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -1,8 +1,30 @@ #ifndef GUARD_TRAINER_SEE_H #define GUARD_TRAINER_SEE_H -void sub_80B4578(struct MapObject *); -u8 sub_80B47BC(void); -void sub_8155D78(struct MapObject *); +struct ApproachingTrainer +{ + u8 mapObjectId; + u8 radius; // plus 1 + const u8 *trainerScriptPtr; + u8 taskId; +}; -#endif //GUARD_TRAINER_SEE_H +extern u16 gUnknown_03006080; +extern u8 gUnknown_03006084[4]; +extern struct ApproachingTrainer gApproachingTrainers[2]; +extern u8 gNoOfApproachingTrainers; +extern u8 gUnknown_030060AC; +extern u8 gApproachingTrainerId; + +bool8 CheckForTrainersWantingBattle(void); +void sub_80B4578(struct MapObject *var); +void EndTrainerApproach(void); +void sub_80B45D0(void); +u8 FldEff_ExclamationMarkIcon1(void); +u8 FldEff_ExclamationMarkIcon2(void); +u8 FldEff_HeartIcon(void); +u8 GetCurrentApproachingTrainerMapObjectId(void); +u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId); +void sub_80B4808(void); + +#endif // GUARD_TRAINER_SEE_H |