summaryrefslogtreecommitdiff
path: root/include/link.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-19 19:46:37 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-19 19:46:37 +0200
commitdee61330769b3e3a93844c9a0ef609500fe399d3 (patch)
tree1f36102b4133fdfe5fe2fd8a062d085e9673b062 /include/link.h
parentdd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff)
parent8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff)
fix merge conflicts
Diffstat (limited to 'include/link.h')
-rw-r--r--include/link.h7
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