diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
| commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
| tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /include/field_player_avatar.h | |
| parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
| parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) | |
Merge branch 'master' into modern_gcc
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 0c2deb8be..491fd809e 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -14,7 +14,7 @@ enum { // MovementType_None2 void player_step(u8 a, u16 b, u16 c); -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); void SetPlayerAvatarTransitionFlags(u16 a); void sub_8059204(void); u8 PlayerGetCopyableMovement(void); |