diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
| commit | f438734192e272af065820ad718ceb76ee59927a (patch) | |
| tree | 9230432a4a80c4fb6d1ae106f872c0990d6f1cb5 /include/link.h | |
| parent | d361f7030abb3441bfe61e95c3803297454acbb8 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/include/link.h b/include/link.h index 5db3ff3d2..012c90480 100644 --- a/include/link.h +++ b/include/link.h @@ -143,7 +143,6 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; void Task_DestroySelf(u8); -void sub_8007270(u8); void OpenLink(void); void CloseLink(void); u16 LinkMain2(u16 *); @@ -162,24 +161,12 @@ void sub_8007E4C(void); u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, void *, u16); -bool8 sub_8007E9C(u8); -bool8 sub_8007ECC(void); u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); -void sub_8007F4C(void); void SetLinkDebugValues(u32, u32); -u8 sub_8008198(void); -void sub_80081C8(u8); -u8 sub_800820C(void); -u8 sub_8008218(void); -void sub_800826C(void); -void sub_80082EC(void); u8 GetLinkPlayerCount_2(void); bool8 IsLinkMaster(void); -void sub_800832C(void); -void sub_8008480(void); -void sub_80084A4(void); void CB2_LinkError(void); u8 GetSioMultiSI(void); bool8 IsLinkConnectionEstablished(void); @@ -191,4 +178,11 @@ void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); +void sub_800E0E8(void); +bool8 sub_800A520(void); +bool8 sub_8010500(void); +void sub_800DFB4(u8, u8); +void sub_800ADF8(void); +u8 sub_8009FCC(void); + #endif // GUARD_LINK_H |