Merge branch 'master' into event_object_movement

include/field_control_avatar.h

@@ -9,5 +9,7 @@ void RestartWildEncounterImmunitySteps(void);
 void ClearPoisonStepCounter(void);
 void SetCableClubWarp(void);
 void sub_806DE28(struct ObjectEvent *);
+void dive_warp(struct MapPosition * pos, u16 behavior);
+
 
 #endif //GUARD_FIELD_CONTROL_AVATAR_H