diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /include/trainer_see.h | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'include/trainer_see.h')
| -rw-r--r-- | include/trainer_see.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/include/trainer_see.h b/include/trainer_see.h index 5da50cfa1..847380782 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -4,20 +4,27 @@ struct ApproachingTrainer { u8 mapObjectId; - u8 radius; - u8 field_2; - u8 field_3; + u8 radius; // plus 1 const u8 *trainerScriptPtr; - u8 field_8; - u8 field_9; - u8 field_A; - u8 field_B; + u8 taskId; }; -extern struct ApproachingTrainer gApproachingTrainers[]; +extern u16 gUnknown_03006080; +extern u8 gUnknown_03006084[4]; +extern struct ApproachingTrainer gApproachingTrainers[2]; +extern u8 gNoOfApproachingTrainers; +extern u8 gUnknown_030060AC; +extern u8 gApproachingTrainerId; -void sub_80B4578(struct MapObject *); -u8 sub_80B47BC(void); -void sub_8155D78(struct MapObject *); +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 +#endif // GUARD_TRAINER_SEE_H |