diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:03:46 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:03:46 -0400 |
| commit | 5620b0ed1a330e38c0d4cdbbfea2c5ce75053925 (patch) | |
| tree | b8ed6dff9b986ef0f24ee57e4b10429516f593ae /asm/overworld.s | |
| parent | 221dd4721d40abaebdbcf0823c924062c77311f5 (diff) | |
link through BuildSendCmd
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 5cc051c8a..f2ec7532b 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -5649,7 +5649,7 @@ c1_link_related: @ 8057884 _0805789E: ldr r0, _080578CC @ =gUnknown_300502C ldrb r4, [r0] - ldr r0, _080578D0 @ =gUnknown_3003E60 + ldr r0, _080578D0 @ =gLinkPartnersHeldKeys adds r1, r4, 0 bl sub_8057BE4 ldr r0, _080578D4 @ =gUnknown_3000E84 @@ -5667,7 +5667,7 @@ _080578C0: .align 2, 0 _080578C8: .4byte gWirelessCommType _080578CC: .4byte gUnknown_300502C -_080578D0: .4byte gUnknown_3003E60 +_080578D0: .4byte gLinkPartnersHeldKeys _080578D4: .4byte gUnknown_3000E84 thumb_func_end c1_link_related @@ -5686,12 +5686,12 @@ _080578E8: .4byte sub_8057D5C thumb_func_start sub_80578EC sub_80578EC: @ 80578EC push {lr} - ldr r0, _080578F8 @ =gUnknown_3003E60 + ldr r0, _080578F8 @ =gLinkPartnersHeldKeys bl sub_8057D48 pop {r0} bx r0 .align 2, 0 -_080578F8: .4byte gUnknown_3003E60 +_080578F8: .4byte gLinkPartnersHeldKeys thumb_func_end sub_80578EC thumb_func_start c1_link_related_func_set @@ -6126,14 +6126,14 @@ sub_8057C4C: @ 8057C4C lsrs r0, 16 cmp r0, 0xC bhi _08057C6C - ldr r0, _08057C68 @ =gUnknown_3005028 + ldr r0, _08057C68 @ =gHeldKeyCodeToSend strh r4, [r0] b _08057C72 .align 2, 0 _08057C64: .4byte 0xffef0000 -_08057C68: .4byte gUnknown_3005028 +_08057C68: .4byte gHeldKeyCodeToSend _08057C6C: - ldr r1, _08057CB0 @ =gUnknown_3005028 + ldr r1, _08057CB0 @ =gHeldKeyCodeToSend movs r0, 0x11 strh r0, [r1] _08057C72: @@ -6159,7 +6159,7 @@ _08057C72: cmp r4, 0x18 blt _08057CA8 _08057CA2: - ldr r1, _08057CB0 @ =gUnknown_3005028 + ldr r1, _08057CB0 @ =gHeldKeyCodeToSend movs r0, 0 strh r0, [r1] _08057CA8: @@ -6167,7 +6167,7 @@ _08057CA8: pop {r0} bx r0 .align 2, 0 -_08057CB0: .4byte gUnknown_3005028 +_08057CB0: .4byte gHeldKeyCodeToSend _08057CB4: .4byte gWirelessCommType thumb_func_end sub_8057C4C @@ -7114,14 +7114,14 @@ sub_805833C: @ 805833C ldrb r0, [r0] cmp r0, 0 bne _0805835C - ldr r0, _08058354 @ =gUnknown_3003FB0 + ldr r0, _08058354 @ =gLink ldr r1, _08058358 @ =0x00000339 adds r0, r1 ldrb r0, [r0] b _08058364 .align 2, 0 _08058350: .4byte gWirelessCommType -_08058354: .4byte gUnknown_3003FB0 +_08058354: .4byte gLink _08058358: .4byte 0x00000339 _0805835C: ldr r0, _08058368 @ =gUnknown_3005450 |