diff options
| author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
| commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
| tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /include/field_player_avatar.h | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
| parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) | |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'include/field_player_avatar.h')
| -rw-r--r-- | include/field_player_avatar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index d323f6664..5e5a2361f 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); |