Merge branch 'master' into link

2017-11-27 20:05:51 -05:00
parent 73b0f9eb53 18c6b8efc2
commit cbd2718b5e
106 changed files with 13373 additions and 14129 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -231,6 +231,7 @@ void LinkVSync(void);
 void Timer3Intr(void);
 void SerialCB(void);
 u8 GetLinkPlayerCount(void);
+bool32 InUnionRoom(void);
 void sub_800E0E8(void);
 bool8 sub_800A520(void);
 void sub_800DFB4(u8, u8);