diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-27 10:37:16 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-27 10:37:16 -0500 |
| commit | e7c94a3c270a2a43a3a84e7cefe98d9044d93dd6 (patch) | |
| tree | 6b7e1c90017f4a0e5cf550ad79814c7b2c5f3bc0 /include | |
| parent | 88680a64a4990fd0b4a6609574e734ccb1fd1d73 (diff) | |
| parent | 914f7fc6645ee456994f7a34bc6dac2c165a6392 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/link.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 13e478ff1..2f1c2d1ab 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -261,6 +261,7 @@ extern u8 gSharedMem[]; #define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) #define ewram1E000_2 (const u8 *)(gSharedMem + 0x1E000) +#define eContestLinkSendBuffer gSharedMem + 0x1E000 #define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) #define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) diff --git a/include/link.h b/include/link.h index 367add625..6581fdbba 100644 --- a/include/link.h +++ b/include/link.h @@ -167,7 +167,7 @@ u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, void *, u16); bool8 sub_8007E9C(u8); -bool8 sub_8007ECC(void); +bool8 IsLinkTaskFinished(void); u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); |