diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
tree | c8297d41af868eac80642c1f811bc009fa142099 /include/link.h | |
parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/link.h b/include/link.h index 6581fdbba..ca6c368ff 100644 --- a/include/link.h +++ b/include/link.h @@ -131,10 +131,11 @@ extern const struct BlockRequest sBlockRequestLookupTable[5]; extern struct Link gLink; extern u16 gRecvCmds[CMD_LENGTH][MAX_LINK_PLAYERS]; +// TODO: Why is gBlockSendBuffer a u8 array, while gBlockRecvBuffer is a u16 array? extern u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE]; +extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; extern u16 gLinkType; extern u32 gLinkStatus; -extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; extern u16 gSendCmd[CMD_LENGTH]; extern u8 gShouldAdvanceLinkState; #if GERMAN @@ -145,6 +146,9 @@ extern struct LinkPlayer gLinkPlayers[]; extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkOpen; +extern bool8 gLinkPlayerPending[MAX_LINK_PLAYERS]; +void (*gLinkCallback)(void); +extern u8 gUnknown_Debug_30030E0; void Task_DestroySelf(u8); void sub_8007270(u8); @@ -194,5 +198,11 @@ u32 LinkMain1(u8 *, u16 *, u16[CMD_LENGTH][MAX_LINK_PLAYERS]); void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); +void LinkTestScreen(void); +void debug_sub_8008218(u16 *buffer, u32 arg1, u16 *arg2, u32 arg3); +void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0); +u32 sub_8007E40(void); +void PrintHex(u32, u8, u8, u8); +void InitLinkTestBG_Unused(u8, u8, u8, u8); #endif // GUARD_LINK_H |