From 4d92810ad64d6b01701de7f4796467c402542420 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 24 May 2018 08:49:42 -0500 Subject: Rename regularAnim and specialAnim to singleMovement and heldMovement --- src/script_movement.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/script_movement.c') 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); -- cgit v1.2.3