Sprite priority & follower face command fixes

src/event_object_movement.c

@@ -8573,6 +8573,13 @@ void ObjectEventUpdateElevation(struct ObjectEvent *objEvent)
 
     if (curElevation == 15 || prevElevation == 15)
         return;
+    
+    if (gSaveBlock2Ptr->follower.inProgress &&
+        objEvent == &gObjectEvents[gSaveBlock2Ptr->follower.objId] &&
+        objEvent->currentCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y - 1)
+    {
+        curElevation = gObjectEvents[gPlayerAvatar.objectEventId].currentElevation;
+    }
 
     objEvent->currentElevation = curElevation;
 
@@ -9962,6 +9969,7 @@ u8 MovementAction_FollowingPokemon_FaceSouth_Step0(struct ObjectEvent *objectEve
     SetObjectEventDirection(objectEvent, DIR_SOUTH);
     RecreateObjectEvent(objectEvent, sprite);
     sprite->animNum = 0;
+    sprite->x2 = 0;
     MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y);
     sprite->data[2]++;
     return FALSE;
@@ -9972,6 +9980,7 @@ u8 MovementAction_FollowingPokemon_FaceNorth_Step0(struct ObjectEvent *objectEve
     SetObjectEventDirection(objectEvent, DIR_NORTH);
     RecreateObjectEvent(objectEvent, sprite);
     sprite->animNum = 1;
+    sprite->x2 = 0;
     MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y);
     sprite->data[2]++;
     return FALSE;

src/field_effect_helpers.c

@@ -742,6 +742,7 @@ u32 FldEff_Splash(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         linkedSprite = &gSprites[objectEvent->spriteId];
+        sprite->subpriority = linkedSprite->subpriority - 1;
         sprite->oam.priority = linkedSprite->oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];