diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-24 08:49:42 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:43:11 -0500 |
| commit | 4d92810ad64d6b01701de7f4796467c402542420 (patch) | |
| tree | c5268124b95636f35e900979c6184f0e2cd4e3a9 /src/rom6.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
Rename regularAnim and specialAnim to singleMovement and heldMovement
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rom6.c b/src/rom6.c index 24c2de6d2..ca1e4b250 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -63,8 +63,8 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId]) - || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId]) + || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -74,7 +74,7 @@ static void task08_080C9820(u8 taskId) else { sub_8059BF4(); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 0x39); + FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x39); gTasks[taskId].func = sub_810B3DC; } } @@ -82,7 +82,7 @@ static void task08_080C9820(u8 taskId) static void sub_810B3DC(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) + if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_810B428; |