Merge branch 'master' into event_object_movement

2020-03-13 00:32:04 -07:00
parent 339c2914af 6af8c04d8f
commit 99e4de062a
3241 changed files with 80742 additions and 133435 deletions
@@ -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