dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

LinkMain1

Browse Source
This commit is contained in:
PikalaxALT
2017-11-13 01:46:22 -05:00
parent 2be3083b3e
commit c81d50cb2f
7 changed files with 137 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+4 -4
View File
@@ -205,7 +205,7 @@ sub_80B24F8: @ 80B24F8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -239,7 +239,7 @@ sub_80B252C: @ 80B252C
ands r0, r1
cmp r0, 0
beq _080B2570
bl sub_800B320
bl IsLinkConnectionEstablished
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -269,7 +269,7 @@ sub_80B2578: @ 80B2578
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_800B320
bl IsLinkConnectionEstablished
lsls r0, 24
cmp r0, 0
beq _080B258E
@@ -309,7 +309,7 @@ sub_80B25CC: @ 80B25CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_800B2E8
bl GetSioMultiSI
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/link.s
-145
View File
@@ -5,151 +5,6 @@
.text
thumb_func_start sub_800B638
sub_800B638: @ 800B638
push {r4-r7,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
ldr r0, =gLink
ldrb r0, [r0, 0x1]
cmp r0, 0x4
bhi _0800B6EA
lsls r0, 2
ldr r1, =_0800B65C
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_0800B65C:
.4byte _0800B670
.4byte _0800B680
.4byte _0800B698
.4byte _0800B6D4
.4byte _0800B6DE
_0800B670:
bl DisableSerial
ldr r1, =gLink
movs r0, 0x1
strb r0, [r1, 0x1]
b _0800B6EA
.pool
_0800B680:
ldrb r0, [r4]
cmp r0, 0x1
bne _0800B6EA
bl EnableSerial
ldr r1, =gLink
movs r0, 0x2
strb r0, [r1, 0x1]
b _0800B6EA
.pool
_0800B698:
ldrb r1, [r4]
cmp r1, 0x1
beq _0800B6A8
cmp r1, 0x2
beq _0800B6C0
bl sub_800B764
b _0800B6EA
_0800B6A8:
ldr r2, =gLink
ldrb r0, [r2]
cmp r0, 0x8
bne _0800B6EA
ldrb r0, [r2, 0x3]
cmp r0, 0x1
bls _0800B6EA
strb r1, [r2, 0xE]
b _0800B6EA
.pool
_0800B6C0:
ldr r0, =gLink
movs r1, 0
strb r1, [r0, 0x1]
ldr r0, =0x0400012a
strh r1, [r0]
b _0800B6EA
.pool
_0800B6D4:
bl sub_800B790
ldr r1, =gLink
movs r0, 0x4
strb r0, [r1, 0x1]
_0800B6DE:
adds r0, r5, 0
bl sub_800B7C0
adds r0, r6, 0
bl sub_800B8A8
_0800B6EA:
movs r0, 0
strb r0, [r4]
ldr r1, =gLink
ldrb r2, [r1, 0x2]
ldrb r0, [r1, 0x3]
lsls r0, 2
orrs r2, r0
ldrb r0, [r1]
cmp r0, 0x8
bne _0800B702
movs r0, 0x20
orrs r2, r0
_0800B702:
ldrb r0, [r1, 0xC]
lsls r3, r0, 8
ldrb r0, [r1, 0xF]
lsls r4, r0, 9
ldrb r0, [r1, 0x10]
lsls r5, r0, 12
ldrb r0, [r1, 0x11]
lsls r6, r0, 13
ldrb r0, [r1, 0x12]
lsls r7, r0, 14
ldrb r0, [r1, 0x1]
cmp r0, 0x4
bne _0800B728
movs r0, 0x40
orrs r0, r3
orrs r0, r2
b _0800B72C
.pool
_0800B728:
adds r0, r2, 0
orrs r0, r3
_0800B72C:
orrs r0, r4
orrs r0, r5
orrs r0, r6
orrs r0, r7
adds r2, r0, 0
ldrb r3, [r1, 0x13]
cmp r3, 0x1
bne _0800B742
movs r0, 0x80
lsls r0, 9
orrs r2, r0
_0800B742:
ldrb r0, [r1, 0x2]
cmp r0, 0x3
bls _0800B74E
movs r0, 0x80
lsls r0, 10
orrs r2, r0
_0800B74E:
adds r1, r2, 0
cmp r3, 0x2
bne _0800B75A
movs r0, 0x80
lsls r0, 11
orrs r1, r0
_0800B75A:
adds r0, r1, 0
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_800B638
thumb_func_start sub_800B764
sub_800B764: @ 800B764
push {lr}
asm/mystery_event_menu.s
+1 -1
View File
@@ -333,7 +333,7 @@ _08178C42:
adds r1, r4, r0
b _08178D1E
_08178C54:
bl sub_800B320
bl IsLinkConnectionEstablished
lsls r0, 24
cmp r0, 0
beq _08178D00
asm/pokenav.s
+3 -3
View File
@@ -28157,7 +28157,7 @@ sub_81D4EE4: @ 81D4EE4
lsrs r0, 24
cmp r0, 0x2
bhi _081D4F08
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
cmp r0, 0
beq _081D4F08
@@ -28248,7 +28248,7 @@ _081D4FA0:
movs r0, 0x5
b _081D500E
_081D4FB6:
bl sub_800B320
bl IsLinkConnectionEstablished
lsls r0, 24
cmp r0, 0
beq _081D500C
@@ -28665,7 +28665,7 @@ _081D5360:
strb r0, [r4, 0x8]
b _081D548A
_081D536A:
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
cmp r0, 0
beq _081D537A
asm/trade.s
+3 -3
View File
@@ -12856,7 +12856,7 @@ _0807E4AE:
_0807E4B2:
strb r0, [r1]
_0807E4B4:
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
cmp r0, 0
bne _0807E4C2
@@ -14099,7 +14099,7 @@ _0807F028:
ldr r0, =c2_080543C4
bl SetMainCallback2
_0807F03A:
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
cmp r0, 0
bne _0807F048
@@ -14883,7 +14883,7 @@ _0807F6F8:
ldr r0, =c2_080543C4
bl SetMainCallback2
_0807F70C:
bl sub_800B33C
bl HasLinkErrorOccurred
lsls r0, 24
cmp r0, 0
bne _0807F71A