Merge master into ObjEvent rename and prune accidental inclusions

2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
@@ -63,5 +63,6 @@ bool32 sub_808D1B4(void);
 bool32 sub_808D1E8(void);
 void SetPlayerInvisibility(bool8 invisible);
 u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y);
+void StartFishing(u8 taskId);

 #endif // GUARD_FIELD_PLAYER_AVATAR_H