diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
| commit | 402f2643bd9159638002b18010d09fa3309c1f9f (patch) | |
| tree | 2ccf4cd24a17630ed107bc5749eaf998927d5476 /src/field_player_avatar.c | |
| parent | d69a051df50232dbc0c2d0b595d5eeb0d5fb3133 (diff) | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index d308dcaba..b301f4e22 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -835,7 +835,7 @@ void sub_805C0D4(u8 direction) void PlayerGoSlow(u8 direction) { - PlayerSetAnimId(sub_8063F58(direction), 2); + PlayerSetAnimId(GetWalkSlowMovementAction(direction), 2); } void PlayerGoSpeed1(u8 direction) @@ -890,9 +890,9 @@ void PlayerFaceDirection(u8 direction) PlayerSetAnimId(GetFaceDirectionMovementAction(direction), 1); } -void sub_805C20C(u8 direction) +void PlayerFaceDirectionFast(u8 direction) { - PlayerSetAnimId(GetWalkSlowMovementAction(direction), 1); + PlayerSetAnimId(GetFaceDirectionFastMovementAction(direction), 1); } void PlayerTurnInPlace(u8 direction) @@ -1134,7 +1134,7 @@ static const u8 sPlayerAvatarGfxIds[][2] = { {OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF}, {OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM}, {OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH}, - {OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY}, + {OBJ_EVENT_GFX_RED_VS_SEEKER, OBJ_EVENT_GFX_GREEN_VS_SEEKER}, }; static const u8 sHoennLinkPartnerGfxIds[] = { @@ -1327,8 +1327,8 @@ void sub_805CB70(void) } static const u8 gUnknown_835B88E[] = { - OBJ_EVENT_GFX_RED_FIELD_MOVE_BIKE, - OBJ_EVENT_GFX_GREEN_FIELD_MOVE_BIKE + OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE, + OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE }; u8 sub_805CBB8(void) |