diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-06 17:08:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 17:08:27 -0500 |
| commit | dea28a0a236412f267e3da8a7c200d947a9c5fe1 (patch) | |
| tree | 84300b68d6e6402c16edd4e1dc30f0d8d103ab40 /asm/rom6.s | |
| parent | 1bd7739ea6bf3d4d90e65cb7ea3dcf5e8fe286d4 (diff) | |
| parent | 7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c (diff) | |
Merge pull request #57 from DizzyEggg/decomp_battle2
Decompile battle2
Diffstat (limited to 'asm/rom6.s')
| -rw-r--r-- | asm/rom6.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index 6d2fb532b..c53e6fe6e 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -11564,7 +11564,7 @@ sub_813B534: @ 813B534 str r0, [r2] movs r0, 0 str r0, [r1] - ldr r0, =gUnknown_03003124 + ldr r0, =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0813B552 @@ -11651,11 +11651,11 @@ _0813B5FE: lsrs r0, 24 ldr r1, =gSpecialVar_0x8004 movs r2, 0x2 - bl link_0800A448 + bl SendBlock b _0813B708 .pool _0813B614: - bl sub_800A550 + bl GetBlockReceivedStatus movs r1, 0x2 ands r1, r0 cmp r1, 0 @@ -11669,7 +11669,7 @@ _0813B622: b _0813B790 _0813B62E: ldr r5, =gSpecialVar_0x8005 - ldr r0, =gUnknown_020223C4 + ldr r0, =gBlockRecvBuffer movs r1, 0x80 lsls r1, 1 adds r0, r1 @@ -11738,11 +11738,11 @@ _0813B6C2: lsrs r0, 24 ldr r1, =gScriptResult movs r2, 0x2 - bl link_0800A448 + bl SendBlock b _0813B708 .pool _0813B6E4: - bl sub_800A550 + bl GetBlockReceivedStatus movs r1, 0x1 ands r1, r0 cmp r1, 0 @@ -11752,7 +11752,7 @@ _0813B6E4: cmp r0, 0 beq _0813B790 ldr r1, =gScriptResult - ldr r0, =gUnknown_020223C4 + ldr r0, =gBlockRecvBuffer ldrh r0, [r0] strh r0, [r1] movs r0, 0 |