fixing merge conflicts

1 files changed, 15 insertions, 8 deletions

diff --git a/include/secret_base.h b/include/secret_base.h
index bb747bb02..a3fa22c05 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -1,17 +1,24 @@
 #ifndef GUARD_SECRET_BASE_H
 #define GUARD_SECRET_BASE_H
 
+// Maximum number of secret bases the game can store. This include 1 for the player, and up to 19 others from linked players.
+#define MAX_SECRET_BASES 20
+
 void ResetSecretBases(void);
-void sub_80BB970(struct MapEvents *);
+void sub_80BB5E4(void);
+void sub_80BB63C(void);
+void sub_80BB800(void);
+void sub_80BB970(struct MapEvents *events);
 u8 sub_80BBB24(void);
-void sub_80BBCCC(u8);
-void sub_80BC038();
+void sub_80BBCCC(u8 flagIn);
+void sub_80BBFD8(struct MapPosition *, struct MapEvents *);
+void sub_80BC038(struct MapPosition *, struct MapEvents *);
 u8 sub_80BC050();
-u8 *GetSecretBaseMapName(u8 *);
+u8 *GetSecretBaseMapName(u8 *dest);
 void sub_80BC300();
-const u8 sub_80BCCA4(u8);
-u8 *sub_80BCCE8(void);
-void sub_80BCF1C(u8);
-void sub_80BD674(void *, u32, u8);
+u8 sub_80BCCA4(u8 secretBaseIndex);
+const u8 *GetSecretBaseTrainerLoseText(void);
+void sub_80BCF1C(u8 taskId);
+void sub_80BD674(void *playerRecords, u32 size, u8 c);
 
 #endif // GUARD_SECRET_BASE_H