Merge branch 'master' into easy_chat

2017-11-25 10:56:55 -05:00
parent 293dfc4823 1e4f12e6fa
commit a875d665b8
2944 changed files with 164526 additions and 29870 deletions
@@ -68,7 +68,7 @@ struct LinkPlayer
    /* 0x08 */ u8 name[11];
    /* 0x13 */ u8 gender;
    /* 0x14 */ u32 linkType;
-    /* 0x18 */ u16 lp_field_18;
+    /* 0x18 */ u16 lp_field_18; // battle bank in battles
    /* 0x1A */ u16 language;
 };

@@ -179,6 +179,7 @@ void LinkVSync(void);
 void Timer3Intr(void);
 void SerialCB(void);
 u8 GetLinkPlayerCount(void);
+bool32 InUnionRoom(void);

 void sub_800E0E8(void);
 bool8 sub_800A520(void);