Fixed collision and surfing bugs

- If the player collides with something immediately after exiting a door, the follower will no longer exit the door, walking into the player.

- If the player surfs immediately after exiting a door, the follower will no longer exit the door and walk out of sync.

src/field_effect.c

@@ -3064,7 +3064,15 @@ static void SurfFieldEffect_FieldMovePose(struct Task *task)
         SetPlayerAvatarFieldMove();
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
         task->tState++;
-        FollowerIntoPokeball();
+        
+        if (gSaveBlock2Ptr->follower.inProgress)
+        {
+            // in case the follower hasn't left a warp yet
+            gSaveBlock2Ptr->follower.comeOutDoorStairs = 0;
+            gSaveBlock2Ptr->follower.warpEnd = 0;
+            
+            FollowerIntoPokeball();
+        }
     }
 }
 

src/follow_me.c

@@ -554,6 +554,10 @@ static bool8 IsStateMovement(u8 state)
     //case MOVEMENT_ACTION_EMOTE_CROSS:
     //case MOVEMENT_ACTION_EMOTE_DOUBLE_EXCLAMATION_MARK:
     //case MOVEMENT_ACTION_EMOTE_HAPPY:
+    case MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN:
+    case MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP:
+    case MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT:
+    case MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT:
     case MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN:
     case MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP:
     case MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT: