Merge branch 'master' of https://github.com/pret/pokeruby into clean_bike

5 files changed, 18 insertions, 12 deletions

diff --git a/include/decoration.h b/include/decoration.h
index 1b83964d9..70abc29bf 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -293,6 +293,7 @@ extern void sub_8109DAC(u8); // src/trader
 extern void ReshowPlayerPC(u8); // src/player_pc
 void Task_SecretBasePC_Decoration(u8);
 
+void Task_SecretBasePC_Decoration(u8 taskId);
 void sub_80FE2B4(void);
 void Task_DecorationPCProcessMenuInput(u8);
 void sub_80FE394(void);
diff --git a/include/field_specials.h b/include/field_specials.h
index d61aa3b20..52325879c 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -25,5 +25,6 @@ void ScriptShowElevatorMenu(void);
 void SetShoalItemFlag(u16);
 u8 GetLeadMonIndex(void);
 void ResetFanClub(void);
+u8 sub_810FB10(u8 a0);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 4167f7cbd..eb99cc19f 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -111,11 +111,11 @@ struct CoordEvent
 
 struct BgEvent
 {
-    u16 x, y;
-    u8 unk4;
-    u8 kind;
-    // 0x2 padding for the union beginning.
-    union { // carried over from diego's FR/LG work, seems to be the same struct
+    /*0x00*/u16 x;
+    /*0x02*/u16 y;
+    /*0x04*/u8 unk4;
+    /*0x05*/u8 kind;
+    /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct
         // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
         u8 *script;
 
diff --git a/include/global.h b/include/global.h
index 6b0a0cb01..7c1ac9c68 100644
--- a/include/global.h
+++ b/include/global.h
@@ -130,12 +130,12 @@ struct UCoords16
 
 struct SecretBaseRecord
 {
-    /*ID?*/ /*0x1A08*/ u8 sbr_field_0;
+    /*0x1A08*/ u8 secretBaseId;
     /*0x1A09*/ u8 sbr_field_1_0:4;
     /*0x1A09*/ u8 gender:1;
     /*0x1A09*/ u8 sbr_field_1_5:1;
     /*0x1A09*/ u8 sbr_field_1_6:2;
-    /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes?
+    /*0x1A0A*/ u8 playerName[OT_NAME_LENGTH];
     /*0x1A11*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
     /*0x1A16*/ u16 sbr_field_e;
     /*0x1A18*/ u8 sbr_field_10;
diff --git a/include/secret_base.h b/include/secret_base.h
index 0844cff26..07784556f 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -1,16 +1,20 @@
 #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_80BB970(struct MapEvents *events);
 u8 sub_80BBB24(void);
-void sub_80BBCCC(u8);
+void sub_80BBCCC(u8 flagIn);
 void sub_80BC038(struct MapPosition *, struct MapEvents *);
 u8 sub_80BC050();
-u8 *GetSecretBaseMapName(u8 *);
+u8 *GetSecretBaseMapName(u8 *dest);
 void sub_80BC300();
+u8 sub_80BCCA4(u8 secretBaseIndex);
 const u8 *sub_80BCCE8(void);
-void sub_80BCF1C(u8);
-void sub_80BD674(void *, u32, u8);
+void sub_80BCF1C(u8 taskId);
+void sub_80BD674(void *playerRecords, u32 size, u8 c);
 
 #endif // GUARD_SECRET_BASE_H