diff options
| author | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:16:07 -0400 |
|---|---|---|
| committer | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:16:07 -0400 |
| commit | e129f4864fa342fdca46399f216ee0c0c46c26b4 (patch) | |
| tree | 9df7fd1157581d84567225e2dcbc6318901dc2e9 /src/field_player_avatar.c | |
| parent | 2bd86dad2fddb1c836b462a4137fab724c7eb305 (diff) | |
| parent | 0979ea91fb247b642cf7aa9e0bea5265917923d8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index fd315dd98..b9cf7d102 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -285,7 +285,7 @@ void MovementType_Player(struct Sprite *sprite) UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); } -static u8 EventObjectCB2_NoMovement2() +static u8 EventObjectCB2_NoMovement2(void) { return 0; } @@ -375,7 +375,7 @@ static void PlayerAllowForcedMovementIfMovingSameDirection(void) gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5; } -static bool8 TryDoMetatileBehaviorForcedMovement() +static bool8 TryDoMetatileBehaviorForcedMovement(void) { return gUnknown_08497444[GetForcedMovementByMetatileBehavior()](); } |