diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-03 10:08:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-03 10:08:43 -0500 |
| commit | 2b5b95693613c92a89917ae2fbeffa44554ae1f0 (patch) | |
| tree | a7172e2cdaf509100df3a6fe106b0b58e62388ba /src/field_fadetransition.c | |
| parent | c901040ac260b94a6f55a1dc69707b6669828d0a (diff) | |
| parent | 98a79fd72fe681c9d9d227bdc52e63db301a56d9 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc
Diffstat (limited to 'src/field_fadetransition.c')
| -rw-r--r-- | src/field_fadetransition.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 0af5f462c..42fe26c91 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -850,7 +850,7 @@ static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4) (*a4)++; playerSpr->pos2.x = *a2 >> 5; playerSpr->pos2.y = *a3 >> 5; - if (playerObj->mapobj_bit_7) + if (playerObj->heldMovementFinished) { ObjectEventForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); } |