diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
| commit | 8df4982b3ff827ec0e7909484a67dc5923fac53d (patch) | |
| tree | e9b98e2ce622ab500e13b784cab807e4b5b3e615 /src/link.c | |
| parent | 3514f9dd6b48f1a0c42a4ea6cb1ab5317fa88c50 (diff) | |
| parent | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (diff) | |
Merge remote-tracking branch 'upstream/master' into document-trade
Diffstat (limited to 'src/link.c')
| -rw-r--r-- | src/link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/link.c b/src/link.c index e88dcb861..3ca8236ed 100644 --- a/src/link.c +++ b/src/link.c @@ -283,7 +283,7 @@ void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(sub_80096BC); ResetBlockSend(); - gLinkType = 0x1111; + gLinkType = LINKTYPE_0x1111; OpenLink(); SeedRng(gMain.vblankCounter2); for (i = 0; i < MAX_LINK_PLAYERS; i++) @@ -1350,7 +1350,7 @@ bool8 sub_800AA60(void) { if (gLinkPlayers[i].trainerId == gSavedLinkPlayers[i].trainerId) { - if (gLinkType == 0x2288) + if (gLinkType == LINKTYPE_0x2288) { if (gLinkType == gLinkPlayers[i].linkType) { |