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 /asm/menu_helpers.s | |
| parent | d361f7030abb3441bfe61e95c3803297454acbb8 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
fixing merge conflicts
Diffstat (limited to 'asm/menu_helpers.s')
| -rw-r--r-- | asm/menu_helpers.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index acc3065ea..423f653d9 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -533,7 +533,7 @@ sub_81221AC: @ 81221AC bl is_c1_link_related_active cmp r0, 0x1 beq _081221BE - ldr r0, =gUnknown_03003124 + ldr r0, =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _081221C8 |