Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

2020-04-10 13:10:44 -04:00
parent 8626240b54 2880cf2a51
commit b22d3a821d
219 changed files with 5421 additions and 5579 deletions
@@ -4,13 +4,10 @@
 #include "global.h"

 void Task_VsSeeker_0(u8 taskId);
-void sub_810CB90(void);
-void sub_810CDE8(void);
-s32 GetRematchTrainerId(u16 a0);
-bool8 sub_810CF04(u8 a0);
-void sub_810D0D0(void);
-void sub_810CB90(void);
+void ClearRematchStateByTrainerId(void);
+void ClearRematchStateOfLastTalked(void);
+int GetRematchTrainerId(u16 trainerId);
 bool8 UpdateVsSeekerStepCounter(void);
-void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum);
+void MapResetTrainerRematches(u16 mapGroup, u16 mapNum);

 #endif //GUARD_VS_SEEKER_H