diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /include/link.h | |
parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) |
merge with master, fix conflicts
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/link.h b/include/link.h index 5f5654e4d..b8835ce04 100644 --- a/include/link.h +++ b/include/link.h @@ -141,6 +141,7 @@ extern u8 gShouldAdvanceLinkState; extern struct LinkPlayer gLinkPlayers[]; extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; +extern bool8 gLinkVSyncDisabled; void Task_DestroySelf(u8); void OpenLink(void); @@ -184,5 +185,11 @@ bool8 sub_800A520(void); bool8 sub_8010500(void); void sub_800DFB4(u8, u8); void sub_800ADF8(void); +void sub_800B488(void); +void sub_8009734(void); +void sub_800A620(void); +void sub_8011BD0(void); +u8 sub_800ABAC(void); +u8 sub_800ABBC(void); #endif // GUARD_LINK_H |