Merge pull request #216 from PikalaxALT/link_rfu
Port link_rfu from Emerald
This commit is contained in:
+6
-6
@@ -78,7 +78,7 @@ sub_814B754: @ 814B754
|
||||
_0814B772:
|
||||
adds r0, r4, 0
|
||||
bl SetMainCallback2
|
||||
ldr r0, _0814B78C @ =gUnknown_3005450
|
||||
ldr r0, _0814B78C @ =Rfu
|
||||
mov r1, r8
|
||||
strh r1, [r0, 0x10]
|
||||
strh r1, [r0, 0x12]
|
||||
@@ -86,7 +86,7 @@ _0814B772:
|
||||
.align 2, 0
|
||||
_0814B784: .4byte gReceivedRemoteLinkPlayers
|
||||
_0814B788: .4byte gWirelessCommType
|
||||
_0814B78C: .4byte gUnknown_3005450
|
||||
_0814B78C: .4byte Rfu
|
||||
_0814B790:
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
@@ -103,13 +103,13 @@ _0814B790:
|
||||
_0814B7AC:
|
||||
adds r0, r4, 0
|
||||
bl SetMainCallback2
|
||||
ldr r0, _0814B7BC @ =gUnknown_3005450
|
||||
ldr r0, _0814B7BC @ =Rfu
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x10]
|
||||
strh r1, [r0, 0x12]
|
||||
b _0814B7DC
|
||||
.align 2, 0
|
||||
_0814B7BC: .4byte gUnknown_3005450
|
||||
_0814B7BC: .4byte Rfu
|
||||
_0814B7C0:
|
||||
ldr r6, _0814B7E8 @ =gUnknown_203F3DC
|
||||
ldr r0, _0814B7EC @ =0x000041c0
|
||||
@@ -120,7 +120,7 @@ _0814B7C0:
|
||||
bne _0814B7F4
|
||||
adds r0, r4, 0
|
||||
bl SetMainCallback2
|
||||
ldr r0, _0814B7F0 @ =gUnknown_3005450
|
||||
ldr r0, _0814B7F0 @ =Rfu
|
||||
strh r5, [r0, 0x10]
|
||||
strh r5, [r0, 0x12]
|
||||
_0814B7DC:
|
||||
@@ -132,7 +132,7 @@ _0814B7DC:
|
||||
.align 2, 0
|
||||
_0814B7E8: .4byte gUnknown_203F3DC
|
||||
_0814B7EC: .4byte 0x000041c0
|
||||
_0814B7F0: .4byte gUnknown_3005450
|
||||
_0814B7F0: .4byte Rfu
|
||||
_0814B7F4:
|
||||
str r4, [r5]
|
||||
movs r4, 0
|
||||
|
||||
-3175
File diff suppressed because it is too large
Load Diff
-10188
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -5722,7 +5722,7 @@ sub_8057910: @ 8057910
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x3C
|
||||
bls _0805792E
|
||||
bl sub_80FA190
|
||||
bl LinkRfu_FatalError
|
||||
_0805792E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -7124,7 +7124,7 @@ _08058350: .4byte gWirelessCommType
|
||||
_08058354: .4byte gLink
|
||||
_08058358: .4byte 0x00000339
|
||||
_0805835C:
|
||||
ldr r0, _08058368 @ =gUnknown_3005450
|
||||
ldr r0, _08058368 @ =Rfu
|
||||
ldr r1, _0805836C @ =0x000008d2
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -7132,7 +7132,7 @@ _08058364:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08058368: .4byte gUnknown_3005450
|
||||
_08058368: .4byte Rfu
|
||||
_0805836C: .4byte 0x000008d2
|
||||
thumb_func_end sub_805833C
|
||||
|
||||
|
||||
@@ -3930,7 +3930,7 @@ _081497FA:
|
||||
sub_8149804: @ 8149804
|
||||
push {lr}
|
||||
movs r2, 0
|
||||
ldr r1, _08149828 @ =gUnknown_3005450
|
||||
ldr r1, _08149828 @ =Rfu
|
||||
ldr r3, _0814982C @ =0x0000069e
|
||||
adds r0, r1, r3
|
||||
ldrb r0, [r0]
|
||||
@@ -3947,7 +3947,7 @@ _08149820:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08149828: .4byte gUnknown_3005450
|
||||
_08149828: .4byte Rfu
|
||||
_0814982C: .4byte 0x0000069e
|
||||
_08149830: .4byte 0x000008d2
|
||||
thumb_func_end sub_8149804
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user