diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-03 19:25:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 19:25:01 -0400 |
| commit | c47eca8a182a2a202cd65e2af93e9ef322d8674c (patch) | |
| tree | 30cc360cbf4b2f3250864aa28cc88a728074e3db /src/field_player_avatar.c | |
| parent | 200c82e01a94dbe535e6ed8768d8afad4444d4d2 (diff) | |
| parent | 8f74dda3e443d561b21d6b267aa71d14aed05031 (diff) | |
Merge pull request #316 from PikalaxALT/various_documentation
Various documentation
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6b51e7bc2..7e3ba59fe 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -66,7 +66,6 @@ static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys); static u8 CheckForPlayerAvatarCollision(u8 direction); -u8 CheckForObjectEventCollision(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior); static bool8 CanStopSurfing(s16 x, s16 y, u8 direction); static bool8 ShouldJumpLedge(s16 x, s16 y, u8 direction); static bool8 TryPushBoulder(s16 x, s16 y, u8 direction); @@ -722,7 +721,7 @@ static void PlayerAvatarTransition_Bike(struct ObjectEvent * playerObjEvent) { sub_8150474(1); sub_8150498(1); - sub_80BD620(0, 0); + InitPlayerAvatarBikeState(0, 0); } static void PlayerAvatarTransition_Surfing(struct ObjectEvent * playerObjEvent) @@ -1115,7 +1114,7 @@ void sub_805C774(void) ForcedMovement_None(); } -void sub_805C780(void) +void StopPlayerAvatar(void) { struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -1597,7 +1596,7 @@ void CreateStopSurfingTask_NoMusicChange(u8 direction) Task_StopSurfingInit(taskId); } -void sub_805D1A8(void) +void SeafoamIslandsB4F_CurrentDumpsPlayerOnLand(void) { if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3) { |