diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
| commit | 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 (patch) | |
| tree | 5aaaa5828622b42023320e211cffd3dd4bb3feb8 /include/field_player_avatar.h | |
| parent | aa8299821dca148ecfd5d6bfb77641043e01da5c (diff) | |
Unify 'map object' and 'field object' terms into 'event object'
Diffstat (limited to 'include/field_player_avatar.h')
| -rw-r--r-- | include/field_player_avatar.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index c0c952881..0d8776fd1 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -36,15 +36,15 @@ u8 ForcedMovement_MuddySlope(void); void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); void sub_8058D0C(u8 direction, u16 heldKeys); -u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); void SetPlayerAvatarTransitionFlags(u16 a); -void nullsub_49(struct MapObject *a); -void PlayerAvatarTransition_Normal(struct MapObject *a); -void PlayerAvatarTransition_MachBike(struct MapObject *a); -void PlayerAvatarTransition_AcroBike(struct MapObject *a); -void PlayerAvatarTransition_Surfing(struct MapObject *a); -void PlayerAvatarTransition_Underwater(struct MapObject *a); -void sub_80591F4(struct MapObject *a); +void nullsub_49(struct EventObject *a); +void PlayerAvatarTransition_Normal(struct EventObject *a); +void PlayerAvatarTransition_MachBike(struct EventObject *a); +void PlayerAvatarTransition_AcroBike(struct EventObject *a); +void PlayerAvatarTransition_Surfing(struct EventObject *a); +void PlayerAvatarTransition_Underwater(struct EventObject *a); +void sub_80591F4(struct EventObject *a); void sub_8059204(void); u8 PlayerGetCopyableMovement(void); void PlayerSetAnimId(u8 a, u8 b); @@ -95,14 +95,14 @@ void sub_8059BF4(void); // sub_8059C3C void sub_8059C94(u8); void sub_8059D08(u8); -u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c); -u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c); -u8 sub_8059F40(struct Task *task, struct MapObject *b, struct MapObject *c); -u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObject); -u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject); -u8 sub_805A100(struct Task *task, struct MapObject *mapObject); -u8 sub_805A178(struct Task *task, struct MapObject *mapObject); -u8 sub_805A1B8(struct Task *task, struct MapObject *mapObject); +u8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c); +u8 sub_8059EA4(struct Task *task, struct EventObject *b, struct EventObject *c); +u8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c); +u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); +u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject); +u8 sub_805A100(struct Task *task, struct EventObject *eventObject); +u8 sub_805A178(struct Task *task, struct EventObject *eventObject); +u8 sub_805A1B8(struct Task *task, struct EventObject *eventObject); void sub_805A20C(u8 a); void StartFishing(u8 a); u8 Fishing1(struct Task *task); |