summaryrefslogtreecommitdiff
path: root/src/field/field_control_avatar.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-10-18 12:17:38 -0700
committerGitHub <noreply@github.com>2017-10-18 12:17:38 -0700
commitc1774eb429a99f0252fd449c174c963c036e4e03 (patch)
tree62d071743f4abea54cbd8edbca949d9f47954000 /src/field/field_control_avatar.c
parenta335716a41ebed9b221a7569ab426a2efdd5d719 (diff)
parent17bb6dc21f3b5ab3cf1a694bb966928d1c24482f (diff)
Merge pull request #448 from ProjectRevoTPP/clean_bike
document bike.c.
Diffstat (limited to 'src/field/field_control_avatar.c')
-rw-r--r--src/field/field_control_avatar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index ff8e8504c..65357ac83 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -124,8 +124,8 @@ void FieldClearPlayerInput(struct FieldInput *input)
void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
{
- u8 r6 = gPlayerAvatar.running1;
- u8 r9 = gPlayerAvatar.running2;
+ u8 r6 = gPlayerAvatar.tileTransitionState;
+ u8 r9 = gPlayerAvatar.runningState;
bool8 forcedMove = MetatileBehavior_IsMoveTile(cur_mapdata_block_role_at_player_pos(r9));
if ((r6 == 2 && forcedMove == FALSE) || r6 == 0)