fix pokeblock conflicts

2017-12-18 16:58:14 +01:00
parent c3abe2863f 6a674e1e83
commit cb229f56e8
174 changed files with 5529 additions and 7226 deletions
@@ -5,5 +5,11 @@ void OpenPokeblockCase(u8, void(void));
 u8 GetLeadMonIndex(void);
 u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
 void sub_813BADC(bool8);
+bool8 sub_813B9C0(void);
+void UpdateMirageRnd(u16 days);
+void UpdateBirchState(u16 days);
+void UpdateFrontierManiac(u16 days);
+void UpdateFrontierGambler(u16 days);
+void SetShoalItemFlag(u16 days);

 #endif //GUARD_ROM6_H