diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-30 16:14:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 16:14:01 -0400 |
| commit | d1afbf17bbc9eb70cf085f3b734d02e4ce6b3b57 (patch) | |
| tree | 555c5be369128cdac7ab258bba635968ad481cb5 /src/field_player_avatar.c | |
| parent | 35b68c68ee565b9b232252e4f37ea082e9310560 (diff) | |
| parent | d9234adb0065719535ba345648159691f85135ea (diff) | |
Merge pull request #407 from PikalaxALT/doc_bike
Document bike.c and fix weird goto
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index bf0afe5b8..2e1513358 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -720,7 +720,7 @@ static void PlayerAvatarTransition_Bike(struct ObjectEvent * playerObjEvent) { QuestLogTryRecordPlayerAvatarGfxTransition(QL_PLAYER_GFX_BIKE); QuestLogCallUpdatePlayerSprite(QL_PLAYER_GFX_BIKE); - InitPlayerAvatarBikeState(0, 0); + BikeClearState(0, 0); } static void PlayerAvatarTransition_Surfing(struct ObjectEvent * playerObjEvent) @@ -913,7 +913,7 @@ void HandleEnforcedLookDirectionOnPlayerStopMoving(void) { if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { - if (player_should_look_direction_be_enforced_upon_movement()) + if (IsPlayerNotUsingAcroBikeOnBumpySlope()) PlayerForceSetHeldMovement(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -1346,12 +1346,13 @@ void StartPlayerAvatarFishAnim(u8 direction) QuestLogCallUpdatePlayerSprite(QL_PLAYER_GFX_FISH); } -void nullsub_24(u8 direction) +// Stubbed from R/S +void PlayerUseAcroBikeOnBumpySlope(u8 direction) { } -static void nullsub_25(void) +static void SetPlayerAvatarWatering(void) { } |