Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

2020-02-12 13:05:57 -05:00
parent 9c934c9664 66c6b7a38b
commit 956090b05f
71 changed files with 4332 additions and 2506 deletions
@@ -63,6 +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);
+void StartFishing(u8 rod);

 #endif // GUARD_FIELD_PLAYER_AVATAR_H