Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -195,8 +195,10 @@ extern struct LinkPlayer gLinkPlayers[5];
 extern u16 word_3002910[];
 extern bool8 gReceivedRemoteLinkPlayers;
 extern u32 gUnknown_020223C0;
+extern bool8 gLinkVSyncDisabled;
+extern u32 gLinkStatus;

-void Task_DestroySelf(u8);
+void Task_DestroySelf(u8 taskId);
 void OpenLink(void);
 void CloseLink(void);
 u16 LinkMain2(const u16 *);