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/script_movement.c | |
parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) |
Rename regularAnim and specialAnim to singleMovement and heldMovement
Diffstat (limited to 'src/script_movement.c')
-rw-r--r-- | src/script_movement.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script_movement.c b/src/script_movement.c index 653dffcbf..ed1289a66 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -206,8 +206,8 @@ static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d) { u8 var; - if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId]) - && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + if (FieldObjectIsHeldMovementActive(&gMapObjects[mapObjId]) + && !FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) return; var = *d; @@ -218,7 +218,7 @@ static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d) } else { - if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var)) + if (!FieldObjectSetHeldMovement(&gMapObjects[mapObjId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); |