1 files changed, 25 insertions, 27 deletions

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 4ab740702..60bd09ca9 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -819,11 +819,11 @@ const u8 gJumpInPlaceTurnAroundMovementActions[] = {
     MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
 };
 const u8 gJumpMovementActions[] = {
-    MOVEMENT_ACITON_JUMP_DOWN,
-    MOVEMENT_ACITON_JUMP_DOWN,
-    MOVEMENT_ACITON_JUMP_UP,
-    MOVEMENT_ACITON_JUMP_LEFT,
-    MOVEMENT_ACITON_JUMP_RIGHT,
+    MOVEMENT_ACTION_JUMP_DOWN,
+    MOVEMENT_ACTION_JUMP_DOWN,
+    MOVEMENT_ACTION_JUMP_UP,
+    MOVEMENT_ACTION_JUMP_LEFT,
+    MOVEMENT_ACTION_JUMP_RIGHT,
 };
 const u8 gJumpSpecialMovementActions[] = {
     MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
@@ -1182,19 +1182,17 @@ void RemoveEventObject(struct EventObject *eventObject)
 void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 eventObjectId;
-
-    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
-        return;
-    FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
-    RemoveEventObject(&gEventObjects[eventObjectId]);
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
+        RemoveEventObject(&gEventObjects[eventObjectId]);
+    }
 }
 
 void RemoveEventObjectInternal(struct EventObject *eventObject)
 {
     struct SpriteFrameImage image;
-    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
-
-    image.size = gfxInfo->size;
+    image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size;
     gSprites[eventObject->spriteId].images = ℑ
     DestroySprite(&gSprites[eventObject->spriteId]);
 }
@@ -4028,7 +4026,7 @@ bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sp
     direction = playerDirection;
     direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
     EventObjectMoveDestCoords(eventObject, direction, &x, &y);
-    EventObjectSetSingleMovement(eventObject, sprite, sub_80608A4(direction));
+    EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction));
     if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
         EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
@@ -4079,7 +4077,7 @@ void MovementType_TreeDisguise(struct Sprite *sprite)
         EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         eventObject->directionSequenceIndex = 1;
-        sprite->data[7] ++;
+        sprite->data[7]++;
     }
     UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
 }
@@ -4099,7 +4097,7 @@ void MovementType_MountainDisguise(struct Sprite *sprite)
         EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         eventObject->directionSequenceIndex = 1;
-        sprite->data[7] ++;
+        sprite->data[7]++;
     }
     UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
 }
@@ -4111,7 +4109,7 @@ void MovementType_Hidden(struct Sprite *sprite)
         gEventObjects[sprite->data[0]].fixedPriority = 1;
         sprite->subspriteMode = 2;
         sprite->oam.priority = 3;
-        sprite->data[7] ++;
+        sprite->data[7]++;
     }
     UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback);
 }
@@ -4127,7 +4125,7 @@ u8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *spr
     return 0;
 }
 
-u8 MovementType_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+u8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
@@ -4660,7 +4658,7 @@ dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions)
 dirn_to_anim(GetJump2MovementAction, gJump2MovementActions)
 dirn_to_anim(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions)
 dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions)
-dirn_to_anim(sub_80608A4, gJumpMovementActions)
+dirn_to_anim(GetJumpMovementAction, gJumpMovementActions)
 dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions)
 dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions)
 dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions)
@@ -6364,17 +6362,17 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru
     return TRUE;
 }
 
-bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
 
-bool8 MovementAction_WalkDownAffine0_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8060ED8(eventObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     StartSpriteAffineAnimIfDifferent(sprite, 0);
-    return MovementAction_WalkDownAffine0_Step1(eventObject, sprite);
+    return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite);
 }
 
-bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(eventObject, sprite))
     {
@@ -6385,17 +6383,17 @@ bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *eventObject, stru
     return FALSE;
 }
 
-bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *);
 
-bool8 MovementAction_WalkDownAffine1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8060ED8(eventObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     ChangeSpriteAffineAnimIfDifferent(sprite, 1);
-    return MovementAction_WalkDownAffine1_Step1(eventObject, sprite);
+    return MovementAction_WalkDownAffine_Step1(eventObject, sprite);
 }
 
-bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(eventObject, sprite))
     {