diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-20 22:55:44 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-20 22:55:44 -0500 |
| commit | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (patch) | |
| tree | fdeca5705cf68b2a355bba9fa90f9f3c16e3c69e /include/trainer_see.h | |
| parent | 215bb31d67398386d3554d31f55dbe495e7f6b6f (diff) | |
Standardize Event Object to Object Event
Diffstat (limited to 'include/trainer_see.h')
| -rw-r--r-- | include/trainer_see.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trainer_see.h b/include/trainer_see.h index daf9d0298..9d88e05fa 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 eventObjectId; + u8 objectEventId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct EventObject *var); +void sub_80B4578(struct ObjectEvent *var); void EndTrainerApproach(void); void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerEventObjectId(void); -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerObjectEventId(void); +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId); void PlayerFaceTrainerAfterBattle(void); #endif // GUARD_TRAINER_SEE_H |