diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /src/link.c | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
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 741f5f707..23ebdc01a 100644 --- a/src/link.c +++ b/src/link.c @@ -314,7 +314,7 @@ static void InitLocalLinkPlayer(void) gLocalLinkPlayer.version = gGameVersion + 0x4000; gLocalLinkPlayer.lp_field_2 = 0x8000; gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled(); - if (FlagGet(SYS_UNKNOWN_87F)) + if (FlagGet(FLAG_SYS_UNKNOWN_87F)) { gLocalLinkPlayer.name[8] |= 0x10; } @@ -678,7 +678,7 @@ static void BuildSendCmd(u16 command) break; case LINKCMD_0xAAAB: gSendCmd[0] = LINKCMD_0xAAAB; - gSendCmd[1] = gScriptItemId; + gSendCmd[1] = gSpecialVar_ItemId; break; case LINKCMD_0xCCCC: gSendCmd[0] = LINKCMD_0xCCCC; |